Index: /trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk
===================================================================
--- /trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk	(revision 42310)
+++ /trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk	(revision 42311)
@@ -45,5 +45,5 @@
  VBoxOGLcrutil_DEBUG_INSTTYPE.win = both
 endif
-VBoxOGLcrutil_SDKS.win      = DXSDK
+VBoxOGLcrutil_SDKS.win      = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
 if1of ($(KBUILD_TARGET), linux solaris freebsd)
@@ -83,6 +83,6 @@
 	util/util.rc
 VBoxOGLcrutil_LIBS.win = \
-	$(PATH_SDK_DXSDK_LIB)/ddraw.lib \
-	$(PATH_SDK_DXSDK_LIB)/dxguid.lib
+	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
+	$(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
 VBoxOGLcrutil_LIBS = \
 	$(VBOX_LIB_IPRT_GUEST_R3_SHARED) \
@@ -115,6 +115,6 @@
 	$(VBOX_LIB_VBGL_R3_SHARED_X86)
 VBoxOGLcrutil-x86_LIBS.win = \
-	$(PATH_SDK_DXSDK_LIB.x86)/ddraw.lib \
-	$(PATH_SDK_DXSDK_LIB.x86)/dxguid.lib
+	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/ddraw.lib \
+	$(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/dxguid.lib
 ifdef VBOX_WITH_CRHGSMI
 # VBOX_WITH_CRHGSMI define is inherited from VBoxOGLcrutil
@@ -142,11 +142,7 @@
 VBoxOGLhostcrutil_LDFLAGS.darwin = $(VBoxOGLcrutil_LDFLAGS.darwin) \
 	-install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLhostcrutil.dylib
-## @todo kBuild bug, possibly same as ticket #51: PATH_SDK_DXSDK_LIB is expanded too early.
-# Update. bug 51 was fixed.
-# Still fails as PATH_SDK_DXSDK_LIB is empty.
-## @todo kBuild: recheck this (note to self).
 VBoxOGLhostcrutil_LIBS.win =  \
-    $(PATH_SDK_DXSDK_LIB)/ddraw.lib \
-    $(PATH_SDK_DXSDK_LIB)/dxguid.lib
+    $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ddraw.lib \
+    $(PATH_SDK_$(VBOX_WINDDK)_LIB)/dxguid.lib
 VBoxOGLhostcrutil_LIBS     = $(LIB_RUNTIME)
 ifdef VBOX_WITH_CRHGSMI