Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 42287)
+++ /trunk/Config.kmk	(revision 42288)
@@ -21,9 +21,4 @@
 # Marker.
 VBOX_ROOT_CONFIG_KMK_INCLUDED = 1
-
-## TEMPORARY
-# Enable Visual C++ 2010 for everyone. Support for older compiler version will be removed shortly.
-VBOX_USE_VCC100 = 1
-## TEMPORARY
 
 #
@@ -411,7 +406,5 @@
 VBOX_WITH_WDDM = 1
 # Enable Wddm Video driver for Windows 8 guests.
-ifdef VBOX_USE_VCC100
- VBOX_WITH_WDDM_W8 = 1
-endif
+VBOX_WITH_WDDM_W8 = 1
 # Lazy developer!!
 VBOXWDDM_WITH_VBVA = 1
@@ -1322,29 +1315,11 @@
 # Decide which Visual C++ compiler version we're using by default.
 #
+ifndef VBOX_VCC_TOOL_STEM
+ VBOX_VCC_TOOL_STEM := VCC100
+else ifn1of ($(VBOX_VCC_TOOL_STEM), VCC100 VCC110)
+ $(error VBox: VBOX_VCC_TOOL_STEM='$(VBOX_VCC_TOOL_STEM)' is not supported, only VCC100 and VCC110 is)
+endif
 ifndef VBOX_VCC_TOOL
- ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.amd64)
-  if !defined(VBOX_USE_VCC100) && !defined(VBOx_USE_VCC110)
-   VBOX_USE_VCC80 ?= 1 # the default for win.amd64
-  endif
- endif
- ifdef VBOX_USE_VCC110
-  VBOX_VCC_TOOL_STEM = VCC110
- else ifdef VBOX_USE_VCC100
-  VBOX_VCC_TOOL_STEM = VCC100
- else ifdef VBOX_USE_VCC80
-  VBOX_VCC_TOOL_STEM = VCC80
- else
-  VBOX_VCC_TOOL := VCC70
-  VBOX_VCC_TOOL_STEM := VCC70
- endif
- ifndef VBOX_VCC_TOOL
-  VBOX_VCC_TOOL := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_TARGET_ARCH))
- endif
-else ifndef VBOX_VCC_TOOL_STEM
-$(error VBOX_VCC_TOOL_STEM is not defined)
-endif
-# VCC70 is hopefully the most special case here...
-if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC90) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC70)
- VBOX_USE_VCC70 := 1
+ VBOX_VCC_TOOL := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_TARGET_ARCH))
 endif
 
@@ -1360,10 +1335,6 @@
 ## @todo Remove the default tool crap here!
 TOOL = $(VBOX_GCC_TOOL)
-ifdef VBOX_USE_VCC70
- TOOL.win = VCC70
-else
- TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86
- TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64
-endif
+TOOL.win.x86 = $(VBOX_VCC_TOOL_STEM)X86
+TOOL.win.amd64 = $(VBOX_VCC_TOOL_STEM)AMD64
 ASTOOL = $(VBOX_ASTOOL)
 
@@ -1386,5 +1357,5 @@
    CXXFLAGS.l4 = -mno-red-zone
   else
-   $(error L4_ARCH=$(L4_ARCH))
+   $(error VBox: L4_ARCH=$(L4_ARCH))
   endif
   L4_OBJ := $(L4_DIR)/build-$(L4_ARCH)-$(L4_CPU)-$(L4_API)
@@ -1525,25 +1496,13 @@
  VBOX_GCC_OPT    ?= -O2 $(VBOX_GCC_mtune-generic)
  VBOX_VCC_FP     ?= -Oy-
- ifndef VBOX_USE_VCC70
  VBOX_VCC_OPT    ?= -O2 -GS-
- else
- VBOX_VCC_OPT    ?= -Ogitb2
- endif
  VBOX_GCC_R0_FP  ?= -fno-omit-frame-pointer
  VBOX_GCC_R0_OPT ?= -O2 $(VBOX_GCC_mtune-generic)
  VBOX_VCC_R0_FP  ?= -Oy-
- ifndef VBOX_USE_VCC70
  VBOX_VCC_R0_OPT ?= -O2 -GS-
- else
- VBOX_VCC_R0_OPT ?= -Ogitb2
- endif
  VBOX_GCC_GC_FP  ?= -fno-omit-frame-pointer
  VBOX_GCC_GC_OPT ?= -O2 $(VBOX_GCC_mtune-generic)
  VBOX_VCC_GC_FP  ?= -Oy-
- ifndef VBOX_USE_VCC70
  VBOX_VCC_GC_OPT ?= -O2
- else
- VBOX_VCC_GC_OPT ?= -Ogitb2
- endif
 endif
 ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -1569,42 +1528,24 @@
 # Decide which Windows DDK to use by default.
 #
-ifdef VBOX_USE_VCC110
- VBOX_WINDDK          ?= WINDDK80
- VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
- VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
- VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK)W7
-else ifdef VBOX_USE_VCC100
- VBOX_WINDDK          ?= WINDDK71
- VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
- VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
- VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK)W7
-else ifdef VBOX_USE_WINDDK
- VBOX_WINDDK          ?= WINDDK
- VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
- VBOX_WINDDK_GST_W2K3 ?= $(VBOX_WINDDK)WNET
- VBOX_WINDDK_GST_W7   ?= WINDDK71W7
-else
- VBOX_WINDDK          ?= W2K3DDK
- VBOX_WINDDK_WLH      ?= WINDDKWLH
- VBOX_WINDDK_GST_W2K3 ?= W2K3DDK
- VBOX_WINDDK_GST_W7   ?= WINDDK71W7
-endif
-VBOX_WINDDK_GST       ?= $(VBOX_WINDDK)
-VBOX_WINDDK_GST_WLH   ?= $(VBOX_WINDDK_WLH)
-VBOX_WINDDK_GST_W8    ?= WINDDK80W8
+ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
+ VBOX_WINDDK         ?= WINDDK80
+else
+ VBOX_WINDDK         ?= WINDDK71
+endif
+VBOX_WINDDK_WLH      ?= $(VBOX_WINDDK)WLH
+
+VBOX_WINDDK_GST      ?= $(VBOX_WINDDK)
+VBOX_WINDDK_GST_W8   ?= WINDDK80W8
+VBOX_WINDDK_GST_W7   ?= $(VBOX_WINDDK_GST)W7
+VBOX_WINDDK_GST_WLH  ?= $(VBOX_WINDDK_GST)WLH
+VBOX_WINDDK_GST_W2K3 ?= WINDDK71WNET
 ifeq ($(KBUILD_TARGET_ARCH),x86)
- ifneq ($(VBOX_WINDDK_GST),W2K3DDK)
-  VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST)WXP
-  VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_WXP)
-  VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_WXP)
- else
-  VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST)
-  VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST)
-  VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST)
- endif
-else
- VBOX_WINDDK_GST_WXP   = $(VBOX_WINDDK_GST_W2K3)
- VBOX_WINDDK_GST_W2K   = $(VBOX_WINDDK_GST_W2K3)
- VBOX_WINDDK_GST_NT4   = $(VBOX_WINDDK_GST_W2K3)
+ VBOX_WINDDK_GST_WXP ?= WINDDK71WXP
+ VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_WXP)
+ VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_WXP)
+else
+ VBOX_WINDDK_GST_WXP ?= $(VBOX_WINDDK_GST_W2K3)
+ VBOX_WINDDK_GST_W2K ?= $(VBOX_WINDDK_GST_W2K3)
+ VBOX_WINDDK_GST_NT4 ?= $(VBOX_WINDDK_GST_W2K3)
 endif
 
@@ -1613,22 +1554,20 @@
 # Decide which Windows SDK to use by default.
 #
-ifdef VBOX_USE_VCC110
+ifeq ($(VBOX_VCC_TOOL_STEM),VCC110)
  VBOX_WINPSDK ?= WINPSDK80
-else ifdef VBOX_USE_VCC100
+else
  VBOX_WINPSDK ?= WINPSDK71
-else
- VBOX_WINPSDK ?= WINPSDK
-endif
-VBOX_WINPSDK_GST     ?= $(VBOX_WINPSDK)
-VBOX_WINPSDK_GST_W8  ?= $(VBOX_WINPSDK_GST)
-VBOX_WINPSDK_GST_W7  ?= $(VBOX_WINPSDK_GST)
-VBOX_WINPSDK_GST_WLH ?= $(VBOX_WINPSDK_GST)
-VBOX_WINPSDK_GST_WXP ?= $(VBOX_WINPSDK_GST)
+endif
+VBOX_WINPSDK_GST      ?= $(VBOX_WINPSDK)
+VBOX_WINPSDK_GST_W8   ?= WINPSDK80
+VBOX_WINPSDK_GST_W7   ?= $(VBOX_WINPSDK_GST)
+VBOX_WINPSDK_GST_WLH  ?= $(VBOX_WINPSDK_GST)
+VBOX_WINPSDK_GST_WXP  ?= $(VBOX_WINPSDK_GST)
 ifeq ($(KBUILD_TARGET_ARCH),x86)
  VBOX_WINPSDK_GST_W2K ?= $(VBOX_WINPSDK_GST)
  VBOX_WINPSDK_GST_NT4 ?= $(VBOX_WINPSDK_GST)
 else
- VBOX_WINPSDK_GST_W2K = $(VBOX_WINPSDK_GST_WXP)
- VBOX_WINPSDK_GST_NT4 = $(VBOX_WINPSDK_GST_WXP)
+ VBOX_WINPSDK_GST_W2K ?= $(VBOX_WINPSDK_GST_WXP)
+ VBOX_WINPSDK_GST_NT4 ?= $(VBOX_WINPSDK_GST_WXP)
 endif
 
@@ -1644,5 +1583,5 @@
  ARCH_BITS_DEFS    := HC_ARCH_BITS=32
 else
- error KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)
+ $(error VBox: KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH))
 endif
 
@@ -1860,15 +1799,8 @@
 # Note! The scripts has been moved to Bin in v8.0.
 VBOX_PATH_WIX       ?= $(PATH_DEVTOOLS)/win.x86/wix/v3.5.2519.0
-ifdef VBOX_USE_VCC100
 VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiTran.Exe
 VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Bin/MsiDb.Exe
 VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSubStg.vbs
 VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/v7.1/Samples/sysmgmt/msi/scripts/WiSumInf.vbs
-else
-VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiTran.Exe
-VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiDb.Exe
-VBOX_PATH_WISUBSTG  ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSubStg.vbs
-VBOX_PATH_WISUMINFO ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Samples/SysMgmt/Msi/Scripts/WiSumInf.vbs
-endif
 VBOX_PATH_DIFX      ?= $(PATH_DEVTOOLS)/win.$(KBUILD_TARGET_ARCH)/DIFx/v2.1-r3
 VBOX_PATH_CABSDK    ?= $(PATH_DEVTOOLS)/win.x86/cabsdk/r1
@@ -1954,5 +1886,5 @@
   else
    if $(VBOX_XCODE_VERSION_MAJOR) >= 4
-    $(error Too new Xcode version ($(VBOX_XCODE_VERSION)) for non-Cocoa builds.)
+    $(error VBox: Too new Xcode version ($(VBOX_XCODE_VERSION)) for non-Cocoa builds.)
    endif
    VBOX_DEF_MACOSX_VERSION_MIN ?= 10.4
@@ -1962,5 +1894,5 @@
  else
   if $(VBOX_XCODE_VERSION_MAJOR) < 4 && "$(VBOX_XCODE_VERSION)" != "3.2"
-   $(error 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
+   $(error VBox: 64-bit darwin builds require Xcode 3.2 or later, you have $(VBOX_XCODE_VERSION))
   endif
   VBOX_DEF_MACOSX_VERSION_MIN ?= 10.6
@@ -2011,6 +1943,6 @@
 	-Wl,-headerpad_max_install_names $(VBOX_DARWIN_CLASSIC_LINKER)
  else
-  VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.4 SDK)
-  VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.4 SDK)
+  VBOX_DARWIN_DEF_SDK_10_4_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
+  VBOX_DARWIN_DEF_SDK_10_4_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.4 SDK)
  endif
 
@@ -2025,6 +1957,6 @@
 	-Wl,-headerpad_max_install_names $(VBOX_DARWIN_NO_COMPACT_LINKEDIT)
  else
-  VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.5 SDK)
-  VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.5 SDK)
+  VBOX_DARWIN_DEF_SDK_10_5_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
+  VBOX_DARWIN_DEF_SDK_10_5_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.5 SDK)
  endif
 
@@ -2039,6 +1971,6 @@
          -Wl,-headerpad_max_install_names
  else
-  VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.6 SDK)
-  VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.6 SDK)
+  VBOX_DARWIN_DEF_SDK_10_6_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
+  VBOX_DARWIN_DEF_SDK_10_6_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.6 SDK)
  endif
 
@@ -2059,6 +1991,6 @@
          -Wl,-headerpad_max_install_names
  else
-  VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS  = $(error $(if $(target),$(target): ,)Using 10.7 SDK)
-  VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS   = $(error $(if $(target),$(target): ,)Using 10.7 SDK)
+  VBOX_DARWIN_DEF_SDK_10_7_CXXFLAGS  = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
+  VBOX_DARWIN_DEF_SDK_10_7_LDFLAGS   = $(error VBox: $(if $(target),$(target): ,)Using 10.7 SDK)
  endif
 
@@ -2087,14 +2019,14 @@
 #
 if defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_ORIGIN)
- $(error VBOX_WITH_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
+ $(error VBox: VBOX_WITH_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
 endif
 if defined(VBOX_WITH_RELATIVE_RUNPATH) && defined(VBOX_WITH_ORIGIN)
- $(error VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
+ $(error VBox: VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_ORIGIN are mutually exclusive)
 endif
 if defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
- $(error VBOX_WITH_RUNPATH and VBOX_WITH_RELATIVE_RUNPATH are mutually exclusive)
+ $(error VBox: VBOX_WITH_RUNPATH and VBOX_WITH_RELATIVE_RUNPATH are mutually exclusive)
 endif
 if defined(VBOX_WITH_RELATIVE_RUNPATH) && defined(VBOX_WITH_HARDENING)
- $(error VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_HARDENING are mutually exclusive)
+ $(error VBox: VBOX_WITH_RELATIVE_RUNPATH and VBOX_WITH_HARDENING are mutually exclusive)
 endif
 
@@ -2505,5 +2437,5 @@
    VBOX_TSA_URL_ARGS ?= /t "$(VBOX_TSA_URL)"
   else
-   $(error Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
+   $(error VBox: Unknown VBOX_SIGNING_MODE: $(VBOX_SIGNING_MODE))
   endif
   VBOX_CERTIFICATE_STORE ?= my
@@ -2876,31 +2808,14 @@
 
  ifeq ($(VBOX_LDR_FMT32),pe)
-  ifndef VBOX_USE_VCC70
-   TEMPLATE_VBoxRc_TOOL              = $(VBOX_VCC_TOOL_STEM)X86
-   ifdef TODO_MORE_WARNINGS
-    TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
-   else
-    TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
-   endif
+  TEMPLATE_VBoxRc_TOOL               = $(VBOX_VCC_TOOL_STEM)X86
+  ifdef TODO_MORE_WARNINGS
+   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W4 -wd4244 -wd4996 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_WERR)
   else
-   TEMPLATE_VBoxRc_TOOL              = VCC70
-   ifdef TODO_MORE_WARNINGS
-    TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
-   else
-    TEMPLATE_VBoxRc_CXXFLAGS         = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
-   endif
+   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) -W3 -wd4244 -wd4996 $(VBOX_VCC_WERR)
   endif
   TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
   TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Debug
-  ifdef VBOX_USE_VCC100
-   TEMPLATE_VBoxRc_LIBS               = \
-   	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
-  else
-   if !defined(VBOX_NOINC_MISC) && !defined(VBOX_USE_VCC100)
-    include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
-   endif
   TEMPLATE_VBoxRc_LIBS               = \
-	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
-  endif
+  	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
   TEMPLATE_VBoxRc_LIBS              += \
   	$(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
@@ -2958,18 +2873,8 @@
  ifeq ($(VBOX_LDR_FMT32),pe)
   TEMPLATE_VBoxRcExe_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
-  ifdef VBOX_USE_VCC100
-   TEMPLATE_VBoxRcExe_SDKS   = ReorderCompilerIncs $(VBOX_WINPSDK)
-  else
-   TEMPLATE_VBoxRcExe_SDKS   = WIN32SDK
-  endif
-  ifndef VBOX_USE_VCC70
-   TEMPLATE_VBoxRcExe_LIBS   = \
-   	$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcmt.lib \
-   	$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/oldnames.lib
-  else
-   TEMPLATE_VBoxRcExe_LIBS   = \
-   	$(PATH_TOOL_VCC70_LIB)/libcmt.lib \
-   	$(PATH_TOOL_VCC70_LIB)/oldnames.lib
-  endif
+  TEMPLATE_VBoxRcExe_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK)
+  TEMPLATE_VBoxRcExe_LIBS    = \
+  	$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcmt.lib \
+  	$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/oldnames.lib
  endif
 
@@ -3026,16 +2931,8 @@
 ifeq ($(VBOX_LDR_FMT),pe)
 TEMPLATE_VBoxR0_TOOL                = $(VBOX_VCC_TOOL)
- ifndef VBOX_USE_VCC70
-  ifdef TODO_MORE_WARNINGS
-TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
-  else
-TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_WERR)
-  endif
+ ifdef TODO_MORE_WARNINGS
+TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 -wd4996 $(VBOX_VCC_WERR)
  else
-  ifdef TODO_MORE_WARNINGS
-TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W4 -wd4244 -wd4127 -wd4100 -wd4214 -wd4706 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)	$(VBOX_VCC_WERR)
-  else
-TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)	$(VBOX_VCC_WERR)
-  endif
+TEMPLATE_VBoxR0_CXXFLAGS            = -Zi -Zl -GR- -EHs- -GF -GS- -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) -W3 -wd4244 -wd4996 $(VBOX_VCC_WERR)
  endif
 TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
@@ -3046,12 +2943,7 @@
 TEMPLATE_VBoxR0_LIBS                = \
 	$(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
- ifdef VBOX_USE_VCC100
-  include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
+ include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk ## TODO: Add a kBuild feature for loading SDKs.
 TEMPLATE_VBoxR0_LIBS.x86            = \
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/int64.lib
- else
-TEMPLATE_VBoxR0_LIBS.x86            = \
-	$(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
- endif
 TEMPLATE_VBoxR0_POST_CMDS           = $(VBOX_SIGN_DRIVER_CMDS)
 endif # pe
@@ -3148,9 +3040,5 @@
  TEMPLATE_VBOXR0DRV_DEFS.x86          += WIN9X_COMPAT_SPINLOCK     # Avoid multiply defined _KeInitializeSpinLock@4
  TEMPLATE_VBOXR0DRV_DEFS.amd64         = _AMD64_
- ifndef VBOX_USE_VCC70
-  TEMPLATE_VBOXR0DRV_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -Gz -W3 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
- else
-  TEMPLATE_VBOXR0DRV_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -Gz -W3 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
- endif
+ TEMPLATE_VBOXR0DRV_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -Gz -W3 -GS- -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
  TEMPLATE_VBOXR0DRV_CFLAGS             = $(TEMPLATE_VBOXR0DRV_CXXFLAGS)
  TEMPLATE_VBOXR0DRV_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Debug
@@ -3401,11 +3289,6 @@
 ifeq ($(KBUILD_TARGET),win)
 # TEMPLATE_VBOXR3EXE_TOOL               = $(VBOX_VCC_TOOL)
-ifdef VBOX_USE_VCC70
- TEMPLATE_VBOXR3EXE_TOOL.win.x86       = $(VBOX_VCC_TOOL)
- TEMPLATE_VBOXR3EXE_TOOL.win.amd64     = VCC80AMD64
-else
  TEMPLATE_VBOXR3EXE_TOOL.win.x86       = $(VBOX_VCC_TOOL_STEM)X86
  TEMPLATE_VBOXR3EXE_TOOL.win.amd64     = $(VBOX_VCC_TOOL_STEM)AMD64
-endif
  TEMPLATE_VBOXR3EXE_RCDEFS             = \
 	VBOX_VERSION_MAJOR=\"$(VBOX_VERSION_MAJOR)\" \
@@ -3418,11 +3301,6 @@
 	VBOX_SVN_REV_NR=$(VBOX_SVN_REV)
  TEMPLATE_VBOXR3EXE_SDKS               = ReorderCompilerIncs $(VBOX_WINPSDK)
- ifndef VBOX_USE_VCC70
-  TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
-  TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -RTCsu
- else
-  TEMPLATE_VBOXR3EXE_CXXFLAGS          = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
-  TEMPLATE_VBOXR3EXE_CXXFLAGS.debug    = -GZ
- endif
+ TEMPLATE_VBOXR3EXE_CXXFLAGS           = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4244 -wd4996 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
+ TEMPLATE_VBOXR3EXE_CXXFLAGS.debug     = -RTCsu
  TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile  = -Gh -GH
  TEMPLATE_VBOXR3EXE_CFLAGS             = $(TEMPLATE_VBOXR3EXE_CXXFLAGS)
@@ -3933,13 +3811,7 @@
  #       C4065 is about default only switches.
  #       C4996 is about deprected function (CRT only?).
- ifndef VBOX_USE_VCC70
-  TEMPLATE_VBOXMAINEXE_TOOL              = $(VBOX_VCC_TOOL)
-  TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
-  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -RTCsu
- else
-  TEMPLATE_VBOXMAINEXE_TOOL              = VCC70
-  TEMPLATE_VBOXMAINEXE_CXXFLAGS          = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4250 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
-  TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug    = -GZ
- endif
+ TEMPLATE_VBOXMAINEXE_TOOL               = $(VBOX_VCC_TOOL)
+ TEMPLATE_VBOXMAINEXE_CXXFLAGS           = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -W3 -wd4065 -wd4996 -wd4250 -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
+ TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug     = -RTCsu
  TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile  = -Gh -GH
  TEMPLATE_VBOXMAINEXE_CFLAGS             = $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)
@@ -4281,9 +4153,5 @@
    endif
   else if1of ($(KBUILD_TARGET), win)
-   ifdef VBOX_USE_VCC100
-    VBOX_PATH_QT4 ?= $(lastword $(filter %-vcc100,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
-   else
-    VBOX_PATH_QT4 ?= $(lastword $(filter-out %-vcc100,$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
-   endif
+   VBOX_PATH_QT4 ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*))))
   else if1of ($(KBUILD_TARGET), linux solaris)
    VBOX_PATH_QT4 ?= $(lastword $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v4*)))
@@ -4340,14 +4208,6 @@
      QT_DLL _CRT_SECURE_NO_DEPRECATE \
      $(QMAKE_PRL_DEFINES)
-  ## @todo VCC70 flags?
-  ifndef VBOX_USE_VCC70
-   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
-	-nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
-   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
-  else
-   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
-	-nologo -Zm200 -W3 -MD -Zi -GX
-   TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -GZ
-  endif
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
   TEMPLATE_VBOXQT4GUIEXE_INCS += \
 	$(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
@@ -4517,25 +4377,9 @@
 TEMPLATE_VBOXBLDPROG_ASFLAGS.amd64      := $(VBOX_ASFLAGS64)
 ifeq ($(KBUILD_HOST),win)
- ifndef VBOX_USE_VCC70
-  TEMPLATE_VBOXBLDPROG_TOOL             := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))
-  TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs $(VBOX_WINPSDK)
- else if1of ($(KBUILD_HOST_ARCH), x86)
-  TEMPLATE_VBOXBLDPROG_TOOL             := VCC70
-  TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs WIN32SDK
- else if1of ($(KBUILD_HOST_ARCH), amd64)
-  TEMPLATE_VBOXBLDPROG_TOOL             := VCC80AMD64
-  TEMPLATE_VBOXBLDPROG_SDKS             := ReorderCompilerIncs WIN64SDK
- else
-  $(error KBUILD_HOST_ARCH=$(KBUILD_HOST_ARCH))
- endif
- ifneq ($(TEMPLATE_VBOXBLDPROG_TOOL),VCC70)
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3 -wd4996 -Zc:wchar_t-
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -RTCsu
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -O2 -Oy- -GS-
- else
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    = -GZ
-  TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  = -Ogitb2 -Oy-
- endif
+ TEMPLATE_VBOXBLDPROG_TOOL              := $(VBOX_VCC_TOOL_STEM)$(toupper $(KBUILD_HOST_ARCH))
+ TEMPLATE_VBOXBLDPROG_SDKS              := ReorderCompilerIncs $(VBOX_WINPSDK)
+ TEMPLATE_VBOXBLDPROG_CXXFLAGS          := -Zi -Zl -GR- -EHs- -GF -MT$(VBOX_VCC_CRT_TYPE) -W3 -wd4996 -Zc:wchar_t-
+ TEMPLATE_VBOXBLDPROG_CXXFLAGS.debug    := -RTCsu
+ TEMPLATE_VBOXBLDPROG_CXXFLAGS.release  := -O2 -Oy- -GS-
  TEMPLATE_VBOXBLDPROG_CXXFLAGS.profile   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
  TEMPLATE_VBOXBLDPROG_CXXFLAGS.kprofile  = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.release)
@@ -4758,8 +4602,7 @@
  	$(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
  	$(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib
- ifdef VBOX_USE_VCC100
-  TEMPLATE_VBOXGUESTR3EXE_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
-  TEMPLATE_VBOXGUESTR3EXE_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
- endif
+ # Hack for running on NT4, W2K and XP w/o SP: Change OS and subsystem version in the image.
+ TEMPLATE_VBOXGUESTR3EXE_POST_CMDS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
+ TEMPLATE_VBOXGUESTR3EXE_LNK_DEPS.win.x86   = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
 else # the gcc guys
  TEMPLATE_VBOXGUESTR3EXE_EXTENDS  = VBOXR3EXE
@@ -4929,11 +4772,6 @@
 TEMPLATE_VBOXGUESTR0_EXTENDS     = VBOXR0DRV
 TEMPLATE_VBOXGUESTR0_INST        = $(INST_ADDITIONS)
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
 TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
 TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
-else
-TEMPLATE_VBOXGUESTR0_SDKS.win.x86   = ReorderCompilerIncs WIN32SDK $(VBOX_WINDDK)
-TEMPLATE_VBOXGUESTR0_SDKS.win.amd64 = ReorderCompilerIncs $(VBOX_WINDDK_GST) $(VBOX_WINPSDK_GST)INCS
-endif
 TEMPLATE_VBOXGUESTR0_LIBS.win.x86   = \
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/int64.lib
@@ -5082,19 +4920,19 @@
 ifneq ($(VBOX_BUILD_PUBLISHER),)
  if $(length $(VBOX_BUILD_PUBLISHER)) > 10
-  $(error VBOX_BUILD_PUBLISHER must not be longer than 10 characters!)
+  $(error VBox: VBOX_BUILD_PUBLISHER must not be longer than 10 characters!)
  endif
  if "$(substr $(VBOX_BUILD_PUBLISHER), 1, 1)" != "_"
-  $(error VBOX_BUILD_PUBLISHER must start with an underscore!)
+  $(error VBox: VBOX_BUILD_PUBLISHER must start with an underscore!)
  endif
  if "$(translate $(substr $(VBOX_BUILD_PUBLISHER),2),$(VBOX_VERSION_COMP_VALID_CHAR_SET),)" != ""
-  $(error VBOX_BUILD_PUBLISHER='$(VBOX_BUILD_PUBLISHER)' contains bad characters! Valid set is:$(NLTAB)$(VBOX_VERSION_COMP_VALID_CHAR_SET))
+  $(error VBox: VBOX_BUILD_PUBLISHER='$(VBOX_BUILD_PUBLISHER)' contains bad characters! Valid set is:$(NLTAB)$(VBOX_VERSION_COMP_VALID_CHAR_SET))
  endif
 endif
 
 if $(words $(VBOX_VERSION_STRING)) != 1
- $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains spaces or is empty.)
+ $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains spaces or is empty.)
 endif
 if "$(subst __,-,$(VBOX_VERSION_STRING))" != "$(VBOX_VERSION_STRING)"
- $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains double underscores.)
+ $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains double underscores.)
 endif
 
@@ -5102,11 +4940,11 @@
 
 if $(words $(VBOX_VER_TMP1)) > 3
- $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains too many parts (underscores), max 3!)
+ $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' contains too many parts (underscores), max 3!)
 endif
 if "$(translate $(word 1,$(VBOX_VER_TMP1)),0123456789,)" != ".."
- $(error The x.y.z part of VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' is malformed: '$(word 1,$(VBOX_VER_TMP1))')
+ $(error VBox: The x.y.z part of VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' is malformed: '$(word 1,$(VBOX_VER_TMP1))')
 endif
 if "$(word 1,$(VBOX_VER_TMP1))" != "$(VBOX_VERSION_STRING_RAW)"
- $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' does not start with VBOX_VERSION_STRING_RAW='$(VBOX_VERSION_STRING_RAW)')
+ $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' does not start with VBOX_VERSION_STRING_RAW='$(VBOX_VERSION_STRING_RAW)')
 endif
 
@@ -5119,8 +4957,8 @@
   VBOX_VER_TMP2 = 3
  else
-  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
+  $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
  endif
  if "$(translate $(substr $(word 2,$(VBOX_VER_TMP1)),$(VBOX_VER_TMP2)),0123456789)" != ""
-  $(error VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
+  $(error VBox: VBOX_VERSION_STRING='$(VBOX_VERSION_STRING)' uses an unknown build type: '$(word 2,$(VBOX_VER_TMP1))')
  endif
 endif
Index: /trunk/Makefile.kmk
===================================================================
--- /trunk/Makefile.kmk	(revision 42287)
+++ /trunk/Makefile.kmk	(revision 42288)
@@ -95,105 +95,19 @@
 # The compiler runtime DLLs.
 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
- ifdef VBOX_USE_VCC100
-   VBOX_PATH_VCC_REDIST         = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
-   VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
-   VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
-   InstallExternalLibs_SOURCES += \
-   	$(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT)/msvcr100.dll=>testcase/msvcr100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT)/msvcp100.dll=>testcase/msvcp100.dll
-  ifeq ($(VBOX_VCC_CRT_TYPE),d)
-   	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr100.dll=>testcase/msvcr100.dll \
-   	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp100.dll=>testcase/msvcp100.dll
-  endif
+  VBOX_PATH_VCC_REDIST         = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
+  VBOX_PATH_VCC_REDIST_CRT     = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.CRT
+  VBOX_PATH_VCC_REDIST_CRT_DBG = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/Microsoft.VC100.DebugCRT
+  InstallExternalLibs_SOURCES += \
+  	$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
+ ifeq ($(VBOX_VCC_CRT_TYPE),d)
+  	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
+  	$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
  endif
- ifdef VBOX_USE_VCC80
-  include $(KBUILD_PATH)/tools/VCC80X86.kmk
-  include $(KBUILD_PATH)/tools/VCC80AMD64.kmk
-  InstallExternalLibs_SOURCES.x86 += \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
-  	$(PATH_TOOL_VCC80X86)/redist/x86/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
-  InstallExternalLibs_SOURCES.amd64 += \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>Microsoft.VC80.CRT/msvcr80.dll \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>Microsoft.VC80.CRT/msvcp80.dll \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest=>testcase/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll=>testcase/Microsoft.VC80.CRT/msvcr80.dll \
-  	$(PATH_TOOL_VCC80AMD64)/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll=>testcase/Microsoft.VC80.CRT/msvcp80.dll
-  ifeq ($(VBOX_VCC_CRT_TYPE),d)
-   InstallExternalLibs_SOURCES.x86 += \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
-   	$(PATH_TOOL_VCC80X86)/redist/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
-   InstallExternalLibs_SOURCES.amd64 += \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>Microsoft.VC80.DebugCRT/msvcr80d.dll \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>Microsoft.VC80.DebugCRT/msvcp80d.dll \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest=>testcase/Microsoft.VC80.DebugCRT/Microsoft.VC80.DebugCRT.manifest \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcr80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcr80d.dll \
-   	$(PATH_TOOL_VCC80AMD64)/redist/Debug_NonRedist/amd64/Microsoft.VC80.DebugCRT/msvcp80d.dll=>testcase/Microsoft.VC80.DebugCRT/msvcp80d.dll
-  endif
- endif
- ifndef VBOX_USE_VCC100
-  ifndef VBOX_USE_VCC80
-   VBOX_INSTALL_VCC70_RT = 1
-  endif
-  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
-   VBOX_INSTALL_VCC70_RT = 1
-  endif
- endif
- ifdef VBOX_INSTALL_VCC70_RT
-  include $(KBUILD_PATH)/tools/VCC70.kmk
-
-  ## @todo Move these defines to VCC70.
-  DLL_TOOL_VCC70_MSVCR71 ?= $(PATH_TOOL_VCC70)/bin/msvcr71.dll
-  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71)),)
-   InstallExternalLibs_SOURCES += \
-   	$(DLL_TOOL_VCC70_MSVCR71)=>msvcr71.dll \
-   	$(DLL_TOOL_VCC70_MSVCR71)=>testcase/msvcr71.dll
-  endif
-  ifeq ($(VBOX_VCC_CRT_TYPE),d)
-   DLL_TOOL_VCC70_MSVCR71D ?= $(PATH_TOOL_VCC70)/bin/msvcr71d.dll
-   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCR71D)),)
-    InstallExternalLibs_SOURCES += \
-    	$(DLL_TOOL_VCC70_MSVCR71D)=>msvcr71d.dll \
-    	$(DLL_TOOL_VCC70_MSVCR71D)=>testcase/msvcr71d.dll
-   endif
-  endif
-
-  DLL_TOOL_VCC70_MSVCP71 ?= $(PATH_TOOL_VCC70)/bin/msvcp71.dll
-  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71)),)
-   InstallExternalLibs_SOURCES += \
-	$(DLL_TOOL_VCC70_MSVCP71)=>msvcp71.dll \
-	$(DLL_TOOL_VCC70_MSVCP71)=>testcase/msvcp71.dll
-  endif
-  ifeq ($(VBOX_VCC_CRT_TYPE),d)
-   DLL_TOOL_VCC70_MSVCP71D ?= $(PATH_TOOL_VCC70)/bin/msvcp71d.dll
-   ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCP71D)),)
-    InstallExternalLibs_SOURCES += \
- 	$(DLL_TOOL_VCC70_MSVCP71D)=>msvcp71d.dll \
- 	$(DLL_TOOL_VCC70_MSVCP71D)=>testcase/msvcp71d.dll
-   endif
-  endif
-
-  DLL_TOOL_VCC70_MSVCRT  ?= $(PATH_TOOL_VCC70)/bin/msvcrt.dll
-  ifneq ($(wildcard $(DLL_TOOL_VCC70_MSVCRT)),)
-   InstallExternalLibs_SOURCES += \
-	$(DLL_TOOL_VCC70_MSVCRT)=>msvcrt.dll \
-	$(DLL_TOOL_VCC70_MSVCRT)=>testcase/msvcrt.dll
-  endif
- endif
-endif
-
+endif
 
 #
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 42288)
@@ -28,8 +28,5 @@
 VBoxDisp_SYSSUFF       = .dll
 VBoxDisp_SDKS          = ReorderCompilerIncs $(VBOX_WINDDK_GST_NT4)
-VBoxDisp_DEFS.x86     = _WIN32_WINNT=0x0501
-ifndef VBOX_USE_VCC100
- VBoxDisp_DEFS.amd64  = _WIN32_WINNT=0x0500 # <- otherwise the build will fail due to DDK header inconsistencies
-endif
+VBoxDisp_DEFS.x86      = _WIN32_WINNT=0x0501
 VBoxDisp_DEFS          = VBOX_WITH_DDRAW
 VBoxDisp_DEFS         += LOG_TO_BACKDOOR #LOG_ENABLED
Index: /trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Additions/WINNT/VBoxCredProv/Makefile.kmk	(revision 42288)
@@ -22,9 +22,5 @@
 VBoxCredProv_TEMPLATE    = VBOXGUESTR3DLL
 VBoxCredProv_DEFS        = VBGL_VBOXGUEST VBOX_WITH_HGCM VBOX_WITH_SENS UNICODE
-ifdef VBOX_USE_VCC100
 VBoxCredProv_SDKS        = ReorderCompilerIncs $(VBOX_WINPSDK_GST_WLH)
-else
-VBoxCredProv_SDKS.x86    = WINDDK
-endif
 VBoxCredProv_SOURCES  = \
 	VBoxCredentialProvider.cpp \
@@ -37,36 +33,11 @@
 	VBoxCredProvUtils.cpp
 
-ifndef VBOX_USE_VCC100
-#
-# Since this is not the default SDK we have to navigate manually to it.
-#
-VBOX_PATH_PSDK_200702    := \
-	$(PATH_DEVTOOLS)/win.x86/sdk/x200702/
-
-VBoxCredProv_INCS        := \
-	$(VBOX_PATH_PSDK_200702)/Include
-VBoxCredProv_LIBS.x86  := \
-	$(VBOX_PATH_PSDK_200702)/Lib/Uuid.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/credui.lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/Secur32.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/ShLwApi.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/NetAPI32.Lib
-VBoxCredProv_LIBS.amd64  := \
-	$(VBOX_PATH_PSDK_200702)/Lib/x64/Uuid.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/x64/credui.lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/x64/Secur32.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/x64/ShLwApi.Lib \
-	$(VBOX_PATH_PSDK_200702)/Lib/x64/NetAPI32.Lib
-endif
-
 VBoxCredProv_LIBS     = \
 	$(VBOX_LIB_IPRT_GUEST_R3) \
 	$(VBOX_LIB_VBGL_R3)
-ifdef VBOX_USE_VCC100
 VBoxCredProv_LIBS    += \
 	$(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/credui.lib \
 	$(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/Secur32.Lib \
 	$(PATH_SDK_$(VBOX_WINPSDK_GST_WLH)_LIB)/NetAPI32.Lib
-endif
 
 include $(FILE_KBUILD_SUB_FOOTER)
Index: /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk	(revision 42288)
@@ -25,13 +25,7 @@
  VBoxTray_DEBUG_INSTTYPE = both
 endif
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
- VBoxTray_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST)
-endif
+VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)
 VBoxTray_DEFS     = VBOX_WITH_HGCM LOG_TO_BACKDOOR
 VBoxTray_INCS     = ../include
-if !defined(VBOX_USE_VCC100) && !defined(VBOX_USE_VCC110)
- include $(KBUILD_PATH)/sdks/WINDDK.kmk # WTF is this about?
- VBoxTray_INCS   += $(PATH_SDK_WINDDK_INC_API) $(PATH_SDK_WINDDK_INC_DDK)
-endif
 VBoxTray_SOURCES  = \
 	VBoxTray.cpp \
Index: /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk	(revision 42288)
@@ -35,9 +35,5 @@
 endif
 VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
- VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
-else
- VBoxInstallHelper_LIBS    = $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
-endif
+VBoxInstallHelper_LIBS     = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
 ifdef VBOX_WITH_NETFLT
  VBoxInstallHelper_LIBS   += \
@@ -49,10 +45,6 @@
 endif
 
-ifeq ($(KBUILD_TARGET),win)
- ifdef VBOX_WITH_TESTCASES
-  ifndef VBOX_OSE
-   include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
-  endif
- endif
+if "$(KBUILD_TARGET)" == "win" && defined(VBOX_WITH_TESTCASES) && !defined(VBOX_OSE)
+ include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
 endif
 
Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 42288)
@@ -324,27 +324,13 @@
  VBOX_MSI_DEPENDENCIES := $(filer-out %.cat, $(VBOX_MSI_DEPENDENCIES))
 endif
-if !defined(VBOX_USE_VCC70) && !defined(VBOX_USE_VCC80) && !defined(VBOX_USE_VCC100)
-$(error One VBOX_USE_VCC* must be defined)
-endif
-ifndef VBOX_USE_VCC100
+ifdef VBOX_USE_VCC110
  VBOX_MSI_DEPENDENCIES := $(filter-out \
 	$(PATH_OUT)/bin/msvcr100.dll \
 	$(PATH_OUT)/bin/msvcp100.dll \
 	, $(VBOX_MSI_DEPENDENCIES))
-endif
-ifndef VBOX_USE_VCC80
+else
  VBOX_MSI_DEPENDENCIES := $(filter-out \
-	$(PATH_OUT)/bin/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest \
-	$(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcr80.dll \
-	$(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcp80.dll \
-	$(PATH_OUT)/bin/Microsoft.VC80.CRT/msvcm80.dll \
-	, $(VBOX_MSI_DEPENDENCIES))
-endif
-ifndef VBOX_USE_VCC70
- VBOX_MSI_DEPENDENCIES := $(filter-out \
-	$(PATH_OUT)/bin/msvcrt.dll \
-	$(PATH_OUT)/bin/msvcr71.dll \
-	$(PATH_OUT)/bin/msvcp71.dll \
-	$(PATH_OUT)/bin/SDL_ttf.dll \
+	$(PATH_OUT)/bin/msvcr110.dll \
+	$(PATH_OUT)/bin/msvcp110.dll \
 	, $(VBOX_MSI_DEPENDENCIES))
 endif
@@ -465,7 +451,5 @@
 		-E 'BUILD_TYPE=$(KBUILD_TYPE)' \
 		-E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
-		-E 'VBOX_USE_VCC100=$(if $(VBOX_USE_VCC100),yes,no)' \
-		-E 'VBOX_USE_VCC80=$(if $(VBOX_USE_VCC80),yes,no)' \
-		-E 'VBOX_USE_VCC70=$(if $(VBOX_USE_VCC70),yes,no)' \
+		-E 'VBOX_USE_$(VBOX_VCC_TOOL_STEM)=yes' \
 		-- \
 		$(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \
Index: /trunk/src/VBox/Installer/win/Stub/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Stub/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Installer/win/Stub/Makefile.kmk	(revision 42288)
@@ -34,13 +34,7 @@
 VBoxStub_SDKS += \
 	VBOX_NTDLL
-if defined(VBOX_USE_VCC100) || defined(VBOX_USE_VCC110)
 VBoxStub_LIBS = \
 	$(VBOX_LIB_RUNTIME_STATIC) \
 	$(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
-else
-VBoxStub_LIBS = \
-	$(VBOX_LIB_RUNTIME_STATIC) \
-	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/Msi.lib
-endif
 
 VBoxStub.cpp_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 42287)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 42288)
@@ -527,5 +527,5 @@
 <?endif?>
 
-<?if $(env.VBOX_USE_VCC100) = "yes" ?>
+<?if $(env.VBOX_USE_VCC100) == "yes" ?>
                         <!-- MS C/C++ v10.0 Runtime DLL files. -->
                         <File Id="file_msvcr100.dll" Name="msvcr100.dll"
@@ -534,27 +534,10 @@
                               Source="$(env.PATH_OUT)\bin\msvcp100.dll" />
 <?endif?>
-
-<?if $(env.VBOX_USE_VCC80) = "yes" ?>
-                        <!-- MS C/C++ v8 Runtime DLL files (private assembly). -->
-                        <File Id="file_Microsoft.VC80.CRT.manifest" Name="Microsoft.VC80.CRT.manifest"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" />
-                        <File Id="file_msvcr80.dll" Name="msvcr80.dll"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcr80.dll" />
-                        <File Id="file_msvcp80.dll" Name="msvcp80.dll"
-                              Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcp80.dll" />
-<?endif?>
-
-<?if $(env.VBOX_USE_VCC70) = "yes" ?>
-                        <!-- MS C/C++ v7 Runtime DLL files. -->
-                        <File Id="file_msvcp71.dll" Name="msvcp71.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcp71.dll" />
-                        <File Id="file_msvcrt.dll" Name="msvcrt.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcrt.dll" />
-<?endif?>
-<?if $(env.VBOX_USE_VCC100) != "yes" ?>
-    <?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
-                        <File Id="msvcrdll" Name="msvcr71.dll"
-                              Source="$(env.PATH_OUT)\bin\msvcr71.dll" />
-    <?endif?>
+<?if $(env.VBOX_USE_VCC110) == "yes" ?>
+                        <!-- MS C/C++ v11.0 Runtime DLL files. -->
+                        <File Id="file_msvcr110.dll" Name="msvcr110.dll"
+                              Source="$(env.PATH_OUT)\bin\msvcr110.dll" />
+                        <File Id="file_msvcp110.dll" Name="msvcp110.dll"
+                              Source="$(env.PATH_OUT)\bin\msvcp110.dll" />
 <?endif?>
 
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 42288)
@@ -560,8 +560,5 @@
 	-exported_symbols_list $(VBoxC_0_OUTDIR)/VBoxC.def \
 	-framework IOKit
-VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll
-ifndef VBOX_USE_VCC70
- VBoxC_LDFLAGS.win += /MANIFEST
-endif
+VBoxC_LDFLAGS.win += /DELAYLOAD:VBoxVMM.dll /MANIFEST
 
 VBoxC_LIBS += \
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 42288)
@@ -207,7 +207,5 @@
  LIBRARIES += vboxsoap
  vboxsoap_TEMPLATE = VBOXWEBR3EXE
- ifndef VBOX_USE_VCC70
-  vboxsoap_CXXFLAGS.win += -bigobj
- endif
+ vboxsoap_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   vboxsoap_CXXFLAGS += -Wno-shadow
@@ -292,7 +290,5 @@
 	$(VBOXWEB_OUT_DIR) \
 	.
- ifndef VBOX_USE_VCC70
-  vboxwebsrv_CXXFLAGS.win += -bigobj
- endif
+ vboxwebsrv_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   vboxwebsrv_CXXFLAGS += -Wno-shadow
@@ -435,7 +431,5 @@
  PROGRAMS += webtest
  webtest_TEMPLATE = VBOXWEBR3EXE
- ifndef VBOX_USE_VCC70
-  webtest_CXXFLAGS.win += -bigobj
- endif
+ webtest_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
   webtest_CXXFLAGS += -Wno-shadow
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 42287)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 42288)
@@ -1066,9 +1066,7 @@
 RuntimeGuestR3_SOURCES.$(KBUILD_TARGET).amd64:= $(RuntimeR3_SOURCES.$(KBUILD_TARGET).amd64)
 RuntimeGuestR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH)   := $(RuntimeR3_SOURCES.$(KBUILD_HOST).$(KBUILD_TARGET_ARCH))
-ifdef VBOX_USE_VCC100
- RuntimeGuestR3_SOURCES.win.x86              += \
+RuntimeGuestR3_SOURCES.win.x86               += \
  	r3/win/vcc100-kernel32-fakes.cpp \
  	r3/win/vcc100-kernel32-fakesA.asm
-endif
 
 #
@@ -1330,7 +1328,5 @@
 	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/wbemuuid.lib
 VBoxRT_LDFLAGS.darwin          = -framework IOKit -framework CoreFoundation -framework CoreServices -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxRT.dylib
-ifdef VBOX_USE_VCC80
 VBoxRT_LDFLAGS.win             = /MANIFEST
-endif
 VBoxRT_LDFLAGS.l4              = \
 	-Wl,-whole-archive \