Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 76066)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 76067)
@@ -306,21 +306,12 @@
  VBoxSDS_INCS = \
  	include \
- 	$(VBoxSDS_0_OUTDIR) \
- 	$(VBOX_MAIN_APIWRAPPER_INCS)
+ 	$(VBoxSDS_0_OUTDIR)
  VBoxSDS_INCS.win = \
  	$(VBoxCOM_0_OUTDIR)
- VBoxSDS_LIBS += \
- 	$(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
  VBoxSDS_INTERMEDIATES = \
- 	$(VBOX_MAIN_PREREQS) \
- 	$(VBOX_MAIN_APIWRAPPER_GEN_HDRS)
+ 	$(VBOX_MAIN_PREREQS)
  VBoxSDS_SOURCES = \
- 	src-all/Global.cpp \
- 	src-all/AutoCaller.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
  	src-global/VirtualBoxSDSImpl.cpp
  VBoxSDS_SOURCES.win = \
- 	src-global/win/VirtualBoxClientListImpl.cpp \
  	src-global/win/VBoxSDS.cpp \
  	src-global/win/VBoxSDS.rc
@@ -1208,6 +1199,6 @@
  	$(PATH_SUB_CURRENT)/src-all/win/VBoxProxyStub.def \
  	$(PATH_SUB_CURRENT)/src-all/win/VBoxProxyStub.rc \
- 	$(PATH_SUB_CURRENT)/src-all/win/RpcChannelHook.cpp \
  	$(PATH_SUB_CURRENT)/src-all/win/VBoxProxyStub.c
+# 	$(PATH_SUB_CURRENT)/src-all/win/RpcChannelHook.cpp
  src-all/win/VBoxProxyStub.rc_DEPS = $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
  VBoxProxyStub_VirtualBox_p.c_CFLAGS.x86 = /Gz # Workaround for incorrect ObjectStublessClient* prototypes in SDK v7.1.
@@ -1224,6 +1215,6 @@
  	src-all/win/VBoxProxyStub.def \
  	src-all/win/VBoxProxyStubLegacy.rc \
- 	src-all/win/RpcChannelHook.cpp \
   	src-all/win/VBoxProxyStub.c
+# 	src-all/win/RpcChannelHook.cpp
  src-all/win/VBoxProxyStubLegacy.rc_DEPS = $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
 
@@ -1240,6 +1231,6 @@
  	src-all/win/VBoxProxyStub.c \
  	src-all/win/VBoxProxyStub-x86.rc \
- 	src-all/win/RpcChannelHook.cpp \
  	src-all/win/VBoxProxyStub.def
+# 	src-all/win/RpcChannelHook.cpp
   src-all/win/VBoxProxyStub-x86.rc_DEPS = $(VBoxCOM-x86_0_OUTDIR)/VirtualBox-x86.tlb
  endif
Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 76066)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 76067)
@@ -25769,4 +25769,5 @@
 </application>
 
+<if target="midl">
 <!-- Pay attention! Application uuid of this application is used in midl.xsl
      So if you change it then change filter in "interface" and "class" template in midl.xsl too
@@ -25777,6 +25778,4 @@
   supportsErrorInfo="yes"
 >
-
-<if target="midl">
 
   <!--
@@ -25819,5 +25818,5 @@
   <interface
     name="IVirtualBoxSDS" extends="$unknown" notdual="yes"
-    uuid="787d20ed-faf3-4170-6697-3a2a7de6e086"
+    uuid="152265b8-fe7d-4077-9dd6-032bc3f1c5a3"
     wsmap="suppress" internal="yes"
     reservedMethods="0" reservedAttributes="0"
@@ -25857,39 +25856,5 @@
       </method>
 
-      <method name="notifyClientsFinished">
-          <desc>Notify SDS that clients finished.</desc>
-      </method>
-
   </interface>
-
-    <!--
-  // IVirtualBoxClientList
-  //////////////////////////////////////////////////////////////////////////
-  -->
-
-    <interface
-      name="IVirtualBoxClientList" extends="$unknown"
-      uuid="6e7f09c9-da13-4126-9cc8-9aab81fed413"
-      wsmap="suppress"
-      reservedMethods="2" reservedAttributes="2"
-    >
-        <desc>
-            The IVirtualBoxClientList interface represents a list of VirtualBox API clients.
-        </desc>
-
-        <method name="registerClient">
-            <desc>Register VirtualBox API Client.</desc>
-            <param name="pid" type="long" dir="in">
-                <desc>Process ID of VirtualBox API client.</desc>
-            </param>
-        </method>
-
-        <attribute name="clients" readonly="yes" type="long" dir="out" safearray="yes">
-            <desc>List of registered VirtualBox API clients.</desc>
-        </attribute>
-
-    </interface>
-
-</if> <!-- bird: shouldn't this if-element at leat include the VBoxSDS module, if not the whole system service application? -->
 
 <!-- Warning: the name of module should coincide with real windows service name.
@@ -25907,9 +25872,7 @@
           <interface name="IVirtualBoxSDS" default="yes"/>
       </class>
-      <class name="VirtualBoxClientList" uuid="b2313c29-07eb-4613-ab27-f86bda7a0cae" namespace="virtualbox.org" >
-          <interface name="IVirtualBoxClientList" default="yes" />
-      </class>
   </module>
 </application>
+</if>
 
 </library>
Index: /trunk/src/VBox/Main/idl/midl.xsl
===================================================================
--- /trunk/src/VBox/Main/idl/midl.xsl	(revision 76066)
+++ /trunk/src/VBox/Main/idl/midl.xsl	(revision 76067)
@@ -127,10 +127,10 @@
     <xsl:text>&#x0A;</xsl:text>
     <!-- forward declarations -->
-    <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
+    <xsl:apply-templates select="descendant::application/if   | descendant::application/interface" mode="forward"/>
     <xsl:text>&#x0A;</xsl:text>
     <!-- all enums go first -->
-    <xsl:apply-templates select="application/enum | application/if[enum]"/>
+    <xsl:apply-templates select="descendant::application/enum | descendant::application/if[enum]"/>
     <!-- declare the interfaces -->
-    <xsl:apply-templates select="application/if | application/interface"/>
+    <xsl:apply-templates select="descendant::application/if   | descendant::application/interface"/>
   </xsl:if>
 
@@ -153,17 +153,17 @@
     <xsl:when test="$g_fGenProxy = 'yes'">
       <!-- reference enums and interfaces -->
-      <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
-      <xsl:apply-templates select="application/enum | application/if[enum]" mode="forward"/>
+      <xsl:apply-templates select="descendant::application/if          | descendant::application/interface" mode="forward"/>
+      <xsl:apply-templates select="descendant::application/enum        | descendant::application/if[enum]" mode="forward"/>
       <!-- the modules (i.e. everything else) -->
-      <xsl:apply-templates select="application/module | application/if[module]"/>
+      <xsl:apply-templates select="descendant::application/module      | descendant::application/if[module]"/>
     </xsl:when>
     <xsl:otherwise>
       <!-- forward declarations -->
-      <xsl:apply-templates select="application/if | application/interface" mode="forward"/>
+      <xsl:apply-templates select="descendant::application/if          | descendant::application/interface" mode="forward"/>
       <!-- all enums go first -->
-      <xsl:apply-templates select="application/enum | application/if[enum]"/>
+      <xsl:apply-templates select="descendant::application/enum        | descendant::application/if[enum]"/>
       <!-- everything else but result codes and enums -->
-      <xsl:apply-templates select="  application/interface | application/if[interface]
-                                   | application/module | application/if[module]"/>
+      <xsl:apply-templates select="  descendant::application/interface | descendant::application/if[interface]
+                                   | descendant::application/module    | descendant::application/if[module]"/>
     </xsl:otherwise>
   </xsl:choose>
@@ -857,6 +857,8 @@
             <!-- enum types -->
             <xsl:when test="
-              (ancestor::library/application/enum[@name=current()]) or
-              (ancestor::library/application/if[@target=$self_target]/enum[@name=current()])
+                 (ancestor::library/application/enum[@name=current()])
+              or (ancestor::library/if/application/enum[@name=current()])
+              or (ancestor::library/application/if[@target=$self_target]/enum[@name=current()])
+              or (ancestor::library/if/application/if[@target=$self_target]/enum[@name=current()])
             ">
               <xsl:value-of select="."/>
@@ -864,6 +866,8 @@
             <!-- custom interface types -->
             <xsl:when test="
-              ((ancestor::library/application/interface[@name=current()]) or
-               (ancestor::library/application/if[@target=$self_target]/interface[@name=current()])
+              (    (ancestor::library/application/interface[@name=current()])
+                or (ancestor::library/if/application/interface[@name=current()])
+                or (ancestor::library/application/if[@target=$self_target]/interface[@name=current()])
+                or (ancestor::library/if/application/if[@target=$self_target]/interface[@name=current()])
               )
             ">
@@ -887,5 +891,5 @@
 <!-- Filters for switch on/off VBoxSDS definitions -->
 
-<xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//module/class" >
+<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//module/class" >
     <xsl:if test="$g_fVBoxWithSDS='yes'" >
         <xsl:call-template name="template_class" />
@@ -893,5 +897,5 @@
 </xsl:template>
 
-<xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']/if//interface
+<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']/if//interface
                                 | application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" >
     <xsl:if test="$g_fVBoxWithSDS='yes'" >
@@ -900,5 +904,5 @@
 </xsl:template>
 
-<xsl:template match="application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" mode="forward" >
+<xsl:template match="if[@target='midl']/application[@uuid='ec0e78e8-fa43-43e8-ac0a-02c784c4a4fa']//interface" mode="forward" >
     <xsl:if test="$g_fVBoxWithSDS='yes'" >
         <xsl:call-template name="template_interface_forward" />
Index: /trunk/src/VBox/Main/include/RpcChannelHook.h
===================================================================
--- /trunk/src/VBox/Main/include/RpcChannelHook.h	(revision 76066)
+++ /trunk/src/VBox/Main/include/RpcChannelHook.h	(revision 76067)
@@ -1,6 +1,6 @@
 /* $Id$ */
 /** @file
-* VBox COM Rpc Channel Hook definition
-*/
+ * VirtualBox Main - RPC Channel Hook Hack, VBoxProxyStub.
+ */
 
 /*
@@ -21,29 +21,33 @@
 #include <iprt/cdefs.h>
 
-#ifdef RT_OS_WINDOWS
+#ifndef RT_OS_WINDOWS
+# error "Oops"
+#endif
+
 #include <iprt/win/windows.h>
 #include <ObjIdl.h>
 
 
-typedef void *PRPC_CHANNEL_HOOK;
+RT_C_DECLS_BEGIN
 
-// {CEDA3E95-A46A-4C41-AA01-EFFD856E455C}
+/* {CEDA3E95-A46A-4C41-AA01-EFFD856E455C} */
 static const GUID RPC_CHANNEL_EXTENSION_GUID =
 { 0xceda3e95, 0xa46a, 0x4c41,{ 0xaa, 0x1, 0xef, 0xfd, 0x85, 0x6e, 0x45, 0x5c } };
 
-RT_C_DECLS_BEGIN
-// C wrapper for using in proxy
+/** C wrapper for using in proxy (C code). */
 void SetupClientRpcChannelHook(void);
+
 RT_C_DECLS_END
 
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 
-/*
-* This is RPC channel hook implementation for registering VirtualBox API clients.
-* This channel hook instantiated in COM client process by VBoxProxyStub
-* We use it to catch a moment when a new VirtualBox object sucessfully instantiated to
-* register new API client in a VBoxSDS clients list.
-*/
+/**
+ * This is RPC channel hook implementation for registering VirtualBox API clients.
+ *
+ * This channel hook instantiated in COM client process by VBoxProxyStub
+ * We use it to catch a moment when a new VirtualBox object sucessfully instantiated to
+ * register new API client in a VBoxSDS clients list.
+ */
 class CRpcChannelHook : public IChannelHook
 {
@@ -52,16 +56,16 @@
 
     /* IUnknown Interface methods */
-    STDMETHODIMP QueryInterface(REFIID riid, void **ppv);
-    STDMETHODIMP_(ULONG) AddRef(void);
-    STDMETHODIMP_(ULONG) Release(void);
+    STDMETHOD(QueryInterface)(REFIID riid, void **ppv);
+    STDMETHOD_(ULONG, AddRef)(void);
+    STDMETHOD_(ULONG, Release)(void);
 
     /* IChannelHook Interface methods */
-    STDMETHODIMP_(void) ClientGetSize(REFGUID uExtent, REFIID riid, ULONG *pDataSize);
-    STDMETHODIMP_(void) ClientFillBuffer(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer);
-    STDMETHODIMP_(void) ClientNotify(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep, HRESULT hrFault);
+    STDMETHOD_(void, ClientGetSize)(REFGUID uExtent, REFIID riid, ULONG *pDataSize);
+    STDMETHOD_(void, ClientFillBuffer)(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer);
+    STDMETHOD_(void, ClientNotify)(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep, HRESULT hrFault);
 
-    STDMETHODIMP_(void) ServerNotify(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep);
-    STDMETHODIMP_(void) ServerGetSize(REFGUID uExtent, REFIID riid, HRESULT hrFault, ULONG *pDataSize);
-    STDMETHODIMP_(void) ServerFillBuffer(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer, HRESULT hrFault);
+    STDMETHOD_(void, ServerNotify)(REFGUID uExtent, REFIID riid, ULONG cbDataSize, void *pDataBuffer, DWORD lDataRep);
+    STDMETHOD_(void, ServerGetSize)(REFGUID uExtent, REFIID riid, HRESULT hrFault, ULONG *pDataSize);
+    STDMETHOD_(void, ServerFillBuffer)(REFGUID uExtent, REFIID riid, ULONG *pDataSize, void *pDataBuffer, HRESULT hrFault);
 
 protected:
@@ -70,8 +74,8 @@
 
 protected:
-    const GUID m_ChannelHookID;
-    static volatile bool s_fChannelRegistered;
-    static volatile bool s_fVBpoxSDSCalledOnce;
-    static CRpcChannelHook s_RpcChannelHook;
+    const GUID              m_ChannelHookID;
+    static volatile bool    s_fChannelRegistered;
+    static volatile bool    s_fVBpoxSDSCalledOnce;
+    static CRpcChannelHook  s_RpcChannelHook;
 
     /* C wrapper*/
@@ -79,9 +83,5 @@
 };
 
+#endif /* __cplusplus */
 
-#endif // #if defined(__cplusplus)
-
-
-#endif // #ifdef RT_OS_WINDOWS
-
-#endif // ____H_RPCCHANNELHOOK
+#endif
Index: /trunk/src/VBox/Main/include/VirtualBoxSDSImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxSDSImpl.h	(revision 76066)
+++ /trunk/src/VBox/Main/include/VirtualBoxSDSImpl.h	(revision 76067)
@@ -75,5 +75,4 @@
     STDMETHOD(RegisterVBoxSVC)(IVBoxSVCRegistration *aVBoxSVC, LONG aPid, IUnknown **aExistingVirtualBox);
     STDMETHOD(DeregisterVBoxSVC)(IVBoxSVCRegistration *aVBoxSVC, LONG aPid);
-    STDMETHOD(NotifyClientsFinished)(); /**< @todo r=bird: Internal within SDS! Make private. */
     /** @} */
 
Index: /trunk/src/VBox/Main/src-all/win/RpcChannelHook.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/win/RpcChannelHook.cpp	(revision 76066)
+++ /trunk/src/VBox/Main/src-all/win/RpcChannelHook.cpp	(revision 76067)
@@ -1,6 +1,6 @@
 /* $Id$ */
 /** @file
-* VBox Global COM Class implementation.
-*/
+ * VirtualBox Main - RPC Channel Hook Hack, VBoxProxyStub.
+ */
 
 /*
@@ -17,15 +17,17 @@
 
 
-#include <iprt\assert.h>
-#include <iprt\process.h>
-#include <iprt\string.h>
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#include <iprt/assert.h>
+#include <iprt/process.h>
+#include <iprt/string.h>
 #include <iprt/asm.h>
 #include "Logging.h"
 #include <VBox/com/VirtualBox.h>
 
-#include <string>
-
 #include "VirtualBox.h"
 #include "RpcChannelHook.h"
+
 
 #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_SDS)
@@ -43,16 +45,13 @@
 {
     if (riid == IID_IUnknown)
-    {
-        *ppv = (IUnknown*)this;
-    }
+        *ppv = (IUnknown *)this;
     else if (riid == IID_IChannelHook)
-    {
-        *ppv = (IChannelHook*)this;
-    }
+        *ppv = (IChannelHook *)this;
     else
     {
-        *ppv = 0;
+        *ppv = NULL;
         return E_NOINTERFACE;
     }
+
     this->AddRef();
     return S_OK;
Index: /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c
===================================================================
--- /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c	(revision 76066)
+++ /trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c	(revision 76067)
@@ -1357,8 +1357,10 @@
                         &LIBID_VirtualBox, "LocalServer32", pwszVBoxDir, pszSdsExe, NULL /*N/A*/);
 
+# if 0
     VbpsRegisterClassName(pState, "VirtualBox.VirtualBoxClientList.1", "VirtualBoxClientList Class", &CLSID_VirtualBoxClientList, NULL);
     VbpsRegisterClassName(pState, "VirtualBox.VirtualBoxClientList", "VirtualBoxClientList Class", &CLSID_VirtualBoxClientList, ".1");
     VbpsRegisterClassId(pState, &CLSID_VirtualBoxClientList, "VirtualBoxClientList Class", pszSdsAppId, "VirtualBox.VirtualBoxClientList", ".1",
         &LIBID_VirtualBox, "LocalServer32", pwszVBoxDir, pszSdsExe, NULL /*N/A*/);
+# endif
 #endif
 }
Index: /trunk/src/VBox/Main/src-global/VirtualBoxSDSImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-global/VirtualBoxSDSImpl.cpp	(revision 76066)
+++ /trunk/src/VBox/Main/src-global/VirtualBoxSDSImpl.cpp	(revision 76067)
@@ -53,5 +53,4 @@
      * This is NULL if not set. */
     ComPtr<IVBoxSVCRegistration>    m_ptrTheChosenOne;
-    ComPtr<IVirtualBoxClientList>   m_ptrClientList;
 private:
     /** Reference count to make destruction safe wrt hung callers.
@@ -184,7 +183,4 @@
                         LogRel(("VirtualBoxSDS::registerVBoxSVC: Seems VBoxSVC instance died.  Dropping it and letting caller take over. (hrc=%Rhrc)\n", hrc));
                         pUserData->m_ptrTheChosenOne.setNull();
-
-                        /* Release the client list and stop client list watcher thread*/
-                        pUserData->m_ptrClientList.setNull();
                     }
                 }
@@ -194,5 +190,4 @@
                 /*
                  * Is the caller the chosen one?
-                 * The chosen one always have a client list object for monitoring purposes.
                  */
                 if (pUserData->m_ptrTheChosenOne.isNull())
@@ -200,22 +195,5 @@
                     LogRel(("VirtualBoxSDS::registerVBoxSVC: Making aPid=%u (%#x) the chosen one for user %s (%s)!\n",
                             aPid, aPid, pUserData->m_strUserSid.c_str(), pUserData->m_strUsername.c_str()));
-                    try
-                    {
-                        /// @todo r=bird: Enable when design has been corrected.
-                        ///hrc = pUserData->m_ptrClientList.createLocalObject(CLSID_VirtualBoxClientList);
-                        hrc = S_OK;
-                        if (SUCCEEDED(hrc))
-                        {
-                            LogFunc(("Created API client list instance in VBoxSDS: hrc=%Rhrc\n", hrc));
-                            pUserData->m_ptrTheChosenOne = aVBoxSVC;
-                        }
-                        else
-                            LogRel(("VirtualBoxSDS::registerVBoxSVC: Error in creating API client list instance: hrc=%Rhrc\n", hrc));
-                    }
-                    catch (...)
-                    {
-                        LogRel(("VirtualBoxSDS::registerVBoxSVC: Unexpected exception setting the chosen one!\n"));
-                        hrc = E_UNEXPECTED;
-                    }
+                    pUserData->m_ptrTheChosenOne = aVBoxSVC;
                 }
 
@@ -255,6 +233,4 @@
                             pUserData->m_strUserSid.c_str(), pUserData->m_strUsername.c_str()));
                     pUserData->m_ptrTheChosenOne.setNull();
-                    /* Release the client list and stop client list watcher thread*/
-                    pUserData->m_ptrClientList.setNull();
                 }
                 else
@@ -283,37 +259,7 @@
 
 
-STDMETHODIMP VirtualBoxSDS::NotifyClientsFinished()
-{
-    LogRelFlowThisFuncEnter();
-
-    int vrc = RTCritSectRwEnterShared(&m_MapCritSect);
-    if (RT_SUCCESS(vrc))
-    {
-/** @todo r=bird: Why notify all VBoxSVC instances?  That makes zero sense!   */
-        for (UserDataMap_T::iterator it = m_UserDataMap.begin(); it != m_UserDataMap.end(); ++it)
-        {
-            VBoxSDSPerUserData *pUserData = it->second;
-            if (pUserData && pUserData->m_ptrTheChosenOne)
-            {
-                /*
-                 * Notify VBoxSVC about finishing all API clients it should free
-                 * references to VBoxSDS and clean up itself
-                 */
-                LogRelFunc(("Notify VBoxSVC that all clients finished\n"));
-                if (pUserData->m_ptrClientList.isNotNull())
-                    pUserData->m_ptrClientList.setNull();
-
-                pUserData->m_ptrTheChosenOne->NotifyClientsFinished();
-            }
-        }
-        RTCritSectRwLeaveShared(&m_MapCritSect);
-    }
-
-    LogRelFlowThisFuncLeave();
-    return S_OK;
-}
-
-// private methods
-///////////////////////////////////////////////////////////////////////////////
+/*********************************************************************************************************************************
+*   Internal Methods                                                                                                             *
+*********************************************************************************************************************************/
 
 /*static*/ bool VirtualBoxSDS::i_getClientUserSid(com::Utf8Str *a_pStrSid, com::Utf8Str *a_pStrUsername)
Index: /trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp
===================================================================
--- /trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp	(revision 76066)
+++ /trunk/src/VBox/Main/src-global/win/VBoxSDS.cpp	(revision 76067)
@@ -87,5 +87,4 @@
 
 #include "VirtualBoxSDSImpl.h"
-#include "VirtualBoxClientListImpl.h"
 #include "Logging.h"
 
@@ -926,5 +925,4 @@
             BEGIN_OBJECT_MAP(s_aObjectMap)
                 OBJECT_ENTRY(CLSID_VirtualBoxSDS, VirtualBoxSDS)
-                OBJECT_ENTRY(CLSID_VirtualBoxClientList, VirtualBoxClientList)
             END_OBJECT_MAP()
             hrcExit = pServiceModule->init(s_aObjectMap, hInstance, &LIBID_VirtualBox,
Index: /trunk/src/VBox/Main/src-server/win/svcmain.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/win/svcmain.cpp	(revision 76066)
+++ /trunk/src/VBox/Main/src-server/win/svcmain.cpp	(revision 76067)
@@ -98,5 +98,5 @@
 
 
-#ifdef VBOX_WITH_SDS
+#if 0 //def VBOX_WITH_SDS
 
 BOOL CALLBACK CloseWindowProc(_In_ HWND   hWnd, _In_ LPARAM /* lParam */)
@@ -691,5 +691,5 @@
                          g_pModule->bActivity, g_pModule->GetLockCount()));
 
-#ifdef VBOX_WITH_SDS
+#if 0 //def VBOX_WITH_SDS
                     // On Windows 7 our clients doesn't receive right sequence of Session End events
                     // So we send them all WM_QUIT to forcible close them.