Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 61660)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 61661)
@@ -1216,8 +1216,6 @@
   VBoxDD2RC_INCS           = build
   VBoxDD2RC_SOURCES        = \
-  	PC/DevIoApic.cpp
-  ifndef VBOX_WITH_NEW_APIC
-   VBoxDD2RC_SOURCES += PC/DevAPIC.cpp
-  endif
+   	$(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp) \
+   	$(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp)
   if1of ($(VBOX_LDR_FMT32), pe lx)
    VBoxDD2RC_LIBS          = \
@@ -1237,8 +1235,6 @@
  VBoxDD2R0_SOURCES        = \
  	build/VBoxDD2R0.cpp \
- 	PC/DevIoApic.cpp
- ifndef VBOX_WITH_NEW_APIC
-  VBoxDD2R0_SOURCES += PC/DevAPIC.cpp
- endif
+ 	$(if $(VBOX_WITH_NEW_IOAPIC),,PC/DevIoApic.cpp)
+ 	$(if $(VBOX_WITH_NEW_APIC),,PC/DevAPIC.cpp)
  if1of ($(VBOX_LDR_FMT), pe lx)
   VBoxDD2R0_LIBS          = \