Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 56594)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 56595)
@@ -14743,2 +14743,11 @@
     ReturnComNotImplemented();
 }
+
+/* This isn't handled entirely by the wrapper generator yet. */
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(SessionMachine)
+NS_IMPL_THREADSAFE_ISUPPORTS2_CI(SessionMachine, IMachine, IInternalMachineControl)
+
+NS_DECL_CLASSINFO(SnapshotMachine)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SnapshotMachine, IMachine)
+#endif
Index: /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp	(revision 56594)
+++ /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp	(revision 56595)
@@ -692,4 +692,8 @@
 }
 
+#ifdef VBOX_WITH_XPCOM
+NS_DECL_CLASSINFO(ProgressProxy)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)
+#endif
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
-
Index: /trunk/src/VBox/Main/src-server/xpcom/server.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/xpcom/server.cpp	(revision 56594)
+++ /trunk/src/VBox/Main/src-server/xpcom/server.cpp	(revision 56595)
@@ -100,18 +100,4 @@
 NS_DECL_CI_INTERFACE_GETTER(VirtualBoxWrap)
 
-// The declarations/implementations of the various XPCOM helper data structures
-// and functions have to be removed bit by bit, as the conversion to the
-// automatically generated wrappers makes them obsolete.
-
-/* implement nsISupports parts of our objects with support for nsIClassInfo */
-NS_DECL_CLASSINFO(SessionMachine)
-NS_IMPL_THREADSAFE_ISUPPORTS2_CI(SessionMachine, IMachine, IInternalMachineControl)
-
-NS_DECL_CLASSINFO(SnapshotMachine)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SnapshotMachine, IMachine)
-
-NS_DECL_CLASSINFO(ProgressProxy)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)
-
 ////////////////////////////////////////////////////////////////////////////////