Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 33589)
+++ /trunk/Config.kmk	(revision 33590)
@@ -440,5 +440,5 @@
 # The headless frontend.
 VBOX_WITH_HEADLESS = 1
-# Enable the VRDP server.
+# Enable the build of VRDP server.
 VBOX_WITH_VRDP = 1
 # Enable support for video redirection VRDP channel.
@@ -963,5 +963,4 @@
 #
 ifndef VBOX_WITH_MAIN
- VBOX_WITH_VRDP=
  VBOX_WITH_VBOXSDL=
  VBOX_WITH_QTGUI=
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 33590)
@@ -1083,9 +1083,6 @@
  Drivers_DEFS         += VBOX_WITH_USB
 
- ifdef VBOX_WITH_VRDP
-  Drivers_DEFS        += VBOX_WITH_VRDP
-  Drivers_SOURCES     += \
-	USB/vrdp/USBProxyDevice-vrdp.cpp
- endif
+ Drivers_SOURCES     += \
+       USB/vrdp/USBProxyDevice-vrdp.cpp
 
  Drivers_DEFS.darwin  += VUSB_HAVE_USBPROXY_DEVICE
Index: /trunk/src/VBox/Devices/USB/USBProxyDevice.cpp
===================================================================
--- /trunk/src/VBox/Devices/USB/USBProxyDevice.cpp	(revision 33589)
+++ /trunk/src/VBox/Devices/USB/USBProxyDevice.cpp	(revision 33590)
@@ -781,9 +781,5 @@
         pThis->pOps = &g_USBProxyDeviceHost;
     else
-#ifdef VBOX_WITH_VRDP
         pThis->pOps = &g_USBProxyDeviceVRDP;
-#else
-        return VERR_NOT_SUPPORTED;
-#endif
     rc = pThis->pOps->pfnOpen(pThis, szAddress, pvBackend);
     if (RT_FAILURE(rc))
Index: /trunk/src/VBox/Devices/USB/USBProxyDevice.h
===================================================================
--- /trunk/src/VBox/Devices/USB/USBProxyDevice.h	(revision 33589)
+++ /trunk/src/VBox/Devices/USB/USBProxyDevice.h	(revision 33590)
@@ -140,8 +140,6 @@
 /** The Host backend. */
 extern const USBPROXYBACK g_USBProxyDeviceHost;
-#ifdef VBOX_WITH_VRDP
-/** The VRDP backend. */
+/** The remote desktop backend. */
 extern const USBPROXYBACK g_USBProxyDeviceVRDP;
-#endif /* VBOX_WITH_VRDP */
 
 #ifdef RDESKTOP
@@ -211,5 +209,4 @@
         RTFILE File;
         int fd;
-#ifdef VBOX_WITH_VRDP
         struct vrdp_priv
         {
@@ -217,5 +214,4 @@
             void *pDevice;
         } vrdp;
-#endif /* VBOX_WITH_VRDP */
     } Backend;
 } USBPROXYDEV;
Index: /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxBFE/Makefile.kmk	(revision 33590)
@@ -52,7 +52,4 @@
 #VBoxBFE_DEFS += VBOX_SECURELABEL
 #endif
-ifdef VBOX_WITH_VRDP
-VBoxBFE_DEFS += VBOX_WITH_VRDP
-endif
 VBoxBFE_DEFS += VBOXBFE_WITHOUT_COM
 ifdef VBOX_WITH_LINUX_COMPILER_H
Index: /trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp	(revision 33590)
@@ -390,7 +390,5 @@
              "  -tapfd<1-N> <fd>   Use existing TAP device, don't allocate\n"
 #endif
-#ifdef VBOX_WITH_VRDP
              "  -vrdp [port]       Listen for VRDP connections on port (default if not specified)\n"
-#endif
 #ifdef VBOX_SECURELABEL
              "  -securelabel       Display a secure VM label at the top of the screen\n"
@@ -416,7 +414,5 @@
 {
     bool fFullscreen = false;
-#ifdef VBOX_WITH_VRDP
     int32_t portVRDP = -1;
-#endif
 #ifdef VBOX_SECURELABEL
     bool fSecureLabel = false;
@@ -711,5 +707,4 @@
         }
 #endif /* RT_OS_LINUX */
-#ifdef VBOX_WITH_VRDP
         else if (strcmp(pszArg, "-vrdp") == 0)
         {
@@ -725,5 +720,4 @@
             }
         }
-#endif /* VBOX_WITH_VRDP */
 #ifdef VBOX_SECURELABEL
         else if (strcmp(pszArg, "-securelabel") == 0)
Index: /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk	(revision 33590)
@@ -49,8 +49,5 @@
 VBoxHeadless_DEFS       = VBOX_FFMPEG
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp
-ifdef VBOX_WITH_VRDP
- VBoxHeadless_DEFS     += VBOX_WITH_VRDP
- VBoxHeadless_SOURCES  += Framebuffer.cpp
-endif
+VBoxHeadless_SOURCES  += Framebuffer.cpp
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxHeadless_DEFS     += VBOX_WITH_GUEST_PROPS
Index: /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp	(revision 33590)
@@ -57,7 +57,5 @@
 #endif
 
-#ifdef VBOX_WITH_VRDP
-# include "Framebuffer.h"
-#endif
+#include "Framebuffer.h"
 #ifdef VBOX_WITH_VNC
 # include "FramebufferVNC.h"
@@ -315,5 +313,4 @@
                 Assert(rdicev);
 
-#ifdef VBOX_WITH_VRDP
                 if (gConsole)
                 {
@@ -337,5 +334,4 @@
                     }
                 }
-#endif
                 break;
             }
@@ -445,5 +441,4 @@
              "   -o, --vncpass <pw>                    Set the VNC server password\n"
 #endif
-#ifdef VBOX_WITH_VRDP
              "   -v, -vrde, --vrde on|off|config       Enable (default) or disable the VRDE\n"
              "                                         server or don't change the setting\n"
@@ -454,5 +449,4 @@
              "                                         \"TCP/Address\" - interface IP the VRDE server\n"
              "                                         will bind to\n"
-#endif
 #ifdef VBOX_FFMPEG
              "   -c, -capture, --capture               Record the VM screen output to a file\n"
@@ -518,5 +512,4 @@
 extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp)
 {
-#ifdef VBOX_WITH_VRDP
     const char *vrdePort = NULL;
     const char *vrdeAddress = NULL;
@@ -524,5 +517,4 @@
     int cVRDEProperties = 0;
     const char *aVRDEProperties[16];
-#endif
 #ifdef VBOX_WITH_VNC
     bool        fVNCEnable      = false;
@@ -575,5 +567,4 @@
         { "-startvm", 's', RTGETOPT_REQ_STRING },
         { "--startvm", 's', RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_VRDP
         { "-vrdpport", 'p', RTGETOPT_REQ_STRING },     /* VRDE: deprecated. */
         { "--vrdpport", 'p', RTGETOPT_REQ_STRING },    /* VRDE: deprecated. */
@@ -586,5 +577,4 @@
         { "-vrdeproperty", 'e', RTGETOPT_REQ_STRING },
         { "--vrdeproperty", 'e', RTGETOPT_REQ_STRING },
-#endif /* VBOX_WITH_VRDP defined */
 #ifdef VBOX_WITH_VNC
         { "--vncport", 'm', RTGETOPT_REQ_INT32 },
@@ -634,5 +624,4 @@
                 pcszNameOrUUID = ValueUnion.psz;
                 break;
-#ifdef VBOX_WITH_VRDP
             case 'p':
                 RTPrintf("Warning: '-p' or '-vrdpport' are deprecated. Use '-e \"TCP/Ports=%s\"'\n", ValueUnion.psz);
@@ -652,5 +641,4 @@
                      RTPrintf("Warning: too many VRDE properties. Ignored: '%s'\n", ValueUnion.psz);
                 break;
-#endif /* VBOX_WITH_VRDP defined */
 #ifdef VBOX_WITH_VNC
             case 'n':
@@ -904,5 +892,4 @@
 
         unsigned uScreenId;
-#ifdef VBOX_WITH_VRDP
         for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
         {
@@ -934,5 +921,5 @@
             break;
         }
-#endif
+
         // fill in remaining slots with null framebuffers
         for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
@@ -1017,5 +1004,4 @@
         }
 
-#ifdef VBOX_WITH_VRDP
         /* default is to enable the remote desktop server (backward compatibility) */
         BOOL fVRDEEnable = true;
@@ -1111,5 +1097,5 @@
             }
         }
-#endif
+
         Log(("VBoxHeadless: Powering up the machine...\n"));
 
Index: /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk	(revision 33590)
@@ -70,6 +70,5 @@
  	$(if $(VBOX_WITH_VDE), VBOX_WITH_VDE) \
 	$(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \
- 	$(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \
- 	$(if $(VBOX_WITH_VRDP), VBOX_WITH_VRDP)
+ 	$(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO)
 
 ifneq ($(KBUILD_TARGET),win)
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp	(revision 33590)
@@ -486,5 +486,4 @@
             }
         }
-#ifdef VBOX_WITH_VRDP
         else if (   !strcmp(a->argv[1], "vrde")
                  || !strcmp(a->argv[1], "vrdp"))
@@ -567,5 +566,5 @@
             }
         }
-        else if (!strcmp(a->argv[1], "vrdesetproperty"))
+        else if (!strcmp(a->argv[1], "vrdeproperty"))
         {
             if (a->argc <= 1 + 1)
@@ -595,5 +594,5 @@
                     else
                     {
-                        errorArgument("Invalid --vrdesetproperty argument '%s'", a->argv[2]);
+                        errorArgument("Invalid --vrdeproperty argument '%s'", a->argv[2]);
                         rc = E_FAIL;
                         break;
@@ -612,5 +611,4 @@
             }
         }
-#endif /* VBOX_WITH_VRDP */
         else if (   !strcmp(a->argv[1], "usbattach")
                  || !strcmp(a->argv[1], "usbdetach"))
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp	(revision 33590)
@@ -74,9 +74,4 @@
     bool fDarwin = false;
 #endif
-#ifdef VBOX_WITH_VRDP
-    bool fVRDE = true;
-#else
-    bool fVRDE = false;
-#endif
 #ifdef VBOX_WITH_VBOXSDL
     bool fVBoxSDL = true;
@@ -93,5 +88,4 @@
         fFreeBSD = true;
         fDarwin = true;
-        fVRDE = true;
         fVBoxSDL = true;
         u64Cmd = USAGE_ALL;
@@ -310,10 +304,8 @@
                      "                            [--clipboard disabled|hosttoguest|guesttohost|\n"
                      "                                         bidirectional]\n");
-        if (fVRDE)
-        {
-            RTStrmPrintf(pStrm,
+        RTStrmPrintf(pStrm,
                      "                            [--vrde on|off]\n"
                      "                            [--vrdelibrary default|<name>\n"
-                     "                            [--vrdesetproperty <name=[value]>]\n"
+                     "                            [--vrdeproperty <name=[value]>]\n"
                      "                            [--vrdeauthtype null|external|guest]\n"
                      "                            [--vrdemulticon on|off]\n"
@@ -321,5 +313,4 @@
                      "                            [--vrdevideochannel on|off]\n"
                      "                            [--vrdevideochannelquality <percent>]\n");
-        }
         RTStrmPrintf(pStrm,
                      "                            [--usb on|off]\n"
@@ -404,12 +395,9 @@
                      "                            usbattach <uuid>|<address> |\n"
                      "                            usbdetach <uuid>|<address> |\n");
-        if (fVRDE)
-        {
-            RTStrmPrintf(pStrm,
+        RTStrmPrintf(pStrm,
                      "                            vrde on|off |\n");
-            RTStrmPrintf(pStrm,
-                     "                            vrdesetproperty <name=[value]> |\n"
+        RTStrmPrintf(pStrm,
+                     "                            vrdeproperty <name=[value]> |\n"
                      "                            vrdevideochannelquality <percent>\n");
-        }
         RTStrmPrintf(pStrm,
                      "                            setvideomodehint <xres> <yres> <bpp> [display] |\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 33590)
@@ -132,5 +132,4 @@
     MODIFYVM_AUDIO,
     MODIFYVM_CLIPBOARD,
-#ifdef VBOX_WITH_VRDP
     MODIFYVM_VRDPPORT,                /* VRDE: deprecated */
     MODIFYVM_VRDPADDRESS,             /* VRDE: deprecated */
@@ -141,5 +140,5 @@
     MODIFYVM_VRDPVIDEOCHANNELQUALITY, /* VRDE: deprecated */
     MODIFYVM_VRDP,                    /* VRDE: deprecated */
-    MODIFYVM_VRDESETPROPERTY,
+    MODIFYVM_VRDEPROPERTY,
     MODIFYVM_VRDEAUTHTYPE,
     MODIFYVM_VRDEMULTICON,
@@ -149,5 +148,4 @@
     MODIFYVM_VRDELIBRARY,
     MODIFYVM_VRDE,
-#endif
     MODIFYVM_RTCUSEUTC,
     MODIFYVM_USBEHCI,
@@ -257,5 +255,4 @@
     { "--audio",                    MODIFYVM_AUDIO,                     RTGETOPT_REQ_STRING },
     { "--clipboard",                MODIFYVM_CLIPBOARD,                 RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_VRDP
     { "--vrdpport",                 MODIFYVM_VRDPPORT,                  RTGETOPT_REQ_STRING },     /* deprecated */
     { "--vrdpaddress",              MODIFYVM_VRDPADDRESS,               RTGETOPT_REQ_STRING },     /* deprecated */
@@ -266,5 +263,5 @@
     { "--vrdpvideochannelquality",  MODIFYVM_VRDPVIDEOCHANNELQUALITY,   RTGETOPT_REQ_UINT32 },     /* deprecated */
     { "--vrdp",                     MODIFYVM_VRDP,                      RTGETOPT_REQ_BOOL_ONOFF }, /* deprecated */
-    { "--vrdesetproperty",          MODIFYVM_VRDESETPROPERTY,           RTGETOPT_REQ_STRING },
+    { "--vrdeproperty",             MODIFYVM_VRDEPROPERTY,              RTGETOPT_REQ_STRING },
     { "--vrdeauthtype",             MODIFYVM_VRDEAUTHTYPE,              RTGETOPT_REQ_STRING },
     { "--vrdemulticon",             MODIFYVM_VRDEMULTICON,              RTGETOPT_REQ_BOOL_ONOFF },
@@ -274,5 +271,4 @@
     { "--vrdelibrary",              MODIFYVM_VRDELIBRARY,               RTGETOPT_REQ_STRING },
     { "--vrde",                     MODIFYVM_VRDE,                      RTGETOPT_REQ_BOOL_ONOFF },
-#endif
     { "--usbehci",                  MODIFYVM_USBEHCI,                   RTGETOPT_REQ_BOOL_ONOFF },
     { "--usb",                      MODIFYVM_USB,                       RTGETOPT_REQ_BOOL_ONOFF },
@@ -302,5 +298,5 @@
 static void vrdeWarningDeprecatedProperty(const char *pszOption, const char *pszProperty, const char *pszArg)
 {
-    RTStrmPrintf(g_pStdErr, "Warning: '--%s' is deprecated. Use '--vrdesetproperty \"%s=%s\"'.\n",
+    RTStrmPrintf(g_pStdErr, "Warning: '--%s' is deprecated. Use '--vrdeproperty \"%s=%s\"'.\n",
                  pszOption, pszProperty, pszArg);
 }
@@ -1825,5 +1821,4 @@
             }
 
-#ifdef VBOX_WITH_VRDP
             case MODIFYVM_VRDELIBRARY:
             {
@@ -1845,5 +1840,5 @@
             }
 
-            case MODIFYVM_VRDESETPROPERTY:
+            case MODIFYVM_VRDEPROPERTY:
             {
                 ComPtr<IVRDEServer> vrdeServer;
@@ -1870,5 +1865,5 @@
                             RTStrFree(pszProperty);
 
-                            errorArgument("Invalid --vrdesetproperty argument '%s'", ValueUnion.psz);
+                            errorArgument("Invalid --vrdeproperty argument '%s'", ValueUnion.psz);
                             rc = E_FAIL;
                             break;
@@ -1999,5 +1994,4 @@
                 break;
             }
-#endif /* VBOX_WITH_VRDP */
 
             case MODIFYVM_USBEHCI:
Index: /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk	(revision 33590)
@@ -59,7 +59,4 @@
   VBoxSDL_DEFS    += VBOX_SECURELABEL
  endif
-endif
-ifdef VBOX_WITH_VRDP
- VBoxSDL_DEFS     += VBOX_WITH_VRDP
 endif
 VBoxSDL_DEFS.freebsd = VBOXSDL_WITH_X11
Index: /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp	(revision 33589)
+++ /trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp	(revision 33590)
@@ -601,7 +601,5 @@
              "  --hostkey <key> {<key2>} <mod> Set the host key to the values obtained using --detecthostkey\n"
              "  --termacpi               Send an ACPI power button event when closing the window\n"
-#ifdef VBOX_WITH_VRDP
              "  --vrdp <ports>           Listen for VRDP connections on one of specified ports (default if not specified)\n"
-#endif
              "  --discardstate           Discard saved state (if present) and revert to last snapshot (if present)\n"
 #ifdef VBOX_SECURELABEL
@@ -799,7 +797,5 @@
     char *cdromFile = NULL;
     char *fdaFile   = NULL;
-#ifdef VBOX_WITH_VRDP
     const char *portVRDP = NULL;
-#endif
     bool fDiscardState = false;
 #ifdef VBOX_SECURELABEL
@@ -1135,5 +1131,4 @@
             }
         }
-#ifdef VBOX_WITH_VRDP
         else if (   !strcmp(argv[curArg], "--vrdp")
                  || !strcmp(argv[curArg], "-vrdp"))
@@ -1150,5 +1145,4 @@
             }
         }
-#endif /* VBOX_WITH_VRDP */
         else if (   !strcmp(argv[curArg], "--discardstate")
                  || !strcmp(argv[curArg], "-discardstate"))
@@ -1875,5 +1869,4 @@
     }
 
-#ifdef VBOX_WITH_VRDP
     if (portVRDP)
     {
@@ -1902,5 +1895,4 @@
         }
     }
-#endif
 
     rc = E_FAIL;
@@ -2686,8 +2678,6 @@
 #endif /* VBOX_WITH_XPCOM */
 
-#ifdef VBOX_WITH_VRDP
     if (gVRDEServer)
         rc = gVRDEServer->COMSETTER(Enabled)(FALSE);
-#endif
 
     /*
Index: /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp	(revision 33589)
+++ /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp	(revision 33590)
@@ -146,8 +146,6 @@
 #endif
 
-//#ifdef VBOX_WITH_VRDP
     {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VRDPAuth" SUPLIB_DLL_SUFF },
     {   kSupIFT_Dll,  kSupID_SharedLib,          true, "VBoxVRDP" SUPLIB_DLL_SUFF },
-//#endif
 
 //#ifdef VBOX_WITH_HEADLESS
Index: /trunk/src/VBox/Main/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 33590)
@@ -425,8 +425,6 @@
     AssertComRCReturnRC(rc);
 
-#ifdef VBOX_WITH_VRDP
     rc = mMachine->COMGETTER(VRDEServer)(unconst(mVRDEServer).asOutParam());
     AssertComRCReturnRC(rc);
-#endif
 
     /* Create associated child COM objects */
@@ -597,7 +595,5 @@
     }
 
-#ifdef VBOX_WITH_VRDP
     unconst(mVRDEServer).setNull();
-#endif
 
     unconst(mControl).setNull();
@@ -936,5 +932,4 @@
     AssertComRCReturnVoid(autoCaller.rc());
 
-#ifdef VBOX_WITH_VRDP
     uint32_t u32Clients = ASMAtomicIncU32(&mcVRDPClients);
     VMMDev *pDev;
@@ -952,5 +947,4 @@
     NOREF(u32ClientId);
     mDisplay->VideoAccelVRDP(true);
-#endif /* VBOX_WITH_VRDP */
 
     LogFlowFuncLeave();
@@ -968,5 +962,4 @@
     AssertReturnVoid(mConsoleVRDPServer);
 
-#ifdef VBOX_WITH_VRDP
     uint32_t u32Clients = ASMAtomicDecU32(&mcVRDPClients);
     VMMDev *pDev;
@@ -984,5 +977,4 @@
 
     mDisplay->VideoAccelVRDP(false);
-#endif /* VBOX_WITH_VRDP */
 
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_USB)
@@ -991,5 +983,4 @@
     }
 
-#ifdef VBOX_WITH_VRDP
     if (fu32Intercepted & VRDE_CLIENT_INTERCEPT_CLIPBOARD)
     {
@@ -1013,5 +1004,4 @@
         }
     }
-#endif /* VBOX_WITH_VRDP */
 
     Bstr uuid;
@@ -1030,8 +1020,4 @@
 #endif /* VBOX_WITH_GUEST_PROPS */
 
-#ifdef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
-    MLDMemDump();
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
-
     LogFlowFuncLeave();
     return;
@@ -1049,5 +1035,4 @@
     NOREF(u32ClientId);
 
-#ifdef VBOX_WITH_VRDP
     ++mcAudioRefs;
 
@@ -1063,5 +1048,4 @@
         }
     }
-#endif
 
     LogFlowFuncLeave();
@@ -1093,7 +1077,5 @@
     AssertReturnVoid(mConsoleVRDPServer);
 
-#ifdef VBOX_WITH_VRDP
     mConsoleVRDPServer->ClipboardCreate(u32ClientId);
-#endif /* VBOX_WITH_VRDP */
 
     LogFlowFuncLeave();
@@ -7391,5 +7373,4 @@
         }
 
-#ifdef VBOX_WITH_VRDP
         /* Create the VRDP server. In case of headless operation, this will
          * also create the framebuffer, required at VM creation.
@@ -7442,6 +7423,4 @@
         }
 
-#endif /* VBOX_WITH_VRDP */
-
         ComPtr<IMachine> pMachine = console->machine();
         ULONG cCpus = 1;
@@ -7468,8 +7447,6 @@
         alock.enter();
 
-#ifdef VBOX_WITH_VRDP
         /* Enable client connections to the server. */
         console->consoleVRDPServer()->EnableConnections();
-#endif /* VBOX_WITH_VRDP */
 
         if (RT_SUCCESS(vrc))
Index: /trunk/src/VBox/Main/ConsoleVRDPServer.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleVRDPServer.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/ConsoleVRDPServer.cpp	(revision 33590)
@@ -33,7 +33,5 @@
 
 #include <VBox/err.h>
-#ifdef VBOX_WITH_VRDP
 #include <VBox/RemoteDesktop/VRDEOrders.h>
-#endif /* VBOX_WITH_VRDP */
 
 class VRDPConsoleListener :
@@ -548,5 +546,4 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifdef VBOX_WITH_VRDP
 RTLDRMOD ConsoleVRDPServer::mVRDPLibrary;
 
@@ -1181,5 +1178,4 @@
     server->mConsole->getDisplay()->SetVideoModeHint(cWidth, cHeight, cBitsPerPixel, uScreenId);
 }
-#endif /* VBOX_WITH_VRDP */
 
 ConsoleVRDPServer::ConsoleVRDPServer(Console *console)
@@ -1202,5 +1198,4 @@
 #endif
 
-#ifdef VBOX_WITH_VRDP
     mhServer = 0;
 
@@ -1235,5 +1230,4 @@
 
     mVRDPBindPort = -1;
-#endif /* VBOX_WITH_VRDP */
 
     mAuthLibrary = 0;
@@ -1244,5 +1238,4 @@
     Stop();
 
-#ifdef VBOX_WITH_VRDP
     if (mConsoleListener)
     {
@@ -1263,5 +1256,4 @@
         }
     }
-#endif /* VBOX_WITH_VRDP */
 
     if (RTCritSectIsInitialized(&mCritSect))
@@ -1275,5 +1267,5 @@
 {
     LogFlowThisFunc(("\n"));
-#ifdef VBOX_WITH_VRDP
+
     int rc = VINF_SUCCESS;
 
@@ -1326,8 +1318,5 @@
         }
     }
-#else
-    int rc = VERR_NOT_SUPPORTED;
-    LogRel(("VRDP: this version does not include the VRDP server.\n"));
-#endif /* VBOX_WITH_VRDP */
+
     return rc;
 }
@@ -1335,40 +1324,32 @@
 void ConsoleVRDPServer::EnableConnections(void)
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEEnableConnections(mhServer, true);
     }
-#endif /* VBOX_WITH_VRDP */
 }
 
 void ConsoleVRDPServer::DisconnectClient(uint32_t u32ClientId, bool fReconnect)
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEDisconnect(mhServer, u32ClientId, fReconnect);
     }
-#endif /* VBOX_WITH_VRDP */
 }
 
 void ConsoleVRDPServer::MousePointerUpdate(const VRDECOLORPOINTER *pPointer)
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEColorPointer(mhServer, pPointer);
     }
-#endif /* VBOX_WITH_VRDP */
 }
 
 void ConsoleVRDPServer::MousePointerHide(void)
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEHidePointer(mhServer);
     }
-#endif /* VBOX_WITH_VRDP */
 }
 
@@ -1377,5 +1358,4 @@
     Assert(VALID_PTR(this)); /** @todo r=bird: there are(/was) some odd cases where this buster was invalid on
                               * linux. Just remove this when it's 100% sure that problem has been fixed. */
-#ifdef VBOX_WITH_VRDP
     if (mhServer)
     {
@@ -1390,5 +1370,4 @@
         }
     }
-#endif /* VBOX_WITH_VRDP */
 
 #ifdef VBOX_WITH_USB
@@ -1730,5 +1709,4 @@
     int rc = VINF_SUCCESS;
 
-#ifdef VBOX_WITH_VRDP
     ConsoleVRDPServer *pServer = static_cast <ConsoleVRDPServer *>(pvExtension);
 
@@ -1789,5 +1767,4 @@
             rc = VERR_NOT_SUPPORTED;
     }
-#endif /* VBOX_WITH_VRDP */
 
     return rc;
@@ -2089,25 +2066,20 @@
 void ConsoleVRDPServer::SendUpdate(unsigned uScreenId, void *pvUpdate, uint32_t cbUpdate) const
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEUpdate(mhServer, uScreenId, pvUpdate, cbUpdate);
     }
-#endif
 }
 
 void ConsoleVRDPServer::SendResize(void) const
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEResize(mhServer);
     }
-#endif
 }
 
 void ConsoleVRDPServer::SendUpdateBitmap(unsigned uScreenId, uint32_t x, uint32_t y, uint32_t w, uint32_t h) const
 {
-#ifdef VBOX_WITH_VRDP
     VRDEORDERHDR update;
     update.x = x;
@@ -2119,40 +2091,32 @@
         mpEntryPoints->VRDEUpdate(mhServer, uScreenId, &update, sizeof(update));
     }
-#endif
 }
 
 void ConsoleVRDPServer::SendAudioSamples(void *pvSamples, uint32_t cSamples, VRDEAUDIOFORMAT format) const
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEAudioSamples(mhServer, pvSamples, cSamples, format);
     }
-#endif
 }
 
 void ConsoleVRDPServer::SendAudioVolume(uint16_t left, uint16_t right) const
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEAudioVolume(mhServer, left, right);
     }
-#endif
 }
 
 void ConsoleVRDPServer::SendUSBRequest(uint32_t u32ClientId, void *pvParms, uint32_t cbParms) const
 {
-#ifdef VBOX_WITH_VRDP
     if (mpEntryPoints && mhServer)
     {
         mpEntryPoints->VRDEUSBRequest(mhServer, u32ClientId, pvParms, cbParms);
     }
-#endif
 }
 
 void ConsoleVRDPServer::QueryInfo(uint32_t index, void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut) const
 {
-#ifdef VBOX_WITH_VRDP
     if (index == VRDE_QI_PORT)
     {
@@ -2169,8 +2133,6 @@
         mpEntryPoints->VRDEQueryInfo(mhServer, index, pvBuffer, cbBuffer, pcbOut);
     }
-#endif
-}
-
-#ifdef VBOX_WITH_VRDP
+}
+
 /* static */ int ConsoleVRDPServer::loadVRDPLibrary(const char *pszLibraryName)
 {
@@ -2231,5 +2193,4 @@
     return rc;
 }
-#endif /* VBOX_WITH_VRDP */
 
 /*
Index: /trunk/src/VBox/Main/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/DisplayImpl.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/DisplayImpl.cpp	(revision 33590)
@@ -1391,5 +1391,4 @@
 }
 
-#ifdef VBOX_WITH_VRDP
 /* Called always by one VRDP server thread. Can be thread-unsafe.
  */
@@ -1456,5 +1455,4 @@
 #endif /* VBOX_WITH_OLD_VBVA_LOCK */
 }
-#endif /* VBOX_WITH_VRDP */
 
 static bool vbvaVerifyRingBuffer (VBVAMEMORY *pVbvaMemory)
Index: /trunk/src/VBox/Main/HostImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/HostImpl.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/HostImpl.cpp	(revision 33590)
@@ -128,7 +128,5 @@
 #include <iprt/param.h>
 #include <iprt/env.h>
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 #include <iprt/system.h>
 #ifdef RT_OS_SOLARIS
Index: /trunk/src/VBox/Main/HostPower.cpp
===================================================================
--- /trunk/src/VBox/Main/HostPower.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/HostPower.cpp	(revision 33590)
@@ -28,7 +28,5 @@
 #include "VirtualBoxImpl.h"
 
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 
 HostPowerService::HostPowerService (VirtualBox *aVirtualBox)
Index: /trunk/src/VBox/Main/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/MachineImpl.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/MachineImpl.cpp	(revision 33590)
@@ -2142,5 +2142,4 @@
 STDMETHODIMP Machine::COMGETTER(VRDEServer)(IVRDEServer **vrdeServer)
 {
-#ifdef VBOX_WITH_VRDP
     if (!vrdeServer)
         return E_POINTER;
@@ -2155,8 +2154,4 @@
 
     return S_OK;
-#else
-    NOREF(vrdeServer);
-    ReturnComNotImplemented();
-#endif
 }
 
@@ -5980,7 +5975,5 @@
     if (   strType == "headless"
         || strType == "capture"
-#ifdef VBOX_WITH_VRDP
         || strType == "vrdp" /* Deprecated. Same as headless. */
-#endif
        )
     {
@@ -6532,9 +6525,7 @@
     mBIOSSettings->init(this);
 
-#ifdef VBOX_WITH_VRDP
     /* create an associated VRDE object (default is disabled) */
     unconst(mVRDEServer).createObject();
     mVRDEServer->init(this);
-#endif
 
     /* create associated serial port objects */
@@ -6631,5 +6622,4 @@
     }
 
-#ifdef VBOX_WITH_VRDP
     if (mVRDEServer)
     {
@@ -6637,5 +6627,4 @@
         unconst(mVRDEServer).setNull();
     }
-#endif
 
     if (mBIOSSettings)
@@ -7141,9 +7130,7 @@
         mHWData->mHpetEnabled = data.fHpetEnabled;
 
-#ifdef VBOX_WITH_VRDP
         /* VRDEServer */
         rc = mVRDEServer->loadSettings(data.vrdeSettings);
         if (FAILED(rc)) return rc;
-#endif
 
         /* BIOS */
@@ -8174,9 +8161,7 @@
         data.fAccelerate2DVideo = !!mHWData->mAccelerate2DVideoEnabled;
 
-#ifdef VBOX_WITH_VRDP
         /* VRDEServer settings (optional) */
         rc = mVRDEServer->saveSettings(data.vrdeSettings);
         if (FAILED(rc)) throw rc;
-#endif
 
         /* BIOS (required) */
@@ -9320,8 +9305,6 @@
         mBIOSSettings->rollback();
 
-#ifdef VBOX_WITH_VRDP
     if (mVRDEServer && (mData->flModifications & IsModified_VRDEServer))
         mVRDEServer->rollback();
-#endif
 
     if (mAudioAdapter)
@@ -9422,7 +9405,5 @@
 
     mBIOSSettings->commit();
-#ifdef VBOX_WITH_VRDP
     mVRDEServer->commit();
-#endif
     mAudioAdapter->commit();
     mUSBController->commit();
@@ -9554,7 +9535,5 @@
 
     mBIOSSettings->copyFrom(aThat->mBIOSSettings);
-#ifdef VBOX_WITH_VRDP
     mVRDEServer->copyFrom(aThat->mVRDEServer);
-#endif
     mAudioAdapter->copyFrom(aThat->mAudioAdapter);
     mUSBController->copyFrom(aThat->mUSBController);
@@ -9883,9 +9862,7 @@
     unconst(mBIOSSettings).createObject();
     mBIOSSettings->init(this, aMachine->mBIOSSettings);
-#ifdef VBOX_WITH_VRDP
     /* create another VRDEServer object that will be mutable */
     unconst(mVRDEServer).createObject();
     mVRDEServer->init(this, aMachine->mVRDEServer);
-#endif
     /* create another audio adapter object that will be mutable */
     unconst(mAudioAdapter).createObject();
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 33589)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 33590)
@@ -207,5 +207,4 @@
 	$(VBOX_MAIN_DEFS) \
 	$(if $(VBOX_WITH_VBOXSDL),VBOX_WITH_VBOXSDL,) \
-	$(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
 	$(if $(VBOX_WITH_HEADLESS),VBOX_WITH_HEADLESS,) \
 	$(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
@@ -319,5 +318,5 @@
 	DisplayResampleImage.cpp \
 	$(VBOX_AUTOGEN_EVENT_CPP) \
-	$(if $(VBOX_WITH_VRDP),VRDPServerImpl.cpp,) \
+	VRDPServerImpl.cpp \
 	$(if $(VBOX_WITH_XPCOM),xpcom/server.cpp,) \
 	$(VBOX_XML_SCHEMADEFS_CPP) \
@@ -552,5 +551,4 @@
 	$(VBOX_MAIN_DEFS) \
 	VBOX_COM_INPROC \
-	$(if $(VBOX_WITH_VRDP),VBOX_WITH_VRDP,) \
 	$(if $(VBOX_WITH_VRDP_VIDEO_CHANNEL),VBOX_WITH_VRDP_VIDEO_CHANNEL,) \
 	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
@@ -777,7 +775,4 @@
 	) Sorry_Cannot_Find_The_Midl_Compiler_In_The_PSDK))
 IDL_DEFS = /nologo
-ifdef VBOX_WITH_VRDP
- IDL_DEFS += /D VBOX_WITH_VRDP
-endif
 
 $(VBOX_IDL_FILE.MSCOM): $(VBOX_PATH_MAIN_SRC)/idl/midl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
Index: /trunk/src/VBox/Main/Performance.cpp
===================================================================
--- /trunk/src/VBox/Main/Performance.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/Performance.cpp	(revision 33590)
@@ -35,7 +35,5 @@
 #include <VBox/err.h>
 #include <iprt/string.h>
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 #include <iprt/cpuset.h>
 
Index: /trunk/src/VBox/Main/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/SnapshotImpl.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/SnapshotImpl.cpp	(revision 33590)
@@ -1006,8 +1006,6 @@
     mBIOSSettings->initCopy(this, mPeer->mBIOSSettings);
 
-#ifdef VBOX_WITH_VRDP
     unconst(mVRDEServer).createObject();
     mVRDEServer->initCopy(this, mPeer->mVRDEServer);
-#endif
 
     unconst(mAudioAdapter).createObject();
@@ -1099,8 +1097,6 @@
     mBIOSSettings->init(this);
 
-#ifdef VBOX_WITH_VRDP
     unconst(mVRDEServer).createObject();
     mVRDEServer->init(this);
-#endif
 
     unconst(mAudioAdapter).createObject();
Index: /trunk/src/VBox/Main/USBProxyService.cpp
===================================================================
--- /trunk/src/VBox/Main/USBProxyService.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/USBProxyService.cpp	(revision 33590)
@@ -29,7 +29,5 @@
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 #include <iprt/string.h>
 
Index: /trunk/src/VBox/Main/include/ConsoleVRDPServer.h
===================================================================
--- /trunk/src/VBox/Main/include/ConsoleVRDPServer.h	(revision 33589)
+++ /trunk/src/VBox/Main/include/ConsoleVRDPServer.h	(revision 33590)
@@ -33,5 +33,4 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef VBOX_WITH_VRDP
 typedef struct _VRDPInputSynch
 {
@@ -47,5 +46,4 @@
     bool fClientScrollLock;
 } VRDPInputSynch;
-#endif /* VBOX_WITH_VRDP */
 
 /* Member of Console. Helper class for VRDP server management. Not a COM class. */
@@ -60,14 +58,9 @@
     void NotifyAbsoluteMouse (bool fGuestWantsAbsolute)
     {
-#ifdef VBOX_WITH_VRDP
         m_fGuestWantsAbsolute = fGuestWantsAbsolute;
-#else
-        NOREF(fGuestWantsAbsolute);
-#endif /* VBOX_WITH_VRDP */
     }
 
     void NotifyKeyboardLedsChange (BOOL fNumLock, BOOL fCapsLock, BOOL fScrollLock)
     {
-#ifdef VBOX_WITH_VRDP
         bool fGuestNumLock    = (fNumLock != FALSE);
         bool fGuestCapsLock   = (fCapsLock != FALSE);
@@ -88,9 +81,4 @@
         m_InputSynch.fGuestCapsLock   = fGuestCapsLock;
         m_InputSynch.fGuestScrollLock = fGuestScrollLock;
-#else
-        NOREF(fNumLock);
-        NOREF(fCapsLock);
-        NOREF(fScrollLock);
-#endif /* VBOX_WITH_VRDP */
     }
 
@@ -146,5 +134,4 @@
     Console *mConsole;
 
-#ifdef VBOX_WITH_VRDP
     HVRDESERVER mhServer;
 
@@ -183,5 +170,4 @@
 
     int32_t mVRDPBindPort;
-#endif /* VBOX_WITH_VRDP */
 
     RTCRITSECT mCritSect;
Index: /trunk/src/VBox/Main/include/DHCPServerRunner.h
===================================================================
--- /trunk/src/VBox/Main/include/DHCPServerRunner.h	(revision 33589)
+++ /trunk/src/VBox/Main/include/DHCPServerRunner.h	(revision 33590)
@@ -18,7 +18,5 @@
 #include <iprt/types.h>
 #include <iprt/string.h>
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 #include <VBox/com/string.h>
 
Index: /trunk/src/VBox/Main/include/DisplayImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 33589)
+++ /trunk/src/VBox/Main/include/DisplayImpl.h	(revision 33590)
@@ -148,7 +148,5 @@
     bool VideoAccelAllowed (void);
 
-#ifdef VBOX_WITH_VRDP
     void VideoAccelVRDP (bool fEnable);
-#endif /* VBOX_WITH_VRDP */
 
     // IEventListener methods
Index: /trunk/src/VBox/Main/include/Logging.h
===================================================================
--- /trunk/src/VBox/Main/include/Logging.h	(revision 33589)
+++ /trunk/src/VBox/Main/include/Logging.h	(revision 33590)
@@ -90,43 +90,4 @@
 #define MyLog(a)            MyLogIt(LOG_INSTANCE, RTLOGGRPFLAGS_FLOW, LOG_GROUP, a)
 
-#ifdef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
-#include <iprt/err.h>
-#include <iprt/log.h>
-#include <iprt/critsect.h>
-#include <iprt/mem.h>
-
-void *MLDMemAllocDbg (size_t cb, bool fTmp, bool fZero, const char *pszCaller, int iLine);
-void *MLDMemReallocDbg (void *pv, size_t cb, const char *pszCaller, int iLine);
-void MLDMemFreeDbg (void *pv, bool fTmp);
-
-void MLDMemInit (const char *pszPrefix);
-void MLDMemUninit (void);
-
-void MLDMemDump (void);
-
-#define MLDMemAlloc(__cb)          MLDMemAllocDbg   (__cb, false /* fTmp */, false /* fZero */, __FILE__,  __LINE__)
-#define MLDMemAllocZ(__cb)         MLDMemAllocDbg   (__cb, false /* fTmp */, true /* fZero */,  __FILE__,  __LINE__)
-#define MLDMemTmpAlloc(__cb)       MLDMemAllocDbg   (__cb, true /* fTmp */,  false /* fZero */, __FILE__,  __LINE__)
-#define MLDMemTmpAllocZ(__cb)      MLDMemAllocDbg   (__cb, true /* fTmp */,  true /* fZero */,  __FILE__,  __LINE__)
-#define MLDMemRealloc(__pv, __cb)  MLDMemReallocDbg (__pv, __cb, __FILE__,  __LINE__)
-#define MLDMemFree(__pv)           MLDMemFreeDbg    (__pv, false /* fTmp */)
-#define MLDMemTmpFree(__pv)        MLDMemFreeDbg    (__pv, true /* fTmp */)
-
-#undef RTMemAlloc
-#define RTMemAlloc     MLDMemAlloc
-#undef RTMemAllocZ
-#define RTMemAllocZ    MLDMemAllocZ
-#undef RTMemTmpAlloc
-#define RTMemTmpAlloc  MLDMemTmpAlloc
-#undef RTMemTmpAllocZ
-#define RTMemTmpAllocZ MLDMemTmpAllocZ
-#undef RTMemRealloc
-#define RTMemRealloc   MLDMemRealloc
-#undef RTMemFree
-#define RTMemFree      MLDMemFree
-#undef RTMemTmpFree
-#define RTMemTmpFree   MLDMemTmpFree
-#endif /* VBOX_WITH_MLD_MEMLEAK_DETECTOR */
-
 #endif // ____H_LOGGING
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
Index: /trunk/src/VBox/Main/win/PerformanceWin.cpp
===================================================================
--- /trunk/src/VBox/Main/win/PerformanceWin.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/win/PerformanceWin.cpp	(revision 33590)
@@ -35,7 +35,5 @@
 #include <iprt/err.h>
 #include <iprt/mp.h>
-#ifndef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
 #include <iprt/mem.h>
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
 
 #include <map>
Index: /trunk/src/VBox/Main/win/dllmain.cpp
===================================================================
--- /trunk/src/VBox/Main/win/dllmain.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/win/dllmain.cpp	(revision 33590)
@@ -26,264 +26,4 @@
 #include <iprt/initterm.h>
 
-/* Memory leak detection. */
-#ifdef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
-typedef struct _MLDMemBlock
-{
-    unsigned uSignature;
-    struct _MLDMemBlock *next;
-    struct _MLDMemBlock *prev;
-    const char *pszCaller;
-    int iLine;
-    bool fTmp;
-    size_t size;
-    void *pv;
-} MLDMemBlock;
-
-static MLDMemBlock *gMemBlockListHead;
-static RTCRITSECT g_critsect;
-static const char *gszMDLPrefix = "MLDMEM";
-static int gAllocated = 0;
-static int gFreed = 0;
-static bool gfMLD = false;
-
-
-#define MLD_BLOCK_TO_PTR(__p) ((__p)? (void *) ( (uint8_t *)(__p) + sizeof (MLDMemBlock) ) : NULL)
-#define MLD_PTR_TO_BLOCK(__p) ((__p)? (MLDMemBlock *)((uint8_t *)(__p) - sizeof (MLDMemBlock)): NULL)
-
-#define MLD_BLOCK_SIGNATURE 0xFEDCBA98
-
-static void vrdpMemLock (void)
-{
-    int rc = RTCritSectEnter (&g_critsect);
-    AssertRC(rc);
-}
-
-static void vrdpMemUnlock (void)
-{
-    RTCritSectLeave (&g_critsect);
-}
-
-static void vrdpMemAppendBlock (MLDMemBlock *pBlock)
-{
-    pBlock->next = gMemBlockListHead;
-    pBlock->prev = NULL;
-
-    if (gMemBlockListHead)
-    {
-        gMemBlockListHead->prev = pBlock;
-    }
-    gMemBlockListHead = pBlock;
-}
-
-static void vrdpMemExcludeBlock (MLDMemBlock *pBlock)
-{
-    /* Assert that the block is in the list. */
-    MLDMemBlock *pIter = gMemBlockListHead;
-
-    while (pIter && pIter != pBlock)
-    {
-        pIter = pIter->next;
-    }
-
-    Assert (pIter == pBlock);
-
-    /* Exclude the block from list. */
-    if (pBlock->next)
-    {
-        pBlock->next->prev = pBlock->prev;
-    }
-    else
-    {
-        /* do nothing */
-    }
-
-    if (pBlock->prev)
-    {
-        pBlock->prev->next = pBlock->next;
-    }
-    else
-    {
-        gMemBlockListHead = pBlock->next;
-    }
-
-    pBlock->next = NULL;
-    pBlock->prev = NULL;
-}
-
-void *MLDMemAllocDbg (size_t cb, bool fTmp, bool fZero, const char *pszCaller, int iLine)
-{
-    size_t cbAlloc;
-    MLDMemBlock *pBlock;
-
-    // LogFlowFunc(("cb = %d, fTmp = %d, fZero = %d, pszCaller = %s, iLine = %d\n",
-    //              cb, fTmp, fZero, pszCaller, iLine));
-
-    vrdpMemLock ();
-
-    cbAlloc = cb + sizeof (MLDMemBlock);
-
-    pBlock = (MLDMemBlock *)RTMemAlloc (cbAlloc);
-
-    if (pBlock)
-    {
-        if (fZero)
-        {
-            memset (pBlock, 0, cbAlloc);
-        }
-
-        pBlock->pszCaller  = pszCaller;
-        pBlock->iLine      = iLine;
-        pBlock->size       = cb;
-        pBlock->fTmp       = fTmp;
-        pBlock->uSignature = MLD_BLOCK_SIGNATURE;
-        pBlock->pv         = MLD_BLOCK_TO_PTR(pBlock);
-
-        vrdpMemAppendBlock (pBlock);
-
-        gAllocated++;
-    }
-
-    vrdpMemUnlock ();
-
-    return MLD_BLOCK_TO_PTR(pBlock);
-}
-
-void *MLDMemReallocDbg (void *pv, size_t cb, const char *pszCaller, int iLine)
-{
-    MLDMemBlock *pBlock;
-
-    // LogFlowFunc(("pv = %p, cb = %d, pszCaller = %s, iLine = %d\n",
-    //              pv, cb, pszCaller, iLine));
-
-    vrdpMemLock ();
-
-    pBlock = MLD_PTR_TO_BLOCK(pv);
-
-    if (pBlock)
-    {
-        size_t cbAlloc = cb + sizeof (MLDMemBlock);
-
-        Assert(pBlock->uSignature == MLD_BLOCK_SIGNATURE);
-        Assert(!pBlock->fTmp); /* Tmp blocks are not to be reallocated. */
-        Assert(pBlock->pv == pv);
-
-        vrdpMemExcludeBlock (pBlock);
-
-        pBlock = (MLDMemBlock *)RTMemRealloc (pBlock, cbAlloc);
-
-        pBlock->pszCaller = pszCaller;
-        pBlock->iLine     = iLine;
-        pBlock->size      = cb;
-
-        vrdpMemAppendBlock (pBlock);
-
-        pv = MLD_BLOCK_TO_PTR(pBlock);
-
-        pBlock->pv = pv;
-    }
-    else
-    {
-        pv = MLDMemAllocDbg (cb, false /* fTmp */, false /* fZero */, pszCaller, iLine);
-    }
-
-    vrdpMemUnlock ();
-
-    return pv;
-}
-
-void MLDMemFreeDbg (void *pv, bool fTmp)
-{
-    MLDMemBlock *pBlock;
-
-    // LogFlowFunc(("pv = %d, fTmp = %d\n",
-    //              pv, fTmp));
-
-    vrdpMemLock ();
-
-    pBlock = MLD_PTR_TO_BLOCK(pv);
-
-    if (pBlock)
-    {
-        Assert(pBlock->uSignature == MLD_BLOCK_SIGNATURE);
-        Assert(pBlock->fTmp == fTmp);
-        Assert(pBlock->pv == pv);
-
-        vrdpMemExcludeBlock (pBlock);
-
-        RTMemFree (pBlock);
-        gFreed++;
-    }
-
-    vrdpMemUnlock ();
-}
-
-
-void MLDMemDump (void)
-{
-    MLDMemBlock *pBlock = gMemBlockListHead;
-
-    int c = 0;
-    size_t size = 0;
-    while (pBlock)
-    {
-        LogRel(("%s-MLDMEM: %p 0x%8X bytes %d %s@%d\n", gszMDLPrefix, pBlock, pBlock->size, pBlock->fTmp, pBlock->pszCaller, pBlock->iLine));
-        c++;
-        size += pBlock->size;
-        pBlock = pBlock->next;
-    }
-
-    LogRel(("%s-MLDMEM: %d/%d/%d blocks allocated/freed/left, total %dKb in use.\n", gszMDLPrefix, gAllocated, gFreed, c, size / 1024));
-}
-
-static int gcRefsMem = 0;
-
-void MLDMemInit (const char *pszPrefix)
-{
-    if (++gcRefsMem == 1)
-    {
-        int rc = RTCritSectInit (&g_critsect);
-        AssertRC(rc);
-        gMemBlockListHead = NULL;
-        gszMDLPrefix = pszPrefix;
-        gAllocated = 0;
-        gFreed = 0;
-        gfMLD = true;
-    }
-}
-
-void MLDMemUninit (void)
-{
-    MLDMemDump();
-
-    if (--gcRefsMem == 0)
-    {
-        gfMLD = false;
-        gMemBlockListHead = NULL;
-
-        if (RTCritSectIsInitialized (&g_critsect))
-        {
-            RTCritSectDelete (&g_critsect);
-        }
-    }
-}
-
-void* operator new (std::size_t size) throw (std::bad_alloc)
-{
-    if (gfMLD)
-        return MLDMemAllocDbg (size, false /* bool fTmp */, true /* bool fZero */, __FILE__, __LINE__);
-    else
-        return malloc(size);
-}
-
-void operator delete (void* ptr) throw ()
-{
-    if (gfMLD)
-        MLDMemFreeDbg (ptr, false /* bool fTmp */);
-    else
-        free(ptr);
-}
-
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
-
 CComModule _Module;
 
@@ -305,16 +45,8 @@
         // idempotent, so doesn't harm, and needed for COM embedding scenario
         RTR3Init();
-
-#ifdef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
-        MLDMemInit("VBOXC");
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
     }
     else if (dwReason == DLL_PROCESS_DETACH)
     {
         _Module.Term();
-
-#ifdef VBOX_WITH_VRDP_MEMLEAK_DETECTOR
-        MLDMemUninit();
-#endif /* !VBOX_WITH_VRDP_MEMLEAK_DETECTOR */
     }
     return TRUE;
Index: /trunk/src/VBox/Main/xpcom/server.cpp
===================================================================
--- /trunk/src/VBox/Main/xpcom/server.cpp	(revision 33589)
+++ /trunk/src/VBox/Main/xpcom/server.cpp	(revision 33590)
@@ -143,8 +143,6 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SharedFolder, ISharedFolder)
 
-#ifdef VBOX_WITH_VRDP
 NS_DECL_CLASSINFO(VRDEServer)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDEServer, IVRDEServer)
-#endif
 
 NS_DECL_CLASSINFO(Host)
Index: /trunk/src/libs/Makefile.kmk
===================================================================
--- /trunk/src/libs/Makefile.kmk	(revision 33589)
+++ /trunk/src/libs/Makefile.kmk	(revision 33590)
@@ -49,6 +49,5 @@
 endif
 
-# OpenSSL for VRDP.
-#if defined(VBOX_WITH_VRDP) && !defined(VBOX_ONLY_SDK) - this isn't right, thus:
+# OpenSSL.
 if !defined(VBOX_ONLY_SDK) \
  && "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)"
@@ -56,5 +55,5 @@
 endif
 
-# libjpeg for VRDP video acceleration
+# libjpeg for VRDP video redirection
 if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
  include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
