Index: /trunk/src/VBox/HostDrivers/Support/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 40369)
+++ /trunk/src/VBox/HostDrivers/Support/Makefile.kmk	(revision 40370)
@@ -82,6 +82,7 @@
 SUPR3_DEFS          = \
 	IN_SUP_R3 IN_RT_R3 \
-        $(if $(VBOX_WITH_SUPSVC),VBOX_WITH_SUPSVC) \
-        $(if $(VBOX_WITH_MAIN),VBOX_WITH_MAIN,)
+	$(if $(VBOX_WITH_SUPSVC),VBOX_WITH_SUPSVC) \
+	$(if $(VBOX_WITH_MAIN),VBOX_WITH_MAIN,) \
+	$(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
 SUPR3_INCS         := $(PATH_SUB_CURRENT)
 SUPR3_INCS.l4       = $(L4_INCDIR)
@@ -106,5 +107,6 @@
 SUPR3HardenedStatic_DEFS    += \
 	$(if $(VBOX_WITH_SUPSVC),VBOX_WITH_SUPSVC,) \
-	$(if $(VBOX_WITH_MAIN),VBOX_WITH_MAIN,)
+	$(if $(VBOX_WITH_MAIN),VBOX_WITH_MAIN,) \
+	$(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,)
 SUPR3HardenedStatic_INCS     = .
 SUPR3HardenedStatic_SOURCES  = \
Index: /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp
===================================================================
--- /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp	(revision 40369)
+++ /trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp	(revision 40370)
@@ -105,7 +105,9 @@
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VBoxDD2R0.r0" },
 
+#ifdef VBOX_WITH_RAW_MODE
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VMMGC.gc" },
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VBoxDDGC.gc" },
     {   kSupIFT_Dll,  kSupID_AppPrivArch,       false, "VBoxDD2GC.gc" },
+#endif
 
     {   kSupIFT_Dll,  kSupID_SharedLib,         false, "VBoxRT" SUPLIB_DLL_SUFF },
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 40369)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 40370)
@@ -148,10 +148,14 @@
 # Do not remove relocation information of these binaries
 VBOX_LNX_STRIP_OBJ = \
+	VBoxDD2R0.r0 \
+	VBoxDDR0.r0 \
+	VMMR0.r0
+
+ifdef VBOX_WITH_RAW_MODE
+ VBOX_LNX_STRIP_OBJ += \
 	VBoxDD2GC.gc \
-	VBoxDD2R0.r0 \
 	VBoxDDGC.gc \
-	VBoxDDR0.r0 \
-	VMMGC.gc \
-	VMMR0.r0
+	VMMGC.gc
+endif
 
 # Do not strip anything of these files