Index: /trunk/include/VBox/com/VirtualBox.h
===================================================================
--- /trunk/include/VBox/com/VirtualBox.h	(revision 29387)
+++ /trunk/include/VBox/com/VirtualBox.h	(revision 29388)
@@ -42,9 +42,9 @@
 // generated VirtualBox COM library definition file
 #if !defined (VBOXCOM_NOINCLUDE)
-#if !defined (VBOX_WITH_XPCOM)
-#include <VirtualBox.h>
-#else
-#include <VirtualBox_XPCOM.h>
-#endif
+# if !defined (VBOX_WITH_XPCOM)
+#  include <VirtualBox.h>
+# else
+#  include <VirtualBox_XPCOM.h>
+# endif
 #endif // !defined (VBOXCOM_NOINCLUDE)
 
@@ -59,5 +59,10 @@
     ComPtr<ILocalOwner> ptr;
 
+#ifdef VBOX_WITH_XPCOM /* very noisy in pedantic mode */
+    static const CLSID clsid = NS_CALLBACKWRAPPER_CID;
+    HRESULT rc = ptr.createInprocObject(clsid);
+#else
     HRESULT rc = ptr.createInprocObject(CLSID_CallbackWrapper);
+#endif
     if (FAILED(rc))
         return rc;