diff --git a/qmake/toolchain/win32-msvc2015/x64.toolchain b/qmake/toolchain/win32-msvc2015/x64.toolchain
index 1fff4329c..1a053a2d1 100644
--- a/qmake/toolchain/win32-msvc2015/x64.toolchain
+++ b/qmake/toolchain/win32-msvc2015/x64.toolchain
@@ -12,29 +12,29 @@
 # of the native architecture of the build
 # environment.
 
-# Use the x86-based amd64 cross compiler by default.
+# Use the x86-based amd64 cross compiler by default...
 QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
 QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\x86_amd64\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\x86_amd64\\lib.exe\""
+QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\x86_amd64\\link.exe\""
+QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\x86_amd64\\lib.exe\""
 
-# ...but use the native amd64 compiler if it is available.
+# ... but use the native amd64 compiler if it is available.
 exists($$(VCINSTALLDIR)\\bin\\amd64) {
 	QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
 	QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\amd64\\cl.exe\""
-	QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\amd64\\link.exe\""
-	QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\amd64\\lib.exe\""
+	QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\amd64\\link.exe\""
+	QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\amd64\\lib.exe\""
 }
 
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x64\\rc.exe\""
+QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x64\\rc.exe\""
 
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
+INCLUDEPATH *= "$$(VCINSTALLDIR)include"
+INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)shared"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)um"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)winrt"
 
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\\amd64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x64\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x64\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\\amd64\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\\amd64\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x64\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x64\""
diff --git a/qmake/toolchain/win32-msvc2015/x86-xp.toolchain b/qmake/toolchain/win32-msvc2015/x86-xp.toolchain
index 63a4018c3..d200a7fde 100644
--- a/qmake/toolchain/win32-msvc2015/x86-xp.toolchain
+++ b/qmake/toolchain/win32-msvc2015/x86-xp.toolchain
@@ -14,24 +14,24 @@
 # Windows XP, regardless of the native
 # architecture of the build environment.
 
-WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A"
+WIN7_XP_SDK_DIR="C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\"
 
 QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
 QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\" /D_USING_V110_SDK71_"
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
-QMAKE_RC = \""$${WIN7_XP_SDK_DIR}\\bin\\rc.exe\" /D_USING_V110_SDK71_"
+QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
+QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
+QMAKE_RC = \""$${WIN7_XP_SDK_DIR}bin\\rc.exe\" /D_USING_V110_SDK71_"
 
-INCLUDEPATH *= "$$(DXSDK_DIR)\\include"
-INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
+INCLUDEPATH *= "$$(DXSDK_DIR)include"
+INCLUDEPATH *= "$${WIN7_XP_SDK_DIR}include"
+INCLUDEPATH *= "$$(VCINSTALLDIR)include"
+INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
+INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)shared"
+INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)um"
+INCLUDEPATH *= "$$(WindowsSdkDir)include\\$$(WindowsSDKLibVersion)winrt"
 
 QMAKE_LFLAGS *= "/LIBPATH:\"$$(DXSDK_DIR)\\lib\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x86\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
diff --git a/qmake/toolchain/win32-msvc2015/x86.toolchain b/qmake/toolchain/win32-msvc2015/x86.toolchain
index ffc8d1548..9dd1b250b 100644
--- a/qmake/toolchain/win32-msvc2015/x86.toolchain
+++ b/qmake/toolchain/win32-msvc2015/x86.toolchain
@@ -14,17 +14,17 @@
 
 QMAKE_CC = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
 QMAKE_CXX = "\"$$(VCINSTALLDIR)bin\\cl.exe\""
-QMAKE_LINK = \""$$(VCINSTALLDIR)\\bin\\link.exe\""
-QMAKE_LIB = \""$$(VCINSTALLDIR)\\bin\\lib.exe\""
-QMAKE_RC = \""$$(WindowsSdkDir)\\bin\\x86\\rc.exe\""
+QMAKE_LINK = \""$$(VCINSTALLDIR)bin\\link.exe\""
+QMAKE_LIB = \""$$(VCINSTALLDIR)bin\\lib.exe\""
+QMAKE_RC = \""$$(WindowsSdkDir)bin\\$$(WindowsSDKLibVersion)x86\\rc.exe\""
 
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\include"
-INCLUDEPATH *= "$$(VCINSTALLDIR)\\atlmfc\\include"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\shared"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\um"
-INCLUDEPATH *= "$$(WindowsSdkDir)\\include\\winrt"
+INCLUDEPATH *= "$$(VCINSTALLDIR)include"
+INCLUDEPATH *= "$$(VCINSTALLDIR)atlmfc\\include"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)shared"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)um"
+INCLUDEPATH *= "$$(WindowsSdkDir)include$$(WindowsSDKLibVersion)winrt"
 
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)\\atlmfc\\lib\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)um\\x86\""
-QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)\\lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)lib\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(VCINSTALLDIR)atlmfc\\lib\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)um\\x86\""
+QMAKE_LFLAGS *= "/LIBPATH:\"$$(WindowsSdkDir)lib\\$$(WindowsSDKLibVersion)ucrt\\x86\""