Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 42174)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 42175)
@@ -33,7 +33,4 @@
 # Can be prepended to by setting it in LocalConfig.kmk
 VMM_COMMON_DEFS ?= VBOX_IN_VMM
-ifdef VBOX_WITH_RAW_MODE
- VMM_COMMON_DEFS += VBOX_WITH_RAW_MODE
-endif
 ifdef VBOX_WITH_IEM
  VMM_COMMON_DEFS += VBOX_WITH_IEM
@@ -87,4 +84,7 @@
 ifdef VBOX_WITH_NETSHAPER
  VBoxVMM_DEFS   += VBOX_WITH_NETSHAPER
+endif
+ifdef VBOX_WITH_RAW_MODE
+ VBoxVMM_DEFS   += VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0
 endif
 VBoxVMM_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -351,5 +351,5 @@
  VMMRC_SYSSUFF   = .gc
 
- VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE $(VMM_COMMON_DEFS)
+ VMMRC_DEFS      = IN_VMM_RC IN_RT_RC IN_DIS DIS_CORE_ONLY VBOX_WITH_RAW_MODE VBOX_WITH_RAW_MODE_NOT_R0 $(VMM_COMMON_DEFS)
  ifeq ($(KBUILD_TARGET_ARCH),x86)
   VMMRC_DEFS.darwin = VMM_R0_SWITCH_STACK
@@ -466,4 +466,7 @@
   VMMR0_DEFS    += VBOX_WITH_TRIPLE_FAULT_HACK
  endif
+ ifdef VBOX_WITH_RAW_MODE
+  VMMR0_DEFS    += VBOX_WITH_RAW_MODE
+ endif
  VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
  VMMR0_DEFS.darwin.x86 = \