Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 50673)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 50674)
@@ -119,5 +119,5 @@
  	VBOX_ACPI \
  	VBOX_HGCM_HOST_CODE \
- 	VBOX_WITH_HGCM \
+ 	$(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
  	$(if $(VBOX_BIOS_DMI_FALLBACK),VBOX_BIOS_DMI_FALLBACK,) \
  	VBOX_WITH_DMI_CHASSIS \
@@ -152,5 +152,5 @@
  	PC/DevPcArch.cpp \
  	VMMDev/VMMDev.cpp \
- 	VMMDev/VMMDevHGCM.cpp \
+ 	$(if $(VBOX_WITH_HGCM),VMMDev/VMMDevHGCM.cpp,) \
  	VMMDev/VMMDevTesting.cpp \
  	Network/DevPCNet.cpp \
@@ -793,5 +793,5 @@
    VBoxDDGC_DEFS.darwin   = VBOX_WITH_2X_4GB_ADDR_SPACE
   endif
-  VBoxDDGC_DEFS           = VBOX_WITH_HGCM
+  VBoxDDGC_DEFS           = $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,)
   VBoxDDGC_INCS           = build
   VBoxDDGC_SOURCES        = \
@@ -944,5 +944,5 @@
  VBoxDDR0_TEMPLATE       = VBoxR0
  VBoxDDR0_DEFS.darwin.x86= VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 VBOX_WITH_2X_4GB_ADDR_SPACE
- VBoxDDR0_DEFS           = IN_RT_R0 VBOX_WITH_HGCM # - WTF is IN_RT_R0 doing here?
+ VBoxDDR0_DEFS           = IN_RT_R0 $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) # - WTF is IN_RT_R0 doing here?
  VBoxDDR0_DEFS.win    += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDDR0_INCS           = build
@@ -1121,5 +1121,6 @@
  #
  ServicesR0_TEMPLATE  = VBoxR0
- ServicesR0_DEFS      = IN_INTNET_R0 IN_RT_R0 $(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
+ ServicesR0_DEFS      = IN_INTNET_R0 IN_RT_R0 \
+	$(if $(VBOX_WITH_PCI_PASSTHROUGH),IN_PCIRAW_R0,) \
 	$(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,)
  ServicesR0_SOURCES   = \
Index: /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
===================================================================
--- /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 50673)
+++ /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 50674)
@@ -1514,6 +1514,4 @@
 }
 
-#endif /* VBOX_WITH_HGCM */
-
 /**
  * Handles VMMDevReq_HGCMCancel.
@@ -1561,4 +1559,6 @@
     return vmmdevHGCMCancel2(pThis, pReq->physReqToCancel);
 }
+
+#endif /* VBOX_WITH_HGCM */
 
 
@@ -2405,5 +2405,4 @@
             *pfDelayedUnlock = true;
             break;
-#endif /* VBOX_WITH_HGCM */
 
         case VMMDevReq_HGCMCancel:
@@ -2415,4 +2414,5 @@
             pReqHdr->rc = vmmdevReqHandler_HGCMCancel2(pThis, pReqHdr);
             break;
+#endif /* VBOX_WITH_HGCM */
 
         case VMMDevReq_VideoAccelEnable:
@@ -3596,6 +3596,8 @@
     pThis->u32LastStatIntervalSize = 0;
 
+#ifdef VBOX_WITH_HGCM
     /* Clear the "HGCM event enabled" flag so the event can be automatically reenabled.  */
     pThis->u32HGCMEnabled = 0;
+#endif
 
     /*