Index: /trunk/src/VBox/Devices/Builtins2.cpp
===================================================================
--- /trunk/src/VBox/Devices/Builtins2.cpp	(revision 29331)
+++ /trunk/src/VBox/Devices/Builtins2.cpp	(revision 29332)
@@ -39,7 +39,4 @@
     (void *)&g_abVgaBiosBinary,
     (void *)&g_abNetBiosBinary,
-#ifdef VBOX_WITH_VMI
-    (void *)&g_abVmiBiosBinary,
-#endif
 };
 
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 29331)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 29332)
@@ -254,6 +254,5 @@
 #
 VBoxDD2_TEMPLATE        = VBOXR3
-VBoxDD2_DEFS            = IN_VBOXDD2 \
-			  $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,)
+VBoxDD2_DEFS            = IN_VBOXDD2
 VBoxDD2_INCS           := \
 	$(PATH_SUB_CURRENT)
@@ -265,5 +264,4 @@
 	$(PATH_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
 	$(PATH_LIB)/NetBiosBin$(VBOX_SUFF_LIB) \
-	$(if $(VBOX_WITH_VMI),$(PATH_LIB)/VmiBiosBin$(VBOX_SUFF_LIB)) \
 	$(LIB_VMM) \
 	$(LIB_RUNTIME)
@@ -285,7 +283,6 @@
 DevicesR3_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
 DevicesR3_DEFS         += VBOX_HGCM_HOST_CODE \
-			  $(if $(VBOX_WITH_VMI),VBOX_WITH_VMI,) \
+			  VBOX_WITH_HGCM \
 			  $(if $(VBOX_WITH_PAGE_SHARING),VBOX_WITH_PAGE_SHARING,)
-DevicesR3_DEFS         += VBOX_WITH_HGCM
 DevicesR3_DEFS.linux   += _GNU_SOURCE
 DevicesR3_DEFS.l4      += _GNU_SOURCE
Index: /trunk/src/VBox/Devices/PC/DevPcBios.cpp
===================================================================
--- /trunk/src/VBox/Devices/PC/DevPcBios.cpp	(revision 29331)
+++ /trunk/src/VBox/Devices/PC/DevPcBios.cpp	(revision 29332)
@@ -1233,15 +1233,4 @@
         return rc;
 
-#ifdef VBOX_WITH_VMI
-    /*
-     * Map the VMI BIOS into memory.
-     */
-    AssertReleaseMsg(g_cbVmiBiosBinary == _4K, ("cbVmiBiosBinary=%#x\n", g_cbVmiBiosBinary));
-    rc = PDMDevHlpROMRegister(pDevIns, VBOX_VMI_BIOS_BASE, g_cbVmiBiosBinary, g_abVmiBiosBinary,
-                              PGMPHYS_ROM_FLAGS_PERMANENT_BINARY, "VMI BIOS");
-    if (RT_FAILURE(rc))
-        return rc;
-#endif /* VBOX_WITH_VMI */
-
     /*
      * Call reset to set values and stuff.