Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 33648)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 33649)
@@ -193,9 +193,9 @@
 
 ifdef VBOX_WITH_NETFLT
- VBoxDD_LIBS.win      += $(PATH_LIB)/WinNetConfig.lib
+ VBoxDD_LIBS.win       += $(PATH_LIB)/WinNetConfig.lib
 endif
 
 ifdef VBOX_WITH_EFI
- VBoxDD_LIBS          += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
+ VBoxDD_LIBS           += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
 endif
 
@@ -328,10 +328,10 @@
 ifdef VBOX_WITH_WDDM
  DevicesR3_DEFS        += VBOX_WITH_WDDM
- DevicesR3_SOURCES      += \
+ DevicesR3_SOURCES     += \
 	Graphics/HGSMI/SHGSMIHost.cpp
 endif
 ifdef VBOX_WITH_VDMA
  DevicesR3_DEFS        += VBOX_WITH_VDMA
- DevicesR3_SOURCES      += \
+ DevicesR3_SOURCES     += \
 	Graphics/DevVGA_VDMA.cpp
 endif
@@ -339,12 +339,10 @@
  DevicesR3_DEFS        += VBOX_WITH_CRHGSMI
 endif
-
 ifdef VBOXWDDM_TEST_UHGSMI
- DevicesR3_DEFS   += VBOXWDDM_TEST_UHGSMI
+ DevicesR3_DEFS        += VBOXWDDM_TEST_UHGSMI
 endif
 ifdef VBOXWDDM_WITH_VBVA
  DevicesR3_DEFS        += VBOXWDDM_WITH_VBVA
 endif
-
 ifdef VBOX_WITH_VIDEOHWACCEL
  DevicesR3_DEFS        += VBOX_WITH_VIDEOHWACCEL
@@ -685,5 +683,4 @@
  VBoxDDR0_DEFS         += VBOX_WITH_CRHGSMI
 endif
-
 ifdef VBOXWDDM_WITH_VBVA
  VBoxDDR0_DEFS         += VBOXWDDM_WITH_VBVA
Index: /trunk/src/VBox/Devices/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 33648)
+++ /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 33649)
@@ -41,4 +41,19 @@
 	$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
 
+tstDeviceStructSize_FEATURES = \
+	$(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE,) \
+	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
+	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
+	$(if $(VBOX_WITH_AHCI),VBOX_WITH_AHCI,) \
+	$(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \
+	$(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO,) \
+	$(if $(VBOX_WITH_SCSI),VBOX_WITH_SCSI,) \
+	$(if $(VBOX_WITH_BUSLOGIC),VBOX_WITH_BUSLOGIC,) \
+	$(if $(VBOX_WITH_LSILOGIC),VBOX_WITH_LSILOGIC,) \
+	$(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
+	$(if $(VBOX_WITH_CRHGSMI),VBOX_WITH_CRHGSMI,) \
+	$(if $(VBOX_WITH_VDMA),VBOX_WITH_VDMA,) \
+	$(if $(VBOX_WITH_WDDM),VBOX_WITH_WDDM,) \
+	$(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,)
 
 ifdef VBOX_WITH_RAW_MODE
@@ -48,44 +63,5 @@
  PROGRAMS += tstDeviceStructSizeRC
  tstDeviceStructSizeRC_TEMPLATE  = VBoxRcExe
- tstDeviceStructSizeRC_DEFS      = VBOX_WITH_RAW_MODE
- ifdef VBOX_WITH_USB
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_USB
- endif
- ifdef VBOX_WITH_EHCI
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_EHCI
- endif
- ifdef VBOX_WITH_AHCI
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_AHCI
- endif
- ifdef VBOX_WITH_E1000
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_E1000
- endif
- ifdef VBOX_WITH_VIRTIO
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_VIRTIO
- endif
- ifdef VBOX_WITH_BUSLOGIC
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_BUSLOGIC
- endif
- ifdef VBOX_WITH_SCSI
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_SCSI
- endif
- ifdef VBOX_WITH_LSILOGIC
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_LSILOGIC
- endif
- ifdef VBOX_WITH_HGSMI
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_HGSMI
- endif
- ifdef VBOX_WITH_CRHGSMI
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_CRHGSMI
- endif
- ifdef VBOX_WITH_VDMA
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_VDMA
- endif
- ifdef VBOX_WITH_WDDM
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_WDDM
- endif
- ifdef VBOX_WITH_VIDEOHWACCEL
-  tstDeviceStructSizeRC_DEFS    += VBOX_WITH_VIDEOHWACCEL
- endif
+ tstDeviceStructSizeRC_DEFS      = $(tstDeviceStructSize_FEATURES)
  tstDeviceStructSizeRC_SOURCES   = tstDeviceStructSizeRC.cpp
  tstDeviceStructSizeRC_INCS      = \
@@ -100,44 +76,5 @@
 PROGRAMS += tstDeviceStructSize
 tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
-tstDeviceStructSize_DEFS     =
-ifdef VBOX_WITH_USB
- tstDeviceStructSize_DEFS   += VBOX_WITH_USB
-endif
-ifdef VBOX_WITH_EHCI
- tstDeviceStructSize_DEFS   += VBOX_WITH_EHCI
-endif
-ifdef VBOX_WITH_AHCI
- tstDeviceStructSize_DEFS   += VBOX_WITH_AHCI
-endif
-ifdef VBOX_WITH_E1000
- tstDeviceStructSize_DEFS   += VBOX_WITH_E1000
-endif
-ifdef VBOX_WITH_VIRTIO
- tstDeviceStructSize_DEFS   += VBOX_WITH_VIRTIO
-endif
-ifdef VBOX_WITH_BUSLOGIC
- tstDeviceStructSize_DEFS   += VBOX_WITH_BUSLOGIC
-endif
-ifdef VBOX_WITH_LSILOGIC
- tstDeviceStructSize_DEFS   += VBOX_WITH_LSILOGIC
-endif
-ifdef VBOX_WITH_HGSMI
- tstDeviceStructSize_DEFS   += VBOX_WITH_HGSMI
-endif
-ifdef VBOX_WITH_CRHGSMI
- tstDeviceStructSize_DEFS    += VBOX_WITH_CRHGSMI
-endif
-ifdef VBOX_WITH_VDMA
- tstDeviceStructSize_DEFS    += VBOX_WITH_VDMA
-endif
-ifdef VBOX_WITH_WDDM
- tstDeviceStructSize_DEFS    += VBOX_WITH_WDDM
-endif
-ifdef VBOX_WITH_VIDEOHWACCEL
- tstDeviceStructSize_DEFS   += VBOX_WITH_VIDEOHWACCEL
-endif
-ifdef VBOX_WITH_RAW_MODE
- tstDeviceStructSize_DEFS   += VBOX_WITH_RAW_MODE
-endif
+tstDeviceStructSize_DEFS     = $(tstDeviceStructSize_FEATURES)
 tstDeviceStructSize_INCS     = \
 	$(VBOX_PATH_DEVICES_SRC) \