Index: /trunk/src/VBox/VMM/Config.kmk
===================================================================
--- /trunk/src/VBox/VMM/Config.kmk	(revision 86652)
+++ /trunk/src/VBox/VMM/Config.kmk	(revision 86653)
@@ -39,7 +39,4 @@
  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
 endif
-#ifdef VBOX_WITH_IEM
-# VMM_COMMON_DEFS += VBOX_WITH_IEM
-#endif
 # part of global DEFS
 ifdef VBOX_WITH_MULTI_CORE
@@ -61,7 +58,4 @@
  VMM_COMMON_DEFS += VBOX_WITH_SAFE_STR
 endif
-ifdef VBOX_WITH_64ON32_IDT
- VMM_COMMON_DEFS += VBOX_WITH_64ON32_IDT
-endif
 ifdef VBOX_WITH_64ON32_CMOS_DEBUG
  VMM_COMMON_DEFS += VBOX_WITH_64ON32_CMOS_DEBUG
@@ -69,7 +63,4 @@
 ifdef VBOXSTRICTRC_STRICT_ENABLED
  VMM_COMMON_DEFS += VBOXSTRICTRC_STRICT_ENABLED
-endif
-ifeq ($(KBUILD_TARGET),amd64)
- VMM_COMMON_DEFS += VBOX_WITH_MORE_RING0_MEM_MAPPINGS
 endif
 ifdef VBOX_WITH_NATIVE_NEM