Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 42218)
+++ /trunk/Config.kmk	(revision 42219)
@@ -3126,8 +3126,4 @@
  endif
  TEMPLATE_VBOXR0DRV_POST_CMDS          = $(VBOX_SIGN_DRIVER_CMDS)
- ifdef VBOX_USE_VCC100 # HACK ALERT!
-  TEMPLATE_VBOXR0DRV_CINCS             = $(TOOL_$(VBOX_VCC_TOOL)_CINCS)
-  TEMPLATE_VBOXR0DRV_CXXINCS           = $(TOOL_$(VBOX_VCC_TOOL)_CXXINCS)
- endif
 endif
 
@@ -4254,5 +4250,9 @@
    endif
   else if1of ($(KBUILD_TARGET), win)
-   VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
+   ifdef VBOX_USE_VCC100
+    VBOX_PATH_QT4 ?= $(lastword $(filter %-vcc10,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
+   else
+    VBOX_PATH_QT4 ?= $(lastword $(filter-out %-vcc10,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
+   endif
   else if1of ($(KBUILD_TARGET), linux solaris)
    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
@@ -4340,9 +4340,4 @@
   TEMPLATE_VBOXQT4GUIEXE_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.win.x86 += /LARGEADDRESSAWARE
-
- ifdef VBOX_USE_VCC100 # HACK ALERT!
-  TEMPLATE_VBOXQT4GUIEXE_CINCS   = $(TOOL_$(VBOX_VCC_TOOL)_CINCS)
-  TEMPLATE_VBOXQT4GUIEXE_CXXINCS = $(TOOL_$(VBOX_VCC_TOOL)_CXXINCS)
- endif
 
  else # the gcc guys:
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 42218)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 42219)
@@ -28,5 +28,6 @@
 VBoxDisp_SYSSUFF       = .dll
 VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
-VBoxDisp_DEFS          = _WIN32_WINNT=0x0501 VBOX_WITH_DDRAW
+VBoxDisp_DEFS.x86     = _WIN32_WINNT=0x0501
+VBoxDisp_DEFS          = VBOX_WITH_DDRAW
 VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
 ifdef VBOX_WITH_VIDEOHWACCEL
Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/np/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/SharedFolders/np/Makefile.kmk	(revision 42218)
+++ /trunk/src/VBox/Additions/WINNT/SharedFolders/np/Makefile.kmk	(revision 42219)
@@ -21,11 +21,12 @@
 DLLS += VBoxMRXNP
 VBoxMRXNP_TEMPLATE    = VBOXGUESTR3DLL
+ VBoxMRXNP_DEFS       = LOG_TO_BACKDOOR UNICODE WIN32_LEAN_AND_MEAN=1
+#VBoxMRXNP_DEFS       += LOG_ENABLED
 ifeq ($(VBOX_WINDDK_GST),W2K3DDK)
-VBoxMRXNP_SDKS        = ReorderCompilerIncs WINDDK
+ VBoxMRXNP_SDKS       = ReorderCompilerIncs WINDDK
+ VBoxMRXNP_DEFS      += _WIN32_WINNT=0x0500
 else
-VBoxMRXNP_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
+ VBoxMRXNP_SDKS       = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K)
 endif
-VBoxMRXNP_DEFS        = LOG_TO_BACKDOOR _WIN32_WINNT=0x0500 UNICODE WIN32_LEAN_AND_MEAN=1
-#VBoxMRXNP_DEFS       += LOG_ENABLED
 
 VBoxMRXNP_SOURCES     = \
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 42218)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 42219)
@@ -1582,5 +1582,5 @@
 #
 RuntimeR0Drv_TEMPLATE   = VBoxR0DrvLib
-RuntimeR0Drv_SDKS.win   = $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
+RuntimeR0Drv_SDKS.win   = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK)INCS
 RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL
 RuntimeR0Drv_DEFS.win   = IN_SUP_R0