--- a/ir/irstruct.h	Thu Apr 16 11:01:49 2009 +0200
+++ b/ir/irstruct.h	Thu Apr 16 13:18:56 2009 +0200
@@ -84,6 +84,14 @@
     /// Basically: static object.Interface[num_interfaces]
     llvm::GlobalVariable* classInterfacesArray;
 
+    /// std::vector of BaseClass*
+    typedef std::vector<BaseClass*> BaseClassVector;
+
+    /// Array of all interface vtbl implementations - in order - implemented
+    /// by this class.
+    /// Corresponds to the Interface instances needed to be output.
+    BaseClassVector interfacesWithVtbls;
+
     //////////////////////////////////////////////////////////////////////////
 
     /// Create static default initializer for struct.
@@ -93,7 +101,10 @@
     LLConstant* createClassDefaultInitializer();
 
     /// Returns vtbl for interface implementation, creates it if not already built.
-    llvm::GlobalVariable* getInterfaceVtbl(BaseClass* b, bool new_inst);
+    llvm::GlobalVariable* getInterfaceVtbl(
+        BaseClass* b,
+        bool new_inst,
+        size_t interfaces_index);
 
     /// Add base class data to initializer list.
     /// Also creates the IrField instance for each data field.