Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 50356)
+++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 50357)
@@ -73,4 +73,13 @@
     friend class CallbackEvent;
 
+    DECLARE_CLASSFACTORY_SINGLETON(VirtualBox)
+
+    DECLARE_REGISTRY_RESOURCEID(IDR_VIRTUALBOX)
+
+    // Kind of redundant (VirtualBoxWrap declares itself not aggregatable and
+    // CComCoClass<VirtualBox, &CLSID_VirtualBox> as aggregatable, the former
+    // is the first inheritance), but the C++ multiple inheritance rules and
+    // the class factory in svcmain.cpp needs this to disambiguate.
+    DECLARE_NOT_AGGREGATABLE(VirtualBox)
 
     // to postpone generation of the default ctor/dtor