Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 11611)
+++ /trunk/Config.kmk	(revision 11612)
@@ -1032,12 +1032,12 @@
  # if updating, also update xpidl_INST var in src/libs/xpcom18a4/Makefile.kmk
  VBOX_XPIDL          ?= $(PATH_BIN)/xpidl$(HOSTSUFF_EXE)
- VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/idl
- VBOX_XPCOM_INCS     ?= \
-	$(VBOX_PATH_SDK)/include \
-	$(VBOX_PATH_SDK)/include/xpcom \
-	$(VBOX_PATH_SDK)/include/xpcom/nsprpub \
-	$(VBOX_PATH_SDK)/include/xpcom/string \
-	$(VBOX_PATH_SDK)/include/xpcom/xpcom \
-	$(VBOX_PATH_SDK)/include/xpcom/ipcd
+ VBOX_PATH_XPCOM_IDL ?= $(VBOX_PATH_SDK)/bindings/xpcom/idl
+ VBOX_XPCOM_INCS     ?= 				\
+	$(VBOX_PATH_SDK)/bindings/xpcom/include 	\
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom 	\
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/string 	\
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom 	\
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
  ifneq ($(KBUILD_TARGET),os2)
   # libIDL-config (for xpcom18a4)
@@ -2258,8 +2258,8 @@
 TEMPLATE_VBOXMAINEXE_RCDEFS              = $(TEMPLATE_VBOXR3EXE_RCDEFS)
 TEMPLATE_VBOXMAINEXE_LIBS.kprofile       = $(LIB_KPROFILE)
-TEMPLATE_VBOXMAINEXE_INCS                = \
-	$(VBOX_PATH_SDK)/include
 
 ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_VBOXMAINEXE_INCS              =  $(VBOX_PATH_SDK)/bindings/mscom/include
+
   TEMPLATE_VBOXMAINEXE_SDKS              = WINPSDK W2K3DDK
  ifdef VBOX_USE_VCC80
@@ -2298,4 +2298,5 @@
 else # the GCC guys:
 
+TEMPLATE_VBOXMAINEXE_INCS              =  $(VBOX_PATH_SDK)/bindings/xpcom/include
 TEMPLATE_VBOXMAINEXE_TOOL                = $(VBOX_GCC_TOOL)
 TEMPLATE_VBOXMAINEXE_CXXFLAGS            = -g -Wall -Wno-long-long -Wno-trigraphs -pipe -Wno-non-virtual-dtor -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden)
@@ -2341,5 +2342,5 @@
  endif
 TEMPLATE_VBOXMAINEXE_INTERMEDIATES      = \
-	$(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 endif # !win
@@ -2439,9 +2440,10 @@
 TEMPLATE_VBOXQTGUIEXE = VBox Qt GUI Executable
 TEMPLATE_VBOXQTGUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS)
-TEMPLATE_VBOXQTGUIEXE_INCS = \
-	$(VBOX_PATH_SDK)/include \
+
+
+ifeq ($(KBUILD_TARGET),win)
+ TEMPLATE_VBOXQTGUIEXE_INCS = 			\
+	$(VBOX_PATH_SDK)/bindings/mscom/include \
 	$(VBOX_PATH_QT)/include
-
-ifeq ($(KBUILD_TARGET),win)
  # drag in library configuration (we need QMAKE_PRL_DEFINES)
  ifneq ($(LIB_QT_PRL),)
@@ -2481,4 +2483,7 @@
 
 else # the gcc guys:
+ TEMPLATE_VBOXQTGUIEXE_INCS = 			\
+	$(VBOX_PATH_SDK)/bindings/xpcom/include	\
+	$(VBOX_PATH_QT)/include
  TEMPLATE_VBOXQTGUIEXE_TOOL = $(VBOX_GCC_TOOL)
  TEMPLATE_VBOXQTGUIEXE_DEFS.linux = _REENTRANT
@@ -2575,8 +2580,8 @@
 	$(LIB_XPCOM)
  TEMPLATE_VBOXQTGUIEXE_INTERMEDIATES += \
-	$(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 else
  TEMPLATE_VBOXQTGUIEXE_INTERMEDIATES += \
-	$(VBOX_PATH_SDK)/include/VirtualBox.h
+	$(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 endif
 
Index: /trunk/src/VBox/Installer/solaris/sdkfiles.ose
===================================================================
--- /trunk/src/VBox/Installer/solaris/sdkfiles.ose	(revision 11611)
+++ /trunk/src/VBox/Installer/solaris/sdkfiles.ose	(revision 11612)
@@ -1,414 +1,414 @@
-sdk/include/xpcom/nsprpub/nspr.h
-sdk/include/xpcom/nsprpub/plarena.h
-sdk/include/xpcom/nsprpub/plarenas.h
-sdk/include/xpcom/nsprpub/plbase64.h
-sdk/include/xpcom/nsprpub/plerror.h
-sdk/include/xpcom/nsprpub/plgetopt.h
-sdk/include/xpcom/nsprpub/plhash.h
-sdk/include/xpcom/nsprpub/plresolv.h
-sdk/include/xpcom/nsprpub/plstr.h
-sdk/include/xpcom/nsprpub/pratom.h
-sdk/include/xpcom/nsprpub/prbit.h
-sdk/include/xpcom/nsprpub/prclist.h
-sdk/include/xpcom/nsprpub/prcmon.h
-sdk/include/xpcom/nsprpub/prcountr.h
-sdk/include/xpcom/nsprpub/prcvar.h
-sdk/include/xpcom/nsprpub/prdtoa.h
-sdk/include/xpcom/nsprpub/prenv.h
-sdk/include/xpcom/nsprpub/prerr.h
-sdk/include/xpcom/nsprpub/prerror.h
-sdk/include/xpcom/nsprpub/prinet.h
-sdk/include/xpcom/nsprpub/prinit.h
-sdk/include/xpcom/nsprpub/prinrval.h
-sdk/include/xpcom/nsprpub/prio.h
-sdk/include/xpcom/nsprpub/pripcsem.h
-sdk/include/xpcom/nsprpub/prlink.h
-sdk/include/xpcom/nsprpub/md/_darwin.h
-sdk/include/xpcom/nsprpub/md/_freebsd.h
-sdk/include/xpcom/nsprpub/md/_l4v2.h
-sdk/include/xpcom/nsprpub/md/_linux.h
-sdk/include/xpcom/nsprpub/md/_macos.h
-sdk/include/xpcom/nsprpub/md/_netbsd.h
-sdk/include/xpcom/nsprpub/md/_openbsd.h
-sdk/include/xpcom/nsprpub/md/_os2_errors.h
-sdk/include/xpcom/nsprpub/md/_os2.h
-sdk/include/xpcom/nsprpub/md/_pcos.h
-sdk/include/xpcom/nsprpub/md/_solaris.h
-sdk/include/xpcom/nsprpub/md/_unix_errors.h
-sdk/include/xpcom/nsprpub/md/_unixos.h
-sdk/include/xpcom/nsprpub/md/_pth.h
-sdk/include/xpcom/nsprpub/md/prosdep.h
-sdk/include/xpcom/nsprpub/md/_freebsd.cfg
-sdk/include/xpcom/nsprpub/md/_linux.cfg
-sdk/include/xpcom/nsprpub/md/_darwin.cfg
-sdk/include/xpcom/nsprpub/md/_netbsd.cfg
-sdk/include/xpcom/nsprpub/md/_openbsd.cfg
-sdk/include/xpcom/nsprpub/md/_os2.cfg
-sdk/include/xpcom/nsprpub/md/_solaris32.cfg
-sdk/include/xpcom/nsprpub/md/_solaris64.cfg
-sdk/include/xpcom/nsprpub/md/_l4v2.cfg
-sdk/include/xpcom/nsprpub/prlock.h
-sdk/include/xpcom/nsprpub/prlog.h
-sdk/include/xpcom/nsprpub/prlong.h
-sdk/include/xpcom/nsprpub/prmem.h
-sdk/include/xpcom/nsprpub/prmon.h
-sdk/include/xpcom/nsprpub/prmwait.h
-sdk/include/xpcom/nsprpub/prnetdb.h
-sdk/include/xpcom/nsprpub/prolock.h
-sdk/include/xpcom/nsprpub/prpdce.h
-sdk/include/xpcom/nsprpub/prprf.h
-sdk/include/xpcom/nsprpub/prproces.h
-sdk/include/xpcom/nsprpub/prrng.h
-sdk/include/xpcom/nsprpub/prrwlock.h
-sdk/include/xpcom/nsprpub/prshm.h
-sdk/include/xpcom/nsprpub/prshma.h
-sdk/include/xpcom/nsprpub/prsystem.h
-sdk/include/xpcom/nsprpub/prthread.h
-sdk/include/xpcom/nsprpub/prtime.h
-sdk/include/xpcom/nsprpub/prtpool.h
-sdk/include/xpcom/nsprpub/prtrace.h
-sdk/include/xpcom/nsprpub/prtypes.h
-sdk/include/xpcom/nsprpub/prvrsion.h
-sdk/include/xpcom/nsprpub/prwin16.h
-sdk/include/xpcom/nsprpub/prcpucfg.h
-sdk/include/xpcom/nsprpub/obsolete/pralarm.h
-sdk/include/xpcom/nsprpub/obsolete/probslet.h
-sdk/include/xpcom/nsprpub/obsolete/protypes.h
-sdk/include/xpcom/nsprpub/obsolete/prsem.h
-sdk/include/xpcom/nsprpub/private/pprio.h
-sdk/include/xpcom/nsprpub/private/pprthred.h
-sdk/include/xpcom/nsprpub/private/prpriv.h
-sdk/include/xpcom/string/nsAString.h
-sdk/include/xpcom/string/nsAlgorithm.h
-sdk/include/xpcom/string/nsCharTraits.h
-sdk/include/xpcom/string/nsDependentString.h
-sdk/include/xpcom/string/nsDependentSubstring.h
-sdk/include/xpcom/string/nsEmbedString.h
-sdk/include/xpcom/string/nsLiteralString.h
-sdk/include/xpcom/string/nsObsoleteAString.h
-sdk/include/xpcom/string/nsPrintfCString.h
-sdk/include/xpcom/string/nsPromiseFlatString.h
-sdk/include/xpcom/string/nsReadableUtils.h
-sdk/include/xpcom/string/nsString.h
-sdk/include/xpcom/string/nsStringAPI.h
-sdk/include/xpcom/string/nsStringFwd.h
-sdk/include/xpcom/string/nsStringIterator.h
-sdk/include/xpcom/string/nsSubstring.h
-sdk/include/xpcom/string/nsSubstringTuple.h
-sdk/include/xpcom/string/nsTAString.h
-sdk/include/xpcom/string/nsTString.h
-sdk/include/xpcom/string/nsTDependentString.h
-sdk/include/xpcom/string/nsTDependentSubstring.h
-sdk/include/xpcom/string/nsTObsoleteAString.h
-sdk/include/xpcom/string/nsTPromiseFlatString.h
-sdk/include/xpcom/string/nsTSubstring.h
-sdk/include/xpcom/string/nsTSubstringTuple.h
-sdk/include/xpcom/string/nsUTF8Utils.h
-sdk/include/xpcom/string/nsXPIDLString.h
-sdk/include/xpcom/string/string-template-def-char.h
-sdk/include/xpcom/string/string-template-def-unichar.h
-sdk/include/xpcom/string/string-template-undef.h
-sdk/include/xpcom/xpcom/nsAgg.h
-sdk/include/xpcom/xpcom/nsAppDirectoryServiceDefs.h
-sdk/include/xpcom/xpcom/nsArray.h
-sdk/include/xpcom/xpcom/nsArrayEnumerator.h
-sdk/include/xpcom/xpcom/nsAtomService.h
-sdk/include/xpcom/xpcom/nsAutoBuffer.h
-sdk/include/xpcom/xpcom/nsAutoLock.h
-sdk/include/xpcom/xpcom/nsAutoPtr.h
-sdk/include/xpcom/xpcom/nsBaseHashtable.h
-sdk/include/xpcom/xpcom/nsCOMArray.h
-sdk/include/xpcom/xpcom/nsCRT.h
-sdk/include/xpcom/xpcom/nsCategoryManagerUtils.h
-sdk/include/xpcom/xpcom/nsCheapSets.h
-sdk/include/xpcom/xpcom/nsClassHashtable.h
-sdk/include/xpcom/xpcom/nsCom.h
-sdk/include/xpcom/xpcom/nsComponentManagerObsolete.h
-sdk/include/xpcom/xpcom/nsComponentManagerUtils.h
-sdk/include/xpcom/xpcom/nsCppSharedAllocator.h
-sdk/include/xpcom/xpcom/nsID.h
-sdk/include/xpcom/xpcom/nsDataHashtable.h
-sdk/include/xpcom/xpcom/nsDebugImpl.h
-sdk/include/xpcom/xpcom/nsDeque.h
-sdk/include/xpcom/xpcom/nsDirectoryService.h
-sdk/include/xpcom/xpcom/nsDirectoryServiceDefs.h
-sdk/include/xpcom/xpcom/nsDirectoryServiceUtils.h
-sdk/include/xpcom/xpcom/nsDoubleHashtable.h
-sdk/include/xpcom/xpcom/nsEnumeratorUtils.h
-sdk/include/xpcom/xpcom/nsError.h
-sdk/include/xpcom/xpcom/nsEscape.h
-sdk/include/xpcom/xpcom/nsEventQueueUtils.h
-sdk/include/xpcom/xpcom/nsFastLoadPtr.h
-sdk/include/xpcom/xpcom/nsFastLoadService.h
-sdk/include/xpcom/xpcom/nsFixedSizeAllocator.h
-sdk/include/xpcom/xpcom/nsHashKeys.h
-sdk/include/xpcom/xpcom/nsHashSets.h
-sdk/include/xpcom/xpcom/nsHashtable.h
-sdk/include/xpcom/xpcom/nsIAllocator.h
-sdk/include/xpcom/xpcom/nsIByteBuffer.h
-sdk/include/xpcom/xpcom/nsIID.h
-sdk/include/xpcom/xpcom/nsIServiceManagerObsolete.h
-sdk/include/xpcom/xpcom/nsIServiceManagerUtils.h
-sdk/include/xpcom/xpcom/nsISupportsBase.h
-sdk/include/xpcom/xpcom/nsISupportsObsolete.h
-sdk/include/xpcom/xpcom/nsIUnicharBuffer.h
-sdk/include/xpcom/xpcom/nsIUnicharInputStream.h
-sdk/include/xpcom/xpcom/nsInt64.h
-sdk/include/xpcom/xpcom/nsInterfaceHashtable.h
-sdk/include/xpcom/xpcom/nsLinebreakConverter.h
-sdk/include/xpcom/xpcom/nsLocalFile.h
-sdk/include/xpcom/xpcom/nsLocalFileUnix.h
-sdk/include/xpcom/xpcom/nsLocalFileOS2.h
-sdk/include/xpcom/xpcom/nsLocalFileOSX.h
-sdk/include/xpcom/xpcom/nsModule.h
-sdk/include/xpcom/xpcom/nsMultiplexInputStream.h
-sdk/include/xpcom/xpcom/nsNativeCharsetUtils.h
-sdk/include/xpcom/xpcom/nsProcess.h
-sdk/include/xpcom/xpcom/nsNativeComponentLoader.h
-sdk/include/xpcom/xpcom/nsObserverService.h
-sdk/include/xpcom/xpcom/nsObsoleteModuleLoading.h
-sdk/include/xpcom/xpcom/nsProxiedService.h
-sdk/include/xpcom/xpcom/nsProxyEvent.h
-sdk/include/xpcom/xpcom/nsProxyRelease.h
-sdk/include/xpcom/xpcom/nsQuickSort.h
-sdk/include/xpcom/xpcom/nsRecyclingAllocator.h
-sdk/include/xpcom/xpcom/nsRefPtrHashtable.h
-sdk/include/xpcom/xpcom/nsScriptableInputStream.h
-sdk/include/xpcom/xpcom/nsStaticAtom.h
-sdk/include/xpcom/xpcom/nsStaticComponent.h
-sdk/include/xpcom/xpcom/nsStaticNameTable.h
-sdk/include/xpcom/xpcom/nsStorageStream.h
-sdk/include/xpcom/xpcom/nsStreamUtils.h
-sdk/include/xpcom/xpcom/nsStringEnumerator.h
-sdk/include/xpcom/xpcom/nsStringIO.h
-sdk/include/xpcom/xpcom/nsTHashtable.h
-sdk/include/xpcom/xpcom/nsStringStream.h
-sdk/include/xpcom/xpcom/nsSupportsArray.h
-sdk/include/xpcom/xpcom/nsSupportsPrimitives.h
-sdk/include/xpcom/xpcom/nsTextFormatter.h
-sdk/include/xpcom/xpcom/nsTime.h
-sdk/include/xpcom/xpcom/nsTraceRefcntImpl.h
-sdk/include/xpcom/xpcom/nsUnitConversion.h
-sdk/include/xpcom/xpcom/nsValueArray.h
-sdk/include/xpcom/xpcom/nsVariant.h
-sdk/include/xpcom/xpcom/nsVoidArray.h
-sdk/include/xpcom/xpcom/nsWeakPtr.h
-sdk/include/xpcom/xpcom/nsXPCOM.h
-sdk/include/xpcom/xpcom/nsXPCOMCID.h
-sdk/include/xpcom/xpcom/nscore.h
-sdk/include/xpcom/xpcom/pldhash.h
-sdk/include/xpcom/xpcom/plevent.h
-sdk/include/xpcom/xpcom/xcDll.h
-sdk/include/xpcom/xpcom/xpt_arena.h
-sdk/include/xpcom/xpcom/xpt_struct.h
-sdk/include/xpcom/xpcom/xpt_xdr.h
-sdk/include/xpcom/xpcom/xptcall.h
-sdk/include/xpcom/xpcom/xptcstubsdecl.inc
-sdk/include/xpcom/xpcom/xptcstubsdef.inc
-sdk/include/xpcom/xpcom/xptinfo.h
-sdk/include/xpcom/xpcom/nsIInterfaceRequestorUtils.h
-sdk/include/xpcom/xpcom/nsISupportsImpl.h
-sdk/include/xpcom/xpcom/nsISupportsUtils.h
-sdk/include/xpcom/xpcom/nsIWeakReferenceUtils.h
-sdk/include/xpcom/xpcom/nsCOMPtr.h
-sdk/include/xpcom/xpcom/nsDebug.h
-sdk/include/xpcom/xpcom/nsGenericFactory.h
-sdk/include/xpcom/xpcom/nsIGenericFactory.h
-sdk/include/xpcom/xpcom/nsMemory.h
-sdk/include/xpcom/xpcom/nsTraceRefcnt.h
-sdk/include/xpcom/xpcom/nsWeakReference.h
-sdk/include/xpcom/xpcom/nsXPCOMGlue.h
-sdk/include/xpcom/xpcom/xpcom-config.h
-sdk/include/xpcom/ipcd/ipcCID.h
-sdk/include/xpcom/ipcd/ipcLockCID.h
-sdk/include/xpcom/ipcd/ipcMessageReader.h
-sdk/include/xpcom/ipcd/ipcMessageWriter.h
-sdk/include/xpcom/ipcd/ipcModule.h
-sdk/include/xpcom/ipcd/ipcModuleUtil.h
-sdk/include/xpcom/ipcd/ipcdclient.h
-sdk/include/nsIDebug.h
-sdk/include/nsIInterfaceRequestor.h
-sdk/include/nsIMemory.h
-sdk/include/nsIProgrammingLanguage.h
-sdk/include/nsISupports.h
-sdk/include/nsITraceRefcnt.h
-sdk/include/nsIWeakReference.h
-sdk/include/nsIConsoleMessage.h
-sdk/include/nsIConsoleService.h
-sdk/include/nsIConsoleListener.h
-sdk/include/nsIErrorService.h
-sdk/include/nsIException.h
-sdk/include/nsIExceptionService.h
-sdk/include/nsrootidl.h
-sdk/include/nsIClassInfo.h
-sdk/include/nsIComponentRegistrar.h
-sdk/include/nsIFactory.h
-sdk/include/nsIModule.h
-sdk/include/nsIServiceManager.h
-sdk/include/nsIComponentManager.h
-sdk/include/nsICategoryManager.h
-sdk/include/nsIComponentLoader.h
-sdk/include/nsINativeComponentLoader.h
-sdk/include/nsIComponentManagerObsolete.h
-sdk/include/nsIComponentLoaderManager.h
-sdk/include/nsISupportsArray.h
-sdk/include/nsICollection.h
-sdk/include/nsISerializable.h
-sdk/include/nsIEnumerator.h
-sdk/include/nsISimpleEnumerator.h
-sdk/include/nsIObserverService.h
-sdk/include/nsIObserver.h
-sdk/include/nsIAtom.h
-sdk/include/nsIAtomService.h
-sdk/include/nsIProperties.h
-sdk/include/nsIPersistentProperties2.h
-sdk/include/nsIRecyclingAllocator.h
-sdk/include/nsIStringEnumerator.h
-sdk/include/nsISupportsPrimitives.h
-sdk/include/nsISupportsIterators.h
-sdk/include/nsIVariant.h
-sdk/include/nsITimelineService.h
-sdk/include/nsIArray.h
-sdk/include/nsIPropertyBag.h
-sdk/include/nsIHashable.h
-sdk/include/nsIDirectoryService.h
-sdk/include/nsIDirectoryEnumerator.h
-sdk/include/nsIFile.h
-sdk/include/nsILocalFile.h
-sdk/include/nsILocalFileMac.h
-sdk/include/nsIInputStream.h
-sdk/include/nsIOutputStream.h
-sdk/include/nsIObjectInputStream.h
-sdk/include/nsIBinaryInputStream.h
-sdk/include/nsIObjectOutputStream.h
-sdk/include/nsIBinaryOutputStream.h
-sdk/include/nsIStreamBufferAccess.h
-sdk/include/nsIByteArrayInputStream.h
-sdk/include/nsISeekableStream.h
-sdk/include/nsIFastLoadFileControl.h
-sdk/include/nsIFastLoadService.h
-sdk/include/nsIInputStreamTee.h
-sdk/include/nsIMultiplexInputStream.h
-sdk/include/nsIPipe.h
-sdk/include/nsIAsyncInputStream.h
-sdk/include/nsIAsyncOutputStream.h
-sdk/include/nsIScriptableInputStream.h
-sdk/include/nsIStorageStream.h
-sdk/include/nsIStringStream.h
-sdk/include/nsILineInputStream.h
-sdk/include/nsIProxyObjectManager.h
-sdk/include/nsIEventQueueService.h
-sdk/include/nsIEventQueue.h
-sdk/include/nsIEventTarget.h
-sdk/include/nsIRunnable.h
-sdk/include/nsIThread.h
-sdk/include/nsITimer.h
-sdk/include/nsIEnvironment.h
-sdk/include/nsITimerInternal.h
-sdk/include/nsITimerManager.h
-sdk/include/nsIProcess.h
-sdk/include/nsIInterfaceInfo.h
-sdk/include/nsIInterfaceInfoManager.h
-sdk/include/nsIXPTLoader.h
-sdk/include/ipcIService.h
-sdk/include/ipcIMessageObserver.h
-sdk/include/ipcIClientObserver.h
-sdk/include/ipcILockService.h
-sdk/include/ipcITransactionService.h
-sdk/include/ipcIDConnectService.h
-sdk/include/ipcITransactionObserver.h
-sdk/include/VirtualBox_XPCOM.h
-sdk/idl/nsIDebug.idl
-sdk/idl/nsIInterfaceRequestor.idl
-sdk/idl/nsIMemory.idl
-sdk/idl/nsIProgrammingLanguage.idl
-sdk/idl/nsISupports.idl
-sdk/idl/nsITraceRefcnt.idl
-sdk/idl/nsIWeakReference.idl
-sdk/idl/nsIConsoleMessage.idl
-sdk/idl/nsIConsoleService.idl
-sdk/idl/nsIConsoleListener.idl
-sdk/idl/nsIErrorService.idl
-sdk/idl/nsIException.idl
-sdk/idl/nsIExceptionService.idl
-sdk/idl/nsrootidl.idl
-sdk/idl/nsIClassInfo.idl
-sdk/idl/nsIComponentRegistrar.idl
-sdk/idl/nsIFactory.idl
-sdk/idl/nsIModule.idl
-sdk/idl/nsIServiceManager.idl
-sdk/idl/nsIComponentManager.idl
-sdk/idl/nsICategoryManager.idl
-sdk/idl/nsIComponentLoader.idl
-sdk/idl/nsINativeComponentLoader.idl
-sdk/idl/nsIComponentManagerObsolete.idl
-sdk/idl/nsIComponentLoaderManager.idl
-sdk/idl/nsISupportsArray.idl
-sdk/idl/nsICollection.idl
-sdk/idl/nsISerializable.idl
-sdk/idl/nsIEnumerator.idl
-sdk/idl/nsISimpleEnumerator.idl
-sdk/idl/nsIObserverService.idl
-sdk/idl/nsIObserver.idl
-sdk/idl/nsIAtom.idl
-sdk/idl/nsIAtomService.idl
-sdk/idl/nsIProperties.idl
-sdk/idl/nsIPersistentProperties2.idl
-sdk/idl/nsIRecyclingAllocator.idl
-sdk/idl/nsIStringEnumerator.idl
-sdk/idl/nsISupportsPrimitives.idl
-sdk/idl/nsISupportsIterators.idl
-sdk/idl/nsIVariant.idl
-sdk/idl/nsITimelineService.idl
-sdk/idl/nsIArray.idl
-sdk/idl/nsIPropertyBag.idl
-sdk/idl/nsIHashable.idl
-sdk/idl/nsIDirectoryService.idl
-sdk/idl/nsIDirectoryEnumerator.idl
-sdk/idl/nsIFile.idl
-sdk/idl/nsILocalFile.idl
-sdk/idl/nsILocalFileMac.idl
-sdk/idl/nsIInputStream.idl
-sdk/idl/nsIObjectInputStream.idl
-sdk/idl/nsIBinaryInputStream.idl
-sdk/idl/nsIObjectOutputStream.idl
-sdk/idl/nsIBinaryOutputStream.idl
-sdk/idl/nsIOutputStream.idl
-sdk/idl/nsIStreamBufferAccess.idl
-sdk/idl/nsIByteArrayInputStream.idl
-sdk/idl/nsISeekableStream.idl
-sdk/idl/nsIFastLoadFileControl.idl
-sdk/idl/nsIFastLoadService.idl
-sdk/idl/nsIInputStreamTee.idl
-sdk/idl/nsIMultiplexInputStream.idl
-sdk/idl/nsIPipe.idl
-sdk/idl/nsIRunnable.idl
-sdk/idl/nsIAsyncInputStream.idl
-sdk/idl/nsIAsyncOutputStream.idl
-sdk/idl/nsIScriptableInputStream.idl
-sdk/idl/nsIStorageStream.idl
-sdk/idl/nsIStringStream.idl
-sdk/idl/nsILineInputStream.idl
-sdk/idl/nsIProxyObjectManager.idl
-sdk/idl/nsIEventQueueService.idl
-sdk/idl/nsIEventQueue.idl
-sdk/idl/nsIEventTarget.idl
-sdk/idl/nsIThread.idl
-sdk/idl/nsITimer.idl
-sdk/idl/nsIEnvironment.idl
-sdk/idl/nsITimerInternal.idl
-sdk/idl/nsITimerManager.idl
-sdk/idl/nsIProcess.idl
-sdk/idl/ipcIService.idl
-sdk/idl/nsIInterfaceInfo.idl
-sdk/idl/nsIInterfaceInfoManager.idl
-sdk/idl/nsIXPTLoader.idl
-sdk/idl/ipcIMessageObserver.idl
-sdk/idl/ipcIClientObserver.idl
-sdk/idl/ipcILockService.idl
-sdk/idl/ipcITransactionService.idl
-sdk/idl/ipcIDConnectService.idl
-sdk/idl/ipcITransactionObserver.idl
-sdk/idl/VirtualBox_XPCOM.idl
+sdk/bindings/xpcom/include/nsprpub/nspr.h
+sdk/bindings/xpcom/include/nsprpub/plarena.h
+sdk/bindings/xpcom/include/nsprpub/plarenas.h
+sdk/bindings/xpcom/include/nsprpub/plbase64.h
+sdk/bindings/xpcom/include/nsprpub/plerror.h
+sdk/bindings/xpcom/include/nsprpub/plgetopt.h
+sdk/bindings/xpcom/include/nsprpub/plhash.h
+sdk/bindings/xpcom/include/nsprpub/plresolv.h
+sdk/bindings/xpcom/include/nsprpub/plstr.h
+sdk/bindings/xpcom/include/nsprpub/pratom.h
+sdk/bindings/xpcom/include/nsprpub/prbit.h
+sdk/bindings/xpcom/include/nsprpub/prclist.h
+sdk/bindings/xpcom/include/nsprpub/prcmon.h
+sdk/bindings/xpcom/include/nsprpub/prcountr.h
+sdk/bindings/xpcom/include/nsprpub/prcvar.h
+sdk/bindings/xpcom/include/nsprpub/prdtoa.h
+sdk/bindings/xpcom/include/nsprpub/prenv.h
+sdk/bindings/xpcom/include/nsprpub/prerr.h
+sdk/bindings/xpcom/include/nsprpub/prerror.h
+sdk/bindings/xpcom/include/nsprpub/prinet.h
+sdk/bindings/xpcom/include/nsprpub/prinit.h
+sdk/bindings/xpcom/include/nsprpub/prinrval.h
+sdk/bindings/xpcom/include/nsprpub/prio.h
+sdk/bindings/xpcom/include/nsprpub/pripcsem.h
+sdk/bindings/xpcom/include/nsprpub/prlink.h
+sdk/bindings/xpcom/include/nsprpub/md/_darwin.h
+sdk/bindings/xpcom/include/nsprpub/md/_freebsd.h
+sdk/bindings/xpcom/include/nsprpub/md/_l4v2.h
+sdk/bindings/xpcom/include/nsprpub/md/_linux.h
+sdk/bindings/xpcom/include/nsprpub/md/_macos.h
+sdk/bindings/xpcom/include/nsprpub/md/_netbsd.h
+sdk/bindings/xpcom/include/nsprpub/md/_openbsd.h
+sdk/bindings/xpcom/include/nsprpub/md/_os2_errors.h
+sdk/bindings/xpcom/include/nsprpub/md/_os2.h
+sdk/bindings/xpcom/include/nsprpub/md/_pcos.h
+sdk/bindings/xpcom/include/nsprpub/md/_solaris.h
+sdk/bindings/xpcom/include/nsprpub/md/_unix_errors.h
+sdk/bindings/xpcom/include/nsprpub/md/_unixos.h
+sdk/bindings/xpcom/include/nsprpub/md/_pth.h
+sdk/bindings/xpcom/include/nsprpub/md/prosdep.h
+sdk/bindings/xpcom/include/nsprpub/md/_freebsd.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_linux.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_darwin.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_netbsd.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_openbsd.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_os2.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_solaris32.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_solaris64.cfg
+sdk/bindings/xpcom/include/nsprpub/md/_l4v2.cfg
+sdk/bindings/xpcom/include/nsprpub/prlock.h
+sdk/bindings/xpcom/include/nsprpub/prlog.h
+sdk/bindings/xpcom/include/nsprpub/prlong.h
+sdk/bindings/xpcom/include/nsprpub/prmem.h
+sdk/bindings/xpcom/include/nsprpub/prmon.h
+sdk/bindings/xpcom/include/nsprpub/prmwait.h
+sdk/bindings/xpcom/include/nsprpub/prnetdb.h
+sdk/bindings/xpcom/include/nsprpub/prolock.h
+sdk/bindings/xpcom/include/nsprpub/prpdce.h
+sdk/bindings/xpcom/include/nsprpub/prprf.h
+sdk/bindings/xpcom/include/nsprpub/prproces.h
+sdk/bindings/xpcom/include/nsprpub/prrng.h
+sdk/bindings/xpcom/include/nsprpub/prrwlock.h
+sdk/bindings/xpcom/include/nsprpub/prshm.h
+sdk/bindings/xpcom/include/nsprpub/prshma.h
+sdk/bindings/xpcom/include/nsprpub/prsystem.h
+sdk/bindings/xpcom/include/nsprpub/prthread.h
+sdk/bindings/xpcom/include/nsprpub/prtime.h
+sdk/bindings/xpcom/include/nsprpub/prtpool.h
+sdk/bindings/xpcom/include/nsprpub/prtrace.h
+sdk/bindings/xpcom/include/nsprpub/prtypes.h
+sdk/bindings/xpcom/include/nsprpub/prvrsion.h
+sdk/bindings/xpcom/include/nsprpub/prwin16.h
+sdk/bindings/xpcom/include/nsprpub/prcpucfg.h
+sdk/bindings/xpcom/include/nsprpub/obsolete/pralarm.h
+sdk/bindings/xpcom/include/nsprpub/obsolete/probslet.h
+sdk/bindings/xpcom/include/nsprpub/obsolete/protypes.h
+sdk/bindings/xpcom/include/nsprpub/obsolete/prsem.h
+sdk/bindings/xpcom/include/nsprpub/private/pprio.h
+sdk/bindings/xpcom/include/nsprpub/private/pprthred.h
+sdk/bindings/xpcom/include/nsprpub/private/prpriv.h
+sdk/bindings/xpcom/include/string/nsAString.h
+sdk/bindings/xpcom/include/string/nsAlgorithm.h
+sdk/bindings/xpcom/include/string/nsCharTraits.h
+sdk/bindings/xpcom/include/string/nsDependentString.h
+sdk/bindings/xpcom/include/string/nsDependentSubstring.h
+sdk/bindings/xpcom/include/string/nsEmbedString.h
+sdk/bindings/xpcom/include/string/nsLiteralString.h
+sdk/bindings/xpcom/include/string/nsObsoleteAString.h
+sdk/bindings/xpcom/include/string/nsPrintfCString.h
+sdk/bindings/xpcom/include/string/nsPromiseFlatString.h
+sdk/bindings/xpcom/include/string/nsReadableUtils.h
+sdk/bindings/xpcom/include/string/nsString.h
+sdk/bindings/xpcom/include/string/nsStringAPI.h
+sdk/bindings/xpcom/include/string/nsStringFwd.h
+sdk/bindings/xpcom/include/string/nsStringIterator.h
+sdk/bindings/xpcom/include/string/nsSubstring.h
+sdk/bindings/xpcom/include/string/nsSubstringTuple.h
+sdk/bindings/xpcom/include/string/nsTAString.h
+sdk/bindings/xpcom/include/string/nsTString.h
+sdk/bindings/xpcom/include/string/nsTDependentString.h
+sdk/bindings/xpcom/include/string/nsTDependentSubstring.h
+sdk/bindings/xpcom/include/string/nsTObsoleteAString.h
+sdk/bindings/xpcom/include/string/nsTPromiseFlatString.h
+sdk/bindings/xpcom/include/string/nsTSubstring.h
+sdk/bindings/xpcom/include/string/nsTSubstringTuple.h
+sdk/bindings/xpcom/include/string/nsUTF8Utils.h
+sdk/bindings/xpcom/include/string/nsXPIDLString.h
+sdk/bindings/xpcom/include/string/string-template-def-char.h
+sdk/bindings/xpcom/include/string/string-template-def-unichar.h
+sdk/bindings/xpcom/include/string/string-template-undef.h
+sdk/bindings/xpcom/include/xpcom/nsAgg.h
+sdk/bindings/xpcom/include/xpcom/nsAppDirectoryServiceDefs.h
+sdk/bindings/xpcom/include/xpcom/nsArray.h
+sdk/bindings/xpcom/include/xpcom/nsArrayEnumerator.h
+sdk/bindings/xpcom/include/xpcom/nsAtomService.h
+sdk/bindings/xpcom/include/xpcom/nsAutoBuffer.h
+sdk/bindings/xpcom/include/xpcom/nsAutoLock.h
+sdk/bindings/xpcom/include/xpcom/nsAutoPtr.h
+sdk/bindings/xpcom/include/xpcom/nsBaseHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsCOMArray.h
+sdk/bindings/xpcom/include/xpcom/nsCRT.h
+sdk/bindings/xpcom/include/xpcom/nsCategoryManagerUtils.h
+sdk/bindings/xpcom/include/xpcom/nsCheapSets.h
+sdk/bindings/xpcom/include/xpcom/nsClassHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsCom.h
+sdk/bindings/xpcom/include/xpcom/nsComponentManagerObsolete.h
+sdk/bindings/xpcom/include/xpcom/nsComponentManagerUtils.h
+sdk/bindings/xpcom/include/xpcom/nsCppSharedAllocator.h
+sdk/bindings/xpcom/include/xpcom/nsID.h
+sdk/bindings/xpcom/include/xpcom/nsDataHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsDebugImpl.h
+sdk/bindings/xpcom/include/xpcom/nsDeque.h
+sdk/bindings/xpcom/include/xpcom/nsDirectoryService.h
+sdk/bindings/xpcom/include/xpcom/nsDirectoryServiceDefs.h
+sdk/bindings/xpcom/include/xpcom/nsDirectoryServiceUtils.h
+sdk/bindings/xpcom/include/xpcom/nsDoubleHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsEnumeratorUtils.h
+sdk/bindings/xpcom/include/xpcom/nsError.h
+sdk/bindings/xpcom/include/xpcom/nsEscape.h
+sdk/bindings/xpcom/include/xpcom/nsEventQueueUtils.h
+sdk/bindings/xpcom/include/xpcom/nsFastLoadPtr.h
+sdk/bindings/xpcom/include/xpcom/nsFastLoadService.h
+sdk/bindings/xpcom/include/xpcom/nsFixedSizeAllocator.h
+sdk/bindings/xpcom/include/xpcom/nsHashKeys.h
+sdk/bindings/xpcom/include/xpcom/nsHashSets.h
+sdk/bindings/xpcom/include/xpcom/nsHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsIAllocator.h
+sdk/bindings/xpcom/include/xpcom/nsIByteBuffer.h
+sdk/bindings/xpcom/include/xpcom/nsIID.h
+sdk/bindings/xpcom/include/xpcom/nsIServiceManagerObsolete.h
+sdk/bindings/xpcom/include/xpcom/nsIServiceManagerUtils.h
+sdk/bindings/xpcom/include/xpcom/nsISupportsBase.h
+sdk/bindings/xpcom/include/xpcom/nsISupportsObsolete.h
+sdk/bindings/xpcom/include/xpcom/nsIUnicharBuffer.h
+sdk/bindings/xpcom/include/xpcom/nsIUnicharInputStream.h
+sdk/bindings/xpcom/include/xpcom/nsInt64.h
+sdk/bindings/xpcom/include/xpcom/nsInterfaceHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsLinebreakConverter.h
+sdk/bindings/xpcom/include/xpcom/nsLocalFile.h
+sdk/bindings/xpcom/include/xpcom/nsLocalFileUnix.h
+sdk/bindings/xpcom/include/xpcom/nsLocalFileOS2.h
+sdk/bindings/xpcom/include/xpcom/nsLocalFileOSX.h
+sdk/bindings/xpcom/include/xpcom/nsModule.h
+sdk/bindings/xpcom/include/xpcom/nsMultiplexInputStream.h
+sdk/bindings/xpcom/include/xpcom/nsNativeCharsetUtils.h
+sdk/bindings/xpcom/include/xpcom/nsProcess.h
+sdk/bindings/xpcom/include/xpcom/nsNativeComponentLoader.h
+sdk/bindings/xpcom/include/xpcom/nsObserverService.h
+sdk/bindings/xpcom/include/xpcom/nsObsoleteModuleLoading.h
+sdk/bindings/xpcom/include/xpcom/nsProxiedService.h
+sdk/bindings/xpcom/include/xpcom/nsProxyEvent.h
+sdk/bindings/xpcom/include/xpcom/nsProxyRelease.h
+sdk/bindings/xpcom/include/xpcom/nsQuickSort.h
+sdk/bindings/xpcom/include/xpcom/nsRecyclingAllocator.h
+sdk/bindings/xpcom/include/xpcom/nsRefPtrHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsScriptableInputStream.h
+sdk/bindings/xpcom/include/xpcom/nsStaticAtom.h
+sdk/bindings/xpcom/include/xpcom/nsStaticComponent.h
+sdk/bindings/xpcom/include/xpcom/nsStaticNameTable.h
+sdk/bindings/xpcom/include/xpcom/nsStorageStream.h
+sdk/bindings/xpcom/include/xpcom/nsStreamUtils.h
+sdk/bindings/xpcom/include/xpcom/nsStringEnumerator.h
+sdk/bindings/xpcom/include/xpcom/nsStringIO.h
+sdk/bindings/xpcom/include/xpcom/nsTHashtable.h
+sdk/bindings/xpcom/include/xpcom/nsStringStream.h
+sdk/bindings/xpcom/include/xpcom/nsSupportsArray.h
+sdk/bindings/xpcom/include/xpcom/nsSupportsPrimitives.h
+sdk/bindings/xpcom/include/xpcom/nsTextFormatter.h
+sdk/bindings/xpcom/include/xpcom/nsTime.h
+sdk/bindings/xpcom/include/xpcom/nsTraceRefcntImpl.h
+sdk/bindings/xpcom/include/xpcom/nsUnitConversion.h
+sdk/bindings/xpcom/include/xpcom/nsValueArray.h
+sdk/bindings/xpcom/include/xpcom/nsVariant.h
+sdk/bindings/xpcom/include/xpcom/nsVoidArray.h
+sdk/bindings/xpcom/include/xpcom/nsWeakPtr.h
+sdk/bindings/xpcom/include/xpcom/nsXPCOM.h
+sdk/bindings/xpcom/include/xpcom/nsXPCOMCID.h
+sdk/bindings/xpcom/include/xpcom/nscore.h
+sdk/bindings/xpcom/include/xpcom/pldhash.h
+sdk/bindings/xpcom/include/xpcom/plevent.h
+sdk/bindings/xpcom/include/xpcom/xcDll.h
+sdk/bindings/xpcom/include/xpcom/xpt_arena.h
+sdk/bindings/xpcom/include/xpcom/xpt_struct.h
+sdk/bindings/xpcom/include/xpcom/xpt_xdr.h
+sdk/bindings/xpcom/include/xpcom/xptcall.h
+sdk/bindings/xpcom/include/xpcom/xptcstubsdecl.inc
+sdk/bindings/xpcom/include/xpcom/xptcstubsdef.inc
+sdk/bindings/xpcom/include/xpcom/xptinfo.h
+sdk/bindings/xpcom/include/xpcom/nsIInterfaceRequestorUtils.h
+sdk/bindings/xpcom/include/xpcom/nsISupportsImpl.h
+sdk/bindings/xpcom/include/xpcom/nsISupportsUtils.h
+sdk/bindings/xpcom/include/xpcom/nsIWeakReferenceUtils.h
+sdk/bindings/xpcom/include/xpcom/nsCOMPtr.h
+sdk/bindings/xpcom/include/xpcom/nsDebug.h
+sdk/bindings/xpcom/include/xpcom/nsGenericFactory.h
+sdk/bindings/xpcom/include/xpcom/nsIGenericFactory.h
+sdk/bindings/xpcom/include/xpcom/nsMemory.h
+sdk/bindings/xpcom/include/xpcom/nsTraceRefcnt.h
+sdk/bindings/xpcom/include/xpcom/nsWeakReference.h
+sdk/bindings/xpcom/include/xpcom/nsXPCOMGlue.h
+sdk/bindings/xpcom/include/xpcom/xpcom-config.h
+sdk/bindings/xpcom/include/ipcd/ipcCID.h
+sdk/bindings/xpcom/include/ipcd/ipcLockCID.h
+sdk/bindings/xpcom/include/ipcd/ipcMessageReader.h
+sdk/bindings/xpcom/include/ipcd/ipcMessageWriter.h
+sdk/bindings/xpcom/include/ipcd/ipcModule.h
+sdk/bindings/xpcom/include/ipcd/ipcModuleUtil.h
+sdk/bindings/xpcom/include/ipcd/ipcdclient.h
+sdk/bindings/xpcom/nsIDebug.h
+sdk/bindings/xpcom/nsIInterfaceRequestor.h
+sdk/bindings/xpcom/nsIMemory.h
+sdk/bindings/xpcom/nsIProgrammingLanguage.h
+sdk/bindings/xpcom/nsISupports.h
+sdk/bindings/xpcom/nsITraceRefcnt.h
+sdk/bindings/xpcom/nsIWeakReference.h
+sdk/bindings/xpcom/nsIConsoleMessage.h
+sdk/bindings/xpcom/nsIConsoleService.h
+sdk/bindings/xpcom/nsIConsoleListener.h
+sdk/bindings/xpcom/nsIErrorService.h
+sdk/bindings/xpcom/nsIException.h
+sdk/bindings/xpcom/nsIExceptionService.h
+sdk/bindings/xpcom/nsrootidl.h
+sdk/bindings/xpcom/nsIClassInfo.h
+sdk/bindings/xpcom/nsIComponentRegistrar.h
+sdk/bindings/xpcom/nsIFactory.h
+sdk/bindings/xpcom/nsIModule.h
+sdk/bindings/xpcom/nsIServiceManager.h
+sdk/bindings/xpcom/nsIComponentManager.h
+sdk/bindings/xpcom/nsICategoryManager.h
+sdk/bindings/xpcom/nsIComponentLoader.h
+sdk/bindings/xpcom/nsINativeComponentLoader.h
+sdk/bindings/xpcom/nsIComponentManagerObsolete.h
+sdk/bindings/xpcom/nsIComponentLoaderManager.h
+sdk/bindings/xpcom/nsISupportsArray.h
+sdk/bindings/xpcom/nsICollection.h
+sdk/bindings/xpcom/nsISerializable.h
+sdk/bindings/xpcom/nsIEnumerator.h
+sdk/bindings/xpcom/nsISimpleEnumerator.h
+sdk/bindings/xpcom/nsIObserverService.h
+sdk/bindings/xpcom/nsIObserver.h
+sdk/bindings/xpcom/nsIAtom.h
+sdk/bindings/xpcom/nsIAtomService.h
+sdk/bindings/xpcom/nsIProperties.h
+sdk/bindings/xpcom/nsIPersistentProperties2.h
+sdk/bindings/xpcom/nsIRecyclingAllocator.h
+sdk/bindings/xpcom/nsIStringEnumerator.h
+sdk/bindings/xpcom/nsISupportsPrimitives.h
+sdk/bindings/xpcom/nsISupportsIterators.h
+sdk/bindings/xpcom/nsIVariant.h
+sdk/bindings/xpcom/nsITimelineService.h
+sdk/bindings/xpcom/nsIArray.h
+sdk/bindings/xpcom/nsIPropertyBag.h
+sdk/bindings/xpcom/nsIHashable.h
+sdk/bindings/xpcom/nsIDirectoryService.h
+sdk/bindings/xpcom/nsIDirectoryEnumerator.h
+sdk/bindings/xpcom/nsIFile.h
+sdk/bindings/xpcom/nsILocalFile.h
+sdk/bindings/xpcom/nsILocalFileMac.h
+sdk/bindings/xpcom/nsIInputStream.h
+sdk/bindings/xpcom/nsIOutputStream.h
+sdk/bindings/xpcom/nsIObjectInputStream.h
+sdk/bindings/xpcom/nsIBinaryInputStream.h
+sdk/bindings/xpcom/nsIObjectOutputStream.h
+sdk/bindings/xpcom/nsIBinaryOutputStream.h
+sdk/bindings/xpcom/nsIStreamBufferAccess.h
+sdk/bindings/xpcom/nsIByteArrayInputStream.h
+sdk/bindings/xpcom/nsISeekableStream.h
+sdk/bindings/xpcom/nsIFastLoadFileControl.h
+sdk/bindings/xpcom/nsIFastLoadService.h
+sdk/bindings/xpcom/nsIInputStreamTee.h
+sdk/bindings/xpcom/nsIMultiplexInputStream.h
+sdk/bindings/xpcom/nsIPipe.h
+sdk/bindings/xpcom/nsIAsyncInputStream.h
+sdk/bindings/xpcom/nsIAsyncOutputStream.h
+sdk/bindings/xpcom/nsIScriptableInputStream.h
+sdk/bindings/xpcom/nsIStorageStream.h
+sdk/bindings/xpcom/nsIStringStream.h
+sdk/bindings/xpcom/nsILineInputStream.h
+sdk/bindings/xpcom/nsIProxyObjectManager.h
+sdk/bindings/xpcom/nsIEventQueueService.h
+sdk/bindings/xpcom/nsIEventQueue.h
+sdk/bindings/xpcom/nsIEventTarget.h
+sdk/bindings/xpcom/nsIRunnable.h
+sdk/bindings/xpcom/nsIThread.h
+sdk/bindings/xpcom/nsITimer.h
+sdk/bindings/xpcom/nsIEnvironment.h
+sdk/bindings/xpcom/nsITimerInternal.h
+sdk/bindings/xpcom/nsITimerManager.h
+sdk/bindings/xpcom/nsIProcess.h
+sdk/bindings/xpcom/nsIInterfaceInfo.h
+sdk/bindings/xpcom/nsIInterfaceInfoManager.h
+sdk/bindings/xpcom/nsIXPTLoader.h
+sdk/bindings/xpcom/ipcIService.h
+sdk/bindings/xpcom/ipcIMessageObserver.h
+sdk/bindings/xpcom/ipcIClientObserver.h
+sdk/bindings/xpcom/ipcILockService.h
+sdk/bindings/xpcom/ipcITransactionService.h
+sdk/bindings/xpcom/ipcIDConnectService.h
+sdk/bindings/xpcom/ipcITransactionObserver.h
+sdk/bindings/xpcom/VirtualBox_XPCOM.h
+sdk/bindings/xpcom/idl/nsIDebug.idl
+sdk/bindings/xpcom/idl/nsIInterfaceRequestor.idl
+sdk/bindings/xpcom/idl/nsIMemory.idl
+sdk/bindings/xpcom/idl/nsIProgrammingLanguage.idl
+sdk/bindings/xpcom/idl/nsISupports.idl
+sdk/bindings/xpcom/idl/nsITraceRefcnt.idl
+sdk/bindings/xpcom/idl/nsIWeakReference.idl
+sdk/bindings/xpcom/idl/nsIConsoleMessage.idl
+sdk/bindings/xpcom/idl/nsIConsoleService.idl
+sdk/bindings/xpcom/idl/nsIConsoleListener.idl
+sdk/bindings/xpcom/idl/nsIErrorService.idl
+sdk/bindings/xpcom/idl/nsIException.idl
+sdk/bindings/xpcom/idl/nsIExceptionService.idl
+sdk/bindings/xpcom/idl/nsrootidl.idl
+sdk/bindings/xpcom/idl/nsIClassInfo.idl
+sdk/bindings/xpcom/idl/nsIComponentRegistrar.idl
+sdk/bindings/xpcom/idl/nsIFactory.idl
+sdk/bindings/xpcom/idl/nsIModule.idl
+sdk/bindings/xpcom/idl/nsIServiceManager.idl
+sdk/bindings/xpcom/idl/nsIComponentManager.idl
+sdk/bindings/xpcom/idl/nsICategoryManager.idl
+sdk/bindings/xpcom/idl/nsIComponentLoader.idl
+sdk/bindings/xpcom/idl/nsINativeComponentLoader.idl
+sdk/bindings/xpcom/idl/nsIComponentManagerObsolete.idl
+sdk/bindings/xpcom/idl/nsIComponentLoaderManager.idl
+sdk/bindings/xpcom/idl/nsISupportsArray.idl
+sdk/bindings/xpcom/idl/nsICollection.idl
+sdk/bindings/xpcom/idl/nsISerializable.idl
+sdk/bindings/xpcom/idl/nsIEnumerator.idl
+sdk/bindings/xpcom/idl/nsISimpleEnumerator.idl
+sdk/bindings/xpcom/idl/nsIObserverService.idl
+sdk/bindings/xpcom/idl/nsIObserver.idl
+sdk/bindings/xpcom/idl/nsIAtom.idl
+sdk/bindings/xpcom/idl/nsIAtomService.idl
+sdk/bindings/xpcom/idl/nsIProperties.idl
+sdk/bindings/xpcom/idl/nsIPersistentProperties2.idl
+sdk/bindings/xpcom/idl/nsIRecyclingAllocator.idl
+sdk/bindings/xpcom/idl/nsIStringEnumerator.idl
+sdk/bindings/xpcom/idl/nsISupportsPrimitives.idl
+sdk/bindings/xpcom/idl/nsISupportsIterators.idl
+sdk/bindings/xpcom/idl/nsIVariant.idl
+sdk/bindings/xpcom/idl/nsITimelineService.idl
+sdk/bindings/xpcom/idl/nsIArray.idl
+sdk/bindings/xpcom/idl/nsIPropertyBag.idl
+sdk/bindings/xpcom/idl/nsIHashable.idl
+sdk/bindings/xpcom/idl/nsIDirectoryService.idl
+sdk/bindings/xpcom/idl/nsIDirectoryEnumerator.idl
+sdk/bindings/xpcom/idl/nsIFile.idl
+sdk/bindings/xpcom/idl/nsILocalFile.idl
+sdk/bindings/xpcom/idl/nsILocalFileMac.idl
+sdk/bindings/xpcom/idl/nsIInputStream.idl
+sdk/bindings/xpcom/idl/nsIObjectInputStream.idl
+sdk/bindings/xpcom/idl/nsIBinaryInputStream.idl
+sdk/bindings/xpcom/idl/nsIObjectOutputStream.idl
+sdk/bindings/xpcom/idl/nsIBinaryOutputStream.idl
+sdk/bindings/xpcom/idl/nsIOutputStream.idl
+sdk/bindings/xpcom/idl/nsIStreamBufferAccess.idl
+sdk/bindings/xpcom/idl/nsIByteArrayInputStream.idl
+sdk/bindings/xpcom/idl/nsISeekableStream.idl
+sdk/bindings/xpcom/idl/nsIFastLoadFileControl.idl
+sdk/bindings/xpcom/idl/nsIFastLoadService.idl
+sdk/bindings/xpcom/idl/nsIInputStreamTee.idl
+sdk/bindings/xpcom/idl/nsIMultiplexInputStream.idl
+sdk/bindings/xpcom/idl/nsIPipe.idl
+sdk/bindings/xpcom/idl/nsIRunnable.idl
+sdk/bindings/xpcom/idl/nsIAsyncInputStream.idl
+sdk/bindings/xpcom/idl/nsIAsyncOutputStream.idl
+sdk/bindings/xpcom/idl/nsIScriptableInputStream.idl
+sdk/bindings/xpcom/idl/nsIStorageStream.idl
+sdk/bindings/xpcom/idl/nsIStringStream.idl
+sdk/bindings/xpcom/idl/nsILineInputStream.idl
+sdk/bindings/xpcom/idl/nsIProxyObjectManager.idl
+sdk/bindings/xpcom/idl/nsIEventQueueService.idl
+sdk/bindings/xpcom/idl/nsIEventQueue.idl
+sdk/bindings/xpcom/idl/nsIEventTarget.idl
+sdk/bindings/xpcom/idl/nsIThread.idl
+sdk/bindings/xpcom/idl/nsITimer.idl
+sdk/bindings/xpcom/idl/nsIEnvironment.idl
+sdk/bindings/xpcom/idl/nsITimerInternal.idl
+sdk/bindings/xpcom/idl/nsITimerManager.idl
+sdk/bindings/xpcom/idl/nsIProcess.idl
+sdk/bindings/xpcom/idl/ipcIService.idl
+sdk/bindings/xpcom/idl/nsIInterfaceInfo.idl
+sdk/bindings/xpcom/idl/nsIInterfaceInfoManager.idl
+sdk/bindings/xpcom/idl/nsIXPTLoader.idl
+sdk/bindings/xpcom/idl/ipcIMessageObserver.idl
+sdk/bindings/xpcom/idl/ipcIClientObserver.idl
+sdk/bindings/xpcom/idl/ipcILockService.idl
+sdk/bindings/xpcom/idl/ipcITransactionService.idl
+sdk/bindings/xpcom/idl/ipcIDConnectService.idl
+sdk/bindings/xpcom/idl/ipcITransactionObserver.idl
+sdk/bindings/xpcom/idl/VirtualBox_XPCOM.idl
 sdk/samples/API/tstVBoxAPILinux.cpp
 sdk/samples/API/Makefile
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 11611)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 11612)
@@ -68,17 +68,18 @@
 ifeq ($(KBUILD_TARGET),win)
  INSTALLS       += VBoxMain-com-inst
- IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox.idl
+ IDLFILE         = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
  OTHER_CLEAN    += \
- 	$(VBOX_PATH_SDK)/include/VirtualBox.h \
+ 	$(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
  	$(IDLFILE) \
- 	$(VBOX_PATH_SDK)/lib/VirtualBox.tlb \
- 	$(VBOX_PATH_SDK)/lib/VirtualBox_i.c \
+ 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
+ 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
  	$(PATH_VBoxCOM)/VirtualBox.h \
  	$(PATH_VBoxCOM)/VirtualBox_i.c \
  	$(PATH_VBoxCOM)/VirtualBox.tlb
  VBOX_MAIN_PREREQS = $(PATH_VBoxCOM)/VirtualBox_i.c
+ BLDDIRS += $(VBOX_PATH_SDK)/bindings/mscom/idl
 else # xpcom
  INSTALLS       += xpcom-components
- IDLFILE         = $(VBOX_PATH_SDK)/idl/VirtualBox_XPCOM.idl
+ IDLFILE         = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl
  ifeq ($(KBUILD_TARGET),linux)
   IDLTYPELIB     = $(PATH_BIN)/VirtualBox_XPCOM.xpt
@@ -86,5 +87,5 @@
   IDLTYPELIB     = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
  endif
- IDLHEADER       = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
+ IDLHEADER       = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
  OTHERS         += $(IDLTYPELIB)
  OTHER_CLEAN    += \
@@ -94,6 +95,6 @@
 
  VBOX_MAIN_PREREQS = $(IDLTYPELIB) $(IDLHEADER)
+ BLDDIRS += $(VBOX_PATH_SDK)/bindings/xpcom/idl
 endif # xpcom
-BLDDIRS += $(VBOX_PATH_SDK)/idl
 
 
@@ -636,5 +637,5 @@
 $(IDLFILE): $(VBOX_PATH_MAIN_SRC)/idl/midl.xsl $(XIDLFILE)
 	$(call MSG_TOOL,xsltproc,VBoxSVC,$<,$@)
-	$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/idl
+	$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/idl
 	$(QUIET)$(VBOX_XSLTPROC) -o $@ $^
 
@@ -651,9 +652,9 @@
 # What needs to be done is to not depend on _i.c in the object subdir, but on all the final outputs.
 $(PATH_VBoxCOM)/VirtualBox_i.c \
-+ $(VBOX_PATH_SDK)/lib/VirtualBox_i.c \
++ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
 + $(PATH_VBoxCOM)/VirtualBox.h \
-+ $(VBOX_PATH_SDK)/include/VirtualBox.h \
++ $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
 + $(PATH_VBoxCOM)/VirtualBox.tlb \
-+ $(VBOX_PATH_SDK)/lib/VirtualBox.tlb: $(IDLFILE) | $(call DIRDEP,$(PATH_VBoxCOM))
++ $(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb: $(IDLFILE) | $(call DIRDEP,$(PATH_VBoxCOM))
 	$(MAIN_IDL) $(IDL_DEFS) \
 		/out $(subst /,\\,$(PATH_VBoxCOM)) \
@@ -662,9 +663,9 @@
 		/I idl \
 		$(subst /,\\,$<)
-	$(MKDIR) -p $(VBOX_PATH_SDK)/include
-	$(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/include
-	$(MKDIR) -p $(VBOX_PATH_SDK)/lib
-	$(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(VBOX_PATH_SDK)/lib
-	$(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/lib
+	$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/include
+	$(CP) $(PATH_VBoxCOM)/VirtualBox.h $(VBOX_PATH_SDK)/bindings/mscom/include
+	$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/lib
+	$(CP) $(PATH_VBoxCOM)/VirtualBox.tlb $(VBOX_PATH_SDK)/bindings/mscom/lib
+	$(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
 
 endif
Index: /trunk/src/VBox/Main/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/testcase/Makefile.kmk	(revision 11611)
+++ /trunk/src/VBox/Main/testcase/Makefile.kmk	(revision 11612)
@@ -67,7 +67,7 @@
 tstAPI_SOURCES  = tstAPI.cpp
 ifeq ($(KBUILD_TARGET),win) ## @todo just add this to the template.
-tstAPI_DEPS     = $(VBOX_PATH_SDK)/include/VirtualBox.h
+tstAPI_DEPS     = $(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 else
-tstAPI_DEPS     = $(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
+tstAPI_DEPS     = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 endif
 ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -95,5 +95,5 @@
 tstVBoxAPILinux_LIBS     = $(LIB_XPCOM)
 tstVBoxAPILinux_DEPS     = \
-	$(VBOX_PATH_SDK)/include/VirtualBox_XPCOM.h
+	$(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 #
@@ -105,5 +105,5 @@
 	$(PATH_BIN)/sdk/lib/VirtualBox_i.c
 tstVBoxAPIWin_DEPS     = \
-	$(VBOX_PATH_SDK)/include/VirtualBox.h
+	$(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h
 
 #
Index: /trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 11611)
+++ /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 11612)
@@ -123,10 +123,9 @@
                                      ipc/ipcd/extensions/dconnect/src \
                                      ipc/ipcd/extensions/transmngr/common \
-                                     $(VBOX_PATH_SDK)/include \
-                                     $(VBOX_PATH_SDK)/include/xpcom \
-                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
-                                     $(VBOX_PATH_SDK)/include/xpcom/string \
-                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
-                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
                                      .
 TEMPLATE_XPCOM_INCS.darwin         = $(VBOX_PATH_MACOSX_SDK)/Developer/Headers/FlatCarbon
@@ -161,10 +160,9 @@
 TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) \
                                      ipc/ipcd/shared/src \
-                                     $(VBOX_PATH_SDK)/include \
-                                     $(VBOX_PATH_SDK)/include/xpcom \
-                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
-                                     $(VBOX_PATH_SDK)/include/xpcom/string \
-                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
-                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+                                     $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd \
                                      .
 TEMPLATE_XPCOMEXE_LIBS             = \
@@ -208,10 +206,9 @@
 TEMPLATE_XPCOMBLDPROG_CFLAGS.freebsd    = -pthread
 TEMPLATE_XPCOMBLDPROG_CFLAGS.linux      = -pthread
-TEMPLATE_XPCOMBLDPROG_INCS              = $(VBOX_PATH_SDK)/include \
-                                          $(VBOX_PATH_SDK)/include/xpcom \
-                                          $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
-                                          $(VBOX_PATH_SDK)/include/xpcom/string \
-                                          $(VBOX_PATH_SDK)/include/xpcom/xpcom \
-                                          $(VBOX_PATH_SDK)/include/xpcom/ipcd
+TEMPLATE_XPCOMBLDPROG_INCS              = $(VBOX_PATH_SDK)/bindings/xpcom/include \
+                                          $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+                                          $(VBOX_PATH_SDK)/bindings/xpcom/include/string \
+                                          $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
+                                          $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
 TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET)         = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET))
 TEMPLATE_XPCOMBLDPROG_INCS.$(KBUILD_TARGET_ARCH)    = $(TEMPLATE_XPCOMEXE_INCS.$(KBUILD_TARGET_ARCH))
@@ -269,5 +266,5 @@
 	VBoxXPCOM \
 	VBoxXPCOMIPCC \
-	$(if $(VBOX_OSE),,VBox-xpcom-helper)
+	$(if $(VBOX_OSE),,VBoxHelper)
 
 # we put it here, as template it uses depends on VBoxRT,
@@ -275,5 +272,5 @@
 # r=bird: This doesn't work, it won't be built this way. The way to fix it is to make the order change in src/Makefile.kmk (or was it src/lib/Makefile.kmk) that puts src/VBox/Runtime before src/lib/xpcom18a4 standard for all builds.
 OTHERS += \
-        $(TARGET_VBox-xpcom-helper)
+        $(TARGET_VBoxHlp)
 
 
@@ -329,5 +326,5 @@
 #      obsoleted files in the $(INST_SDK) directory.
 #
-NSPRPUB-HEADERS_INST = $(INST_SDK)include/xpcom/nsprpub/
+NSPRPUB-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/
 NSPRPUB-HEADERS_IFFLAGS = -m 644
 NSPRPUB-HEADERS_SOURCES = \
@@ -382,5 +379,5 @@
 	nsprpub/pr/include/md/_vbox.cfg=>prcpucfg.h \
 
-NSPRPUB-MD-HEADERS_INST = $(INST_SDK)include/xpcom/nsprpub/md
+NSPRPUB-MD-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/md
 NSPRPUB-MD-HEADERS_IFFLAGS = -m 644
 NSPRPUB-MD-HEADERS_SOURCES = \
@@ -411,5 +408,5 @@
 	nsprpub/pr/include/md/_l4v2.cfg
 
-NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)include/xpcom/nsprpub/obsolete
+NSPRPUB-OBS-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/obsolete
 NSPRPUB-OBS-HEADERS_IFFLAGS = -m 644
 NSPRPUB-OBS-HEADERS_SOURCES = \
@@ -419,5 +416,5 @@
 	nsprpub/pr/include/obsolete/prsem.h
 
-NSPRPUB-PRIV-HEADERS_INST = $(INST_SDK)include/xpcom/nsprpub/private
+NSPRPUB-PRIV-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/nsprpub/private
 NSPRPUB-PRIV-HEADERS_IFFLAGS = -m 644
 NSPRPUB-PRIV-HEADERS_SOURCES = \
@@ -426,5 +423,5 @@
 	nsprpub/pr/include/private/prpriv.h
 
-STRING-HEADERS_INST = $(INST_SDK)include/xpcom/string
+STRING-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/string
 STRING-HEADERS_IFFLAGS = -m 644
 STRING-HEADERS_SOURCES = \
@@ -460,5 +457,5 @@
 	xpcom/string/public/string-template-undef.h
 
-XPCOM-HEADERS_INST = $(INST_SDK)include/xpcom/xpcom
+XPCOM-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/xpcom
 XPCOM-HEADERS_IFFLAGS = -m 644
 XPCOM-HEADERS_SOURCES = \
@@ -579,5 +576,5 @@
 	xpcom-config.h
 
-IPCD-HEADERS_INST = $(INST_SDK)include/xpcom/ipcd
+IPCD-HEADERS_INST = $(INST_SDK)/bindings/xpcom/include/ipcd
 IPCD-HEADERS_IFFLAGS = -m 644
 IPCD-HEADERS_SOURCES = \
@@ -1295,10 +1292,8 @@
 # Helper for initialization of XPCOM
 #
-VBox-xpcom-helper_TEMPLATE = VBOXMAINCLIENTDLL
 ## @todo why isn't this targetd called VBoxHlp and what is it good for anyway? it's not in any of the lists so it won't be processed or anything...
 ## update: Since r35225 this is no longer necessary, VBoxRT is already available when VBoxPython is linked. Do all the initialization from there!
-VBox-xpcom-helper_NAME = VBoxHlp
-VBox-xpcom-helper_DEFS =
-VBox-xpcom-helper_SOURCES = \
+VBoxHlp_DEFS =
+VBoxHlp_SOURCES = \
 	xpcom/helper/helper.cpp
 
@@ -1378,5 +1373,5 @@
 
 # Python Client Module - the Python bits.
-VBoxPython-inst-py-xpcom_INST = $(INST_SDK)/bindings/com/python/xpcom/
+VBoxPython-inst-py-xpcom_INST = $(INST_SDK)bindings/xpcom/python/xpcom/
 VBoxPython-inst-py-xpcom_SOURCES = \
 	python/vboxxpcom.py \
@@ -1397,5 +1392,5 @@
 
 # Python Client Module - a sample script.
-VBoxPython-inst-sample_INST = $(INST_SDK)/bindings/com/python/sample/
+VBoxPython-inst-sample_INST = $(INST_SDK)/bindings/xpcom/python/sample/
 VBoxPython-inst-sample_SOURCES = \
 	python/sample/vboxshell.py
@@ -1558,7 +1553,7 @@
 OTHER_CLEAN += \
 	$(PATH_VBox-xpcom-string)/idl_ts \
-	$(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES)))) \
-	$(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) \
-	$(addprefix $(VBOX_PATH_SDK)/idl/,$(notdir $(XPCOM_IDLFILES))) \
+	$(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES)))) \
+	$(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES)))) \
+	$(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/idl/,$(notdir $(XPCOM_IDLFILES))) \
 	$(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(XPCOM_IDLFILES))))
 
@@ -1683,13 +1678,13 @@
 	-I $(VBOX_PATH_XPCOM_SRC)/xpcom/reflect/xptinfo/public/
 define def_IDL
-$(VBOX_PATH_SDK)/include/$(notdir $(subst .idl,.h,$(idl))) \
+$(VBOX_PATH_SDK)/bindings/xpcom/include/$(notdir $(subst .idl,.h,$(idl))) \
 + $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): \
 		$(VBOX_PATH_XPCOM_SRC)/$(idl) \
 		| $$$$(TARGET_xpidl)
 	$$(call MSG_TOOL,xpidl,XPCOM,$$<,$$@)
-	$$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/include $(VBOX_PATH_SDK)/idl
+	$$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/xpcom/include $(VBOX_PATH_SDK)/bindings/xpcom/idl
 	$$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
 	$$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
-	$$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/idl
+	$$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/bindings/xpcom/idl
 endef
 
@@ -1697,5 +1692,5 @@
 
 # dummy target.
-$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES))))
+$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/bindings/xpcom/include/,$(notdir $(subst .idl,.h,$(XPCOM_IDLFILES))))
 	$(call MSG_L1,IDL processing completed.)
 	$(QUIET)$(MKDIR) -p $(dir $@)
