Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 60692)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 60693)
@@ -1001,7 +1001,9 @@
  VBoxDD2_SOURCES         = \
  	build/VBoxDD2.cpp  \
- 	PC/DevAPIC.cpp \
  	PC/DevIoApic.cpp \
  	PC/DevLPC.cpp
+ ifndef VBOX_WITH_NEW_APIC
+  VBoxDD2_SOURCES += PC/DevAPIC.cpp
+ endif
  VBoxDD2_LIBS            = \
  	$(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -1185,6 +1187,8 @@
   VBoxDD2RC_INCS           = build
   VBoxDD2RC_SOURCES        = \
-  	PC/DevAPIC.cpp \
   	PC/DevIoApic.cpp
+  ifndef VBOX_WITH_NEW_APIC
+   VBoxDD2RC_SOURCES += PC/DevAPIC.cpp
+  endif
   if1of ($(VBOX_LDR_FMT32), pe lx)
    VBoxDD2RC_LIBS          = \
@@ -1204,7 +1208,8 @@
  VBoxDD2R0_SOURCES        = \
  	build/VBoxDD2R0.cpp \
- 	PC/DevAPIC.cpp \
- 	PC/DevIoApic.cpp \
-
+ 	PC/DevIoApic.cpp
+ ifndef VBOX_WITH_NEW_APIC
+  VBoxDD2R0_SOURCES += PC/DevAPIC.cpp
+ endif
  if1of ($(VBOX_LDR_FMT), pe lx)
   VBoxDD2R0_LIBS          = \