Index: trunk/kBuild/sdks/DXSDK.kmk
===================================================================
--- trunk/kBuild/sdks/DXSDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/DXSDK.kmk	(revision 3418)
@@ -37,13 +37,13 @@
 ifndef PATH_SDK_DXSDK
  ## @todo which order is logical here, BLD and then TRG or the other way?
- PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/dxsdk/2*))
+ PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS_BLD)/dxsdk/2*))
  ifeq ($(PATH_SDK_DXSDK),)
-  PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS_TRG)/dxsdk/2*))
+  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/dxsdk/2*))
  endif
  ifeq ($(PATH_SDK_DXSDK),)
-  PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*))
+  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*))
  endif
  ifeq ($(PATH_SDK_DXSDK),)
-  PATH_SDK_DXSDK := $(sort $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*))
+  PATH_SDK_DXSDK := $(sort $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/2*))
  endif
  ifneq ($(PATH_SDK_DXSDK),)
@@ -51,5 +51,5 @@
  else
   $(warning kBuild: PATH_SDK_DXSDK couldn't be determined!)
-  PATH_SDK_DXSDK := $(PATH_DEVTOOLS_TRG)/dxsdk/not/found
+  PATH_SDK_DXSDK := $(KBUILD_DEVTOOLS_TRG)/dxsdk/not/found
  endif
 else
Index: trunk/kBuild/sdks/DXSDKAMD64.kmk
===================================================================
--- trunk/kBuild/sdks/DXSDKAMD64.kmk	(revision 3417)
+++ trunk/kBuild/sdks/DXSDKAMD64.kmk	(revision 3418)
@@ -36,10 +36,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_DXSDKAMD64
- PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/dxsdk/2*)
+ PATH_SDK_DXSDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/2*)
  ifeq ($(PATH_SDK_DXSDKAMD64),)
   PATH_SDK_DXSDKAMD64 := $(PATH_SDK_DXSDK)
  endif
  ifeq ($(PATH_SDK_DXSDKAMD64),)
-  PATH_SDK_DXSDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*)
+  PATH_SDK_DXSDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*)
  endif
  ifneq ($(PATH_SDK_DXSDKAMD64),)
@@ -47,5 +47,5 @@
  else
   $(warning kBuild: PATH_SDK_DXSDKAMD64 couldn't be determined!)
-  PATH_SDK_DXSDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/dxsdk/not/found
+  PATH_SDK_DXSDKAMD64 := $(KBUILD_DEVTOOLS)/win.amd64/dxsdk/not/found
  endif
 else
Index: trunk/kBuild/sdks/DXSDKX86.kmk
===================================================================
--- trunk/kBuild/sdks/DXSDKX86.kmk	(revision 3417)
+++ trunk/kBuild/sdks/DXSDKX86.kmk	(revision 3418)
@@ -37,10 +37,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_DXSDKX86
- PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/dxsdk/2*)
+ PATH_SDK_DXSDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/dxsdk/2*)
  ifeq ($(PATH_SDK_DXSDKX86),)
   PATH_SDK_DXSDKX86 := $(PATH_SDK_DXSDK)
  endif
  ifeq ($(PATH_SDK_DXSDKX86),)
-  PATH_SDK_DXSDKX86 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/dxsdk/2*)
+  PATH_SDK_DXSDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/amd64.win/dxsdk/2*)
  endif
  ifneq ($(PATH_SDK_DXSDKX86),)
@@ -48,5 +48,5 @@
  else
   $(warning kBuild: PATH_SDK_DXSDKX86 couldn't be determined!)
-  PATH_SDK_DXSDKX86 := $(PATH_DEVTOOLS)/win.x86/dxsdk/not/found
+  PATH_SDK_DXSDKX86 := $(KBUILD_DEVTOOLS)/win.x86/dxsdk/not/found
  endif
 else
Index: trunk/kBuild/sdks/LIBSDL.kmk
===================================================================
--- trunk/kBuild/sdks/LIBSDL.kmk	(revision 3417)
+++ trunk/kBuild/sdks/LIBSDL.kmk	(revision 3418)
@@ -37,7 +37,7 @@
 _SDK_LIBSDK_IS_FRAMEWORK := no
 ifndef PATH_SDK_LIBSDL
- PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_TRG)/libsdl/v*)
+ PATH_SDK_LIBSDL := $(wildcard $(KBUILD_DEVTOOLS_TRG)/libsdl/v*)
  ifeq ($(PATH_SDK_LIBSDL),)
-  PATH_SDK_LIBSDL := $(wildcard $(PATH_DEVTOOLS_BLD)/libsdl/v*)
+  PATH_SDK_LIBSDL := $(wildcard $(KBUILD_DEVTOOLS_BLD)/libsdl/v*)
  endif
  ifneq ($(PATH_SDK_LIBSDL),)
@@ -66,5 +66,5 @@
    else
     $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!)
-    PATH_SDK_LIBSDL := $(PATH_DEVTOOLS_TRG)/libsdl/not/found
+    PATH_SDK_LIBSDL := $(KBUILD_DEVTOOLS_TRG)/libsdl/not/found
    endif
   endif
Index: trunk/kBuild/sdks/NT4DDK.kmk
===================================================================
--- trunk/kBuild/sdks/NT4DDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/NT4DDK.kmk	(revision 3418)
@@ -36,7 +36,7 @@
 # SDK Specific Properties
 ifndef PATH_SDK_NT4DDK
- PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddknt4/1* $(PATH_DEVTOOLS)/win.x86/ddknt4/2*)
+ PATH_SDK_NT4DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddknt4/1* $(KBUILD_DEVTOOLS)/win.x86/ddknt4/2*)
  ifeq ($(PATH_SDK_NT4DDK),)
-  PATH_SDK_NT4DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddknt4)
+  PATH_SDK_NT4DDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddknt4)
  endif
  ifneq ($(PATH_SDK_NT4DDK),)
@@ -44,5 +44,5 @@
  else
   $(warning kBuild: PATH_SDK_NT4DDK couldn't be determined!)
-  PATH_SDK_NT4DDK := $(PATH_DEVTOOLS)/x86.win/ddknt4/not/found
+  PATH_SDK_NT4DDK := $(KBUILD_DEVTOOLS)/x86.win/ddknt4/not/found
  endif
 else
Index: trunk/kBuild/sdks/OS2DDKBASE32.kmk
===================================================================
--- trunk/kBuild/sdks/OS2DDKBASE32.kmk	(revision 3417)
+++ trunk/kBuild/sdks/OS2DDKBASE32.kmk	(revision 3418)
@@ -36,5 +36,5 @@
 # SDK Specific Properties
 ifndef PATH_SDK_OS2DDKBASE32
- PATH_SDK_OS2DDKBASE32 := $(wildcard $(PATH_DEVTOOLS)/os2.x86/ddk/2*/base32)
+ PATH_SDK_OS2DDKBASE32 := $(wildcard $(KBUILD_DEVTOOLS)/os2.x86/ddk/2*/base32)
  ifeq ($(PATH_SDK_OS2DDKBASE32),)
   PATH_SDK_OS2DDKBASE32 := $(wildcard $(PATH_DDKBASE)/../base32)
@@ -44,5 +44,5 @@
  else
   $(warning kBuild: PATH_SDK_OS2DDKBASE32 couldn't be determined!)
-  PATH_SDK_OS2DDKBASE32 := $(PATH_DEVTOOLS)/x86.win/ddknt4/not/found
+  PATH_SDK_OS2DDKBASE32 := $(KBUILD_DEVTOOLS)/x86.win/ddknt4/not/found
  endif
 else
Index: trunk/kBuild/sdks/W2K3DDK.kmk
===================================================================
--- trunk/kBuild/sdks/W2K3DDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/W2K3DDK.kmk	(revision 3418)
@@ -36,20 +36,20 @@
 # SDK Specific Properties
 ifndef PATH_SDK_W2K3DDK
- PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_TRG)/ddkwin2k3/2*)
+ PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddkwin2k3/2*)
  ifeq ($(PATH_SDK_W2K3DDK),)
-  PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS_BLD)/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS_BLD)/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDK),)
-  PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDK),)
-  PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDK),)
-  PATH_SDK_W2K3DDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDK),)
-  ifneq ($(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/lib/wnet/i386/*.lib),)
-   PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3
+  ifneq ($(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/lib/wnet/i386/*.lib),)
+   PATH_SDK_W2K3DDK := $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3
   endif
  endif
@@ -58,5 +58,5 @@
  else
   $(warning kBuild: PATH_SDK_W2K3DDK couldn't be determined!)
-  PATH_SDK_W2K3DDK := $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/not/found
+  PATH_SDK_W2K3DDK := $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/not/found
  endif
 else
Index: trunk/kBuild/sdks/W2K3DDKAMD64.kmk
===================================================================
--- trunk/kBuild/sdks/W2K3DDKAMD64.kmk	(revision 3417)
+++ trunk/kBuild/sdks/W2K3DDKAMD64.kmk	(revision 3418)
@@ -36,14 +36,14 @@
 # SDK Specific Properties
 ifndef PATH_SDK_W2K3DDKAMD64
- PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
+ PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
  ifeq ($(PATH_SDK_W2K3DDKAMD64),)
   PATH_SDK_W2K3DDKAMD64 := $(PATH_SDK_W2K3DDK)
  endif
  ifeq ($(PATH_SDK_W2K3DDKAMD64),)
-  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
  endif
  # legacy:
  ifeq ($(PATH_SDK_W2K3DDKAMD64),)
-  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDKAMD64 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
  endif
  ifneq ($(PATH_SDK_W2K3DDKAMD64),)
@@ -51,5 +51,5 @@
  else
   $(warning kBuild: PATH_SDK_W2K3DDKAMD64 couldn't be determined!)
-  PATH_SDK_W2K3DDKAMD64 := $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/not/found
+  PATH_SDK_W2K3DDKAMD64 := $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/not/found
  endif
 else
Index: trunk/kBuild/sdks/W2K3DDKX86.kmk
===================================================================
--- trunk/kBuild/sdks/W2K3DDKX86.kmk	(revision 3417)
+++ trunk/kBuild/sdks/W2K3DDKX86.kmk	(revision 3418)
@@ -36,17 +36,17 @@
 # SDK Specific Properties
 ifndef PATH_SDK_W2K3DDKX86
- PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddkwin2k3/2*)
+ PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddkwin2k3/2*)
  ifeq ($(PATH_SDK_W2K3DDKX86),)
   PATH_SDK_W2K3DDKX86 := $(PATH_SDK_W2K3DDK)
  endif
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddkwin2k3/2*)
  endif
  # legacy:
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3/2*)
  endif
  ifeq ($(PATH_SDK_W2K3DDKX86),)
-  PATH_SDK_W2K3DDKX86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/ddkwin2k3)
+  PATH_SDK_W2K3DDKX86 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/ddkwin2k3)
  endif
  ifneq ($(PATH_SDK_W2K3DDKX86),)
@@ -54,5 +54,5 @@
  else
   $(warning kBuild: PATH_SDK_W2K3DDKX86 couldn't be determined!)
-  PATH_SDK_W2K3DDKX86 := $(PATH_DEVTOOLS)/x86.win/ddkwin2k3/not/found
+  PATH_SDK_W2K3DDKX86 := $(KBUILD_DEVTOOLS)/x86.win/ddkwin2k3/not/found
  endif
 else
Index: trunk/kBuild/sdks/W32API.kmk
===================================================================
--- trunk/kBuild/sdks/W32API.kmk	(revision 3417)
+++ trunk/kBuild/sdks/W32API.kmk	(revision 3418)
@@ -36,7 +36,7 @@
 # SDK Specific Properties
 ifndef PATH_SDK_W32API
- PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/win.x86/w32api/v*)
+ PATH_SDK_W32API := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/w32api/v*)
  ifeq ($(PATH_SDK_W32API),)
-  PATH_SDK_W32API := $(wildcard $(PATH_DEVTOOLS)/x86.win32/w32api/v*)
+  PATH_SDK_W32API := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/w32api/v*)
  endif
  ifneq ($(PATH_SDK_W32API),)
@@ -44,5 +44,5 @@
  else
   $(warning kBuild: PATH_SDK_W32API couldn't be determined!)
-  PATH_SDK_W32API := $(PATH_DEVTOOLS)/x86.win/w32api/not/found
+  PATH_SDK_W32API := $(KBUILD_DEVTOOLS)/x86.win/w32api/not/found
  endif
 else
Index: trunk/kBuild/sdks/WIN32SDK.kmk
===================================================================
--- trunk/kBuild/sdks/WIN32SDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WIN32SDK.kmk	(revision 3418)
@@ -36,13 +36,13 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WIN32SDK
- PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
+ PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
  ifeq ($(PATH_SDK_WIN32SDK),)
   PATH_SDK_WIN32SDK := $(PATH_SDK_WINPSDK)
  endif
  ifeq ($(PATH_SDK_WIN32SDK),)
-  PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
+  PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2*)
  endif
  ifeq ($(PATH_SDK_WIN32SDK),)
-  PATH_SDK_WIN32SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
+  PATH_SDK_WIN32SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
  endif
  ifneq ($(PATH_SDK_WIN32SDK),)
@@ -50,5 +50,5 @@
  else
   $(warning kBuild: PATH_SDK_WIN32SDK couldn't be determined!)
-  PATH_SDK_WIN32SDK := $(PATH_DEVTOOLS)/win.x86/sdk/not/found
+  PATH_SDK_WIN32SDK := $(KBUILD_DEVTOOLS)/win.x86/sdk/not/found
  endif
 endif
Index: trunk/kBuild/sdks/WIN32SDK2002.kmk
===================================================================
--- trunk/kBuild/sdks/WIN32SDK2002.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WIN32SDK2002.kmk	(revision 3418)
@@ -39,10 +39,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WIN32SDK2002
- PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2002*)
+ PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2002*)
  ifeq ($(PATH_SDK_WIN32SDK2002),)
-  PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2002*)
+  PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2002*)
  endif
  ifeq ($(PATH_SDK_WIN32SDK2002),)
-  PATH_SDK_WIN32SDK2002 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk2002*)
+  PATH_SDK_WIN32SDK2002 := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk2002*)
  endif
  ifneq ($(PATH_SDK_WIN32SDK2002),)
@@ -50,5 +50,5 @@
  else
   $(warning kBuild: PATH_SDK_WIN32SDK2002 couldn't be determined!)
-  PATH_SDK_WIN32SDK2002 := $(PATH_DEVTOOLS)/win.x86/sdk/2002/not/found
+  PATH_SDK_WIN32SDK2002 := $(KBUILD_DEVTOOLS)/win.x86/sdk/2002/not/found
  endif
 else
Index: trunk/kBuild/sdks/WIN64SDK.kmk
===================================================================
--- trunk/kBuild/sdks/WIN64SDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WIN64SDK.kmk	(revision 3418)
@@ -37,10 +37,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WIN64SDK
- PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
+ PATH_SDK_WIN64SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
  ifeq ($(PATH_SDK_WIN64SDK),)
   PATH_SDK_WIN64SDK := $(PATH_SDK_WINPSDK)
  endif
  ifeq ($(PATH_SDK_WIN64SDK),)
-  PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
+  PATH_SDK_WIN64SDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
  endif
  ifneq ($(PATH_SDK_WIN64SDK),)
@@ -48,5 +48,5 @@
  else
   $(warning kBuild: PATH_SDK_WIN64SDK couldn't be determined!)
-  PATH_SDK_WIN64SDK := $(PATH_DEVTOOLS)/win.amd64/sdk/not/found
+  PATH_SDK_WIN64SDK := $(KBUILD_DEVTOOLS)/win.amd64/sdk/not/found
  endif
 else
Index: trunk/kBuild/sdks/WINDDK.kmk
===================================================================
--- trunk/kBuild/sdks/WINDDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINDDK.kmk	(revision 3418)
@@ -38,10 +38,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINDDK
- PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/6*)
+ PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/6*)
  ifeq ($(PATH_SDK_WINDDK),)
-  PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/6*)
+  PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/6*)
  endif
  ifeq ($(PATH_SDK_WINDDK),)
-  PATH_SDK_WINDDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/6*)
+  PATH_SDK_WINDDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/6*)
  endif
  ifeq ($(PATH_SDK_WINDDK),)
@@ -54,5 +54,5 @@
  else
   $(warning kBuild: PATH_SDK_WINDDK couldn't be determined!)
-  PATH_SDK_WINDDK := $(PATH_DEVTOOLS)/win.x86/ddk/not/found
+  PATH_SDK_WINDDK := $(KBUILD_DEVTOOLS)/win.x86/ddk/not/found
  endif
 else
Index: trunk/kBuild/sdks/WINDDK71.kmk
===================================================================
--- trunk/kBuild/sdks/WINDDK71.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINDDK71.kmk	(revision 3418)
@@ -38,10 +38,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINDDK71
- PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/7600.16385.1*)
+ PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/7600.16385.1*)
  ifeq ($(PATH_SDK_WINDDK71),)
-  PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/7600.16385.1*)
+  PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1*)
  endif
  ifeq ($(PATH_SDK_WINDDK71),)
-  PATH_SDK_WINDDK71 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/7600.16385.1*)
+  PATH_SDK_WINDDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/7600.16385.1*)
  endif
  ifeq ($(PATH_SDK_WINDDK71),)
@@ -54,5 +54,5 @@
  else
   $(warning kBuild: PATH_SDK_WINDDK71 couldn't be determined!)
-  PATH_SDK_WINDDK71 := $(PATH_DEVTOOLS)/win.x86/ddk/7600.16385.1-not-found
+  PATH_SDK_WINDDK71 := $(KBUILD_DEVTOOLS)/win.x86/ddk/7600.16385.1-not-found
  endif
 else
Index: trunk/kBuild/sdks/WINDDK80.kmk
===================================================================
--- trunk/kBuild/sdks/WINDDK80.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINDDK80.kmk	(revision 3418)
@@ -38,10 +38,10 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINDDK80
- PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS_TRG)/ddk/v8*)
+ PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/ddk/v8*)
  ifeq ($(PATH_SDK_WINDDK80),)
-  PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS)/win.x86/ddk/v8*)
+  PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/ddk/v8*)
  endif
  ifeq ($(PATH_SDK_WINDDK80),)
-  PATH_SDK_WINDDK80 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/ddk/v8*)
+  PATH_SDK_WINDDK80 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/ddk/v8*)
  endif
  ifneq ($(PATH_SDK_WINDDK80),)
@@ -49,5 +49,5 @@
  else
   $(warning kBuild: PATH_SDK_WINDDK80 couldn't be determined!)
-  PATH_SDK_WINDDK80 := $(PATH_DEVTOOLS)/win.x86/ddk/v8.0/not/found
+  PATH_SDK_WINDDK80 := $(KBUILD_DEVTOOLS)/win.x86/ddk/v8.0/not/found
  endif
 else
Index: trunk/kBuild/sdks/WINPSDK.kmk
===================================================================
--- trunk/kBuild/sdks/WINPSDK.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINPSDK.kmk	(revision 3418)
@@ -36,13 +36,13 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINPSDK
- PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)
+ PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/2*)
  ifeq ($(PATH_SDK_WINPSDK),)
-  PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)
+  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/2*)
  endif
  ifeq ($(PATH_SDK_WINPSDK),)
-  PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
+  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
  endif
  ifeq ($(PATH_SDK_WINPSDK),)
-  PATH_SDK_WINPSDK := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
+  PATH_SDK_WINPSDK := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
  endif
  ifneq ($(PATH_SDK_WINPSDK),)
@@ -50,5 +50,5 @@
  else
   $(warning kBuild: PATH_SDK_WINPSDK couldn't be determined!)
-  PATH_SDK_WINPSDK := $(PATH_DEVTOOLS_BLD)/sdk/not/found
+  PATH_SDK_WINPSDK := $(KBUILD_DEVTOOLS_BLD)/sdk/not/found
  endif
 else
Index: trunk/kBuild/sdks/WINPSDK71.kmk
===================================================================
--- trunk/kBuild/sdks/WINPSDK71.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINPSDK71.kmk	(revision 3418)
@@ -36,13 +36,13 @@
 # SDK Specific Properties
 ifndef PATH_SDK_WINPSDK71
- PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/v7.1*)
+ PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1*)
  ifeq ($(PATH_SDK_WINPSDK71),)
-  PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/v7.1*)
+  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/v7.1*)
  endif
  ifeq ($(PATH_SDK_WINPSDK71),)
-  PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/v7.1*)
+  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1*)
  endif
  ifeq ($(PATH_SDK_WINPSDK71),)
-  PATH_SDK_WINPSDK71 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/v7.1*)
+  PATH_SDK_WINPSDK71 := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/v7.1*)
  endif
  ifneq ($(PATH_SDK_WINPSDK71),)
@@ -50,5 +50,5 @@
  else
   $(warning kBuild: PATH_SDK_WINPSDK71 couldn't be determined!)
-  PATH_SDK_WINPSDK71 := $(PATH_DEVTOOLS_BLD)/sdk/v7.1-not-found
+  PATH_SDK_WINPSDK71 := $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1-not-found
  endif
 else
Index: trunk/kBuild/sdks/WINPSDK71INCS.kmk
===================================================================
--- trunk/kBuild/sdks/WINPSDK71INCS.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINPSDK71INCS.kmk	(revision 3418)
@@ -43,13 +43,13 @@
   PATH_SDK_WINPSDK71INCS := $(PATH_SDK_WINPSDK71)
  else
-  PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/v7.1*)
+  PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1*)
   ifeq ($(PATH_SDK_WINPSDK71INCS),)
-   PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/v7.1*)
+   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/v7.1*)
   endif
   ifeq ($(PATH_SDK_WINPSDK71INCS),)
-   PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/v7.1*)
+   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/v7.1*)
   endif
   ifeq ($(PATH_SDK_WINPSDK71INCS),)
-   PATH_SDK_WINPSDK71INCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/v7.1*)
+   PATH_SDK_WINPSDK71INCS := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/v7.1*)
   endif
   ifneq ($(PATH_SDK_WINPSDK71INCS),)
@@ -57,5 +57,5 @@
   else
    $(warning kBuild: PATH_SDK_WINPSDK71INCS couldn't be determined!)
-   PATH_SDK_WINPSDK71INCS := $(PATH_DEVTOOLS_BLD)/sdk/v7.1-not-found
+   PATH_SDK_WINPSDK71INCS := $(KBUILD_DEVTOOLS_BLD)/sdk/v7.1-not-found
   endif
  endif
Index: trunk/kBuild/sdks/WINPSDKINCS.kmk
===================================================================
--- trunk/kBuild/sdks/WINPSDKINCS.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINPSDKINCS.kmk	(revision 3418)
@@ -43,16 +43,16 @@
   PATH_SDK_WINPSDKINCS := $(PATH_SDK_WINPSDK)
  else
-  PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_BLD)/sdk/2*)
+  PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS_BLD)/sdk/2*)
   ifeq ($(PATH_SDK_WINPSDKINCS),)
-   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS_TRG)/sdk/2*)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS_TRG)/sdk/2*)
   endif
   ifeq ($(PATH_SDK_WINPSDKINCS),)
-   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/win.x86/sdk/2*)
   endif
   ifeq ($(PATH_SDK_WINPSDKINCS),)
-   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/x86.win32/sdk/2*)
   endif
   ifeq ($(PATH_SDK_WINPSDKINCS),)
-   PATH_SDK_WINPSDKINCS := $(wildcard $(PATH_DEVTOOLS)/win.amd64/sdk/2*)
+   PATH_SDK_WINPSDKINCS := $(wildcard $(KBUILD_DEVTOOLS)/win.amd64/sdk/2*)
   endif
   ifneq ($(PATH_SDK_WINPSDKINCS),)
@@ -60,5 +60,5 @@
   else
    $(warning kBuild: PATH_SDK_WINPSDKINCS couldn't be determined!)
-   PATH_SDK_WINPSDKINCS := $(PATH_DEVTOOLS_BLD)/sdk/not/found
+   PATH_SDK_WINPSDKINCS := $(KBUILD_DEVTOOLS_BLD)/sdk/not/found
   endif
  endif
Index: trunk/kBuild/sdks/WINSDK10.kmk
===================================================================
--- trunk/kBuild/sdks/WINSDK10.kmk	(revision 3417)
+++ trunk/kBuild/sdks/WINSDK10.kmk	(revision 3418)
@@ -49,5 +49,5 @@
  ifndef SDK_WINSDK10_VERSION
   PATH_SDK_WINSDK10 := $(firstfile $(foreachfile toolsdir, \
-  	$(PATH_DEVTOOLS_BLD) $(PATH_DEVTOOLS_TRG) $(PATH_DEVTOOLS)/win.x86 $(PATH_DEVTOOLS)/win.amd64 \
+  	$(KBUILD_DEVTOOLS_BLD) $(KBUILD_DEVTOOLS_TRG) $(KBUILD_DEVTOOLS)/win.x86 $(KBUILD_DEVTOOLS)/win.amd64 \
        , $(rsortfiles $(qwildcard ,$(toolsdir)/sdk/v10*/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]/10.0.*))))
   ifeq ($(PATH_SDK_WINSDK10),)
@@ -56,5 +56,5 @@
    ifeq ($(PATH_SDK_WINSDK10),)
     $(warning kBuild: PATH_SDK_WINSDK10 couldn't be determined!)
-    PATH_SDK_WINSDK10 := $(PATH_DEVTOOLS_BLD)/sdk/v10-not-found/Include/10.0.10240.0
+    PATH_SDK_WINSDK10 := $(KBUILD_DEVTOOLS_BLD)/sdk/v10-not-found/Include/10.0.10240.0
    endif
   endif
@@ -62,5 +62,5 @@
  else
   PATH_SDK_WINSDK10 := $(firstfile $(foreachfile toolsdir, \
-  	$(PATH_DEVTOOLS_BLD) $(PATH_DEVTOOLS_TRG) $(PATH_DEVTOOLS)/win.x86 $(PATH_DEVTOOLS)/win.amd64 \
+  	$(KBUILD_DEVTOOLS_BLD) $(KBUILD_DEVTOOLS_TRG) $(KBUILD_DEVTOOLS)/win.x86 $(KBUILD_DEVTOOLS)/win.amd64 \
        , $(rsortfiles $(qwildcard ,$(toolsdir)/sdk/v10*/[Ii][Nn][Cc][Ll][Uu][Dd][Ee]/$(SDK_WINSDK10_VERSION)))))
   ifeq ($(PATH_SDK_WINSDK10),)
@@ -69,5 +69,5 @@
    ifeq ($(PATH_SDK_WINSDK10),)
     $(warning kBuild: PATH_SDK_WINSDK10 couldn't be determined!)
-    PATH_SDK_WINSDK10 := $(PATH_DEVTOOLS_BLD)/sdk/v10-not-found/Include/$(SDK_WINSDK10_VERSION)
+    PATH_SDK_WINSDK10 := $(KBUILD_DEVTOOLS_BLD)/sdk/v10-not-found/Include/$(SDK_WINSDK10_VERSION)
    endif
   endif
Index: trunk/kBuild/units/qt3.kmk
===================================================================
--- trunk/kBuild/units/qt3.kmk	(revision 3417)
+++ trunk/kBuild/units/qt3.kmk	(revision 3418)
@@ -65,5 +65,5 @@
 #       PATH_SDK_QT3_LIB.x86   - the Qt3 library directory for X86.
 ifndef PATH_SDK_QT3
- PATH_SDK_QT3 := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_TRG)/qt/v3*)))
+ PATH_SDK_QT3 := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v3*)))
  ifeq ($(PATH_SDK_QT3),)
   # If target == host, try look for Qt in the various platform specific places.
@@ -190,5 +190,5 @@
   ifeq ($(PATH_SDK_QT3),)
    $(warning kBuild: Couldn't find the Qt3 headers and libaries...)
-   PATH_SDK_QT3 := $(PATH_DEVTOOLS_TRG)/qt/not-found
+   PATH_SDK_QT3 := $(KBUILD_DEVTOOLS_TRG)/qt/not-found
   endif
  endif
@@ -219,5 +219,5 @@
 #       PATH_TOOL_QT3_BIN - the directory containing moc, uic, lrelease, lupdate and qm2ts.
 ifndef PATH_TOOL_QT3_BIN
- PATH_TOOL_QT3_BIN := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS_BLD)/qt/v3*/bin)))
+ PATH_TOOL_QT3_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_BLD)/qt/v3*/bin)))
  ifeq ($(PATH_TOOL_QT3_BIN),)
   if1of ($(KBUILD_HOST), win os2)
