diff --git a/reactos/lib/d3d8thk/d3d8thk.def b/reactos/lib/d3d8thk/d3d8thk.def
index 48945470a59..3aa6432c3f7 100644
--- a/reactos/lib/d3d8thk/d3d8thk.def
+++ b/reactos/lib/d3d8thk/d3d8thk.def
@@ -1,58 +1,58 @@
 LIBRARY d3d8thk
 EXPORTS
-	OsThunkD3dContextCreate@16 = NtGdiD3dContextCreate@16
-	OsThunkD3dContextDestroy@4 = NtGdiD3dContextDestroy@4
-	OsThunkD3dContextDestroyAll@0 = NtGdiD3dContextDestroyAll@0
-	OsThunkD3dDrawPrimitives2@28 = NtGdiD3dDrawPrimitives2@28
-	OsThunkD3dValidateTextureStageState@4 = NtGdiD3dValidateTextureStageState@4
-	OsThunkDdAddAttachedSurface@12 = NtGdiDdAddAttachedSurface@12
-	OsThunkDdAlphaBlt@12 = NtGdiDdAlphaBlt@12
-	OsThunkDdAttachSurface@8 = NtGdiDdAttachSurface@8
-	OsThunkDdBeginMoCompFrame@8 = NtGdiDdBeginMoCompFrame@8
-	OsThunkDdBlt@12 = NtGdiDdBlt@12
-	OsThunkDdCanCreateD3DBuffer@8 = NtGdiDdCanCreateD3DBuffer@8
-	OsThunkDdCanCreateSurface@8 = NtGdiDdCanCreateSurface@8
-	OsThunkDdColorControl@8 = NtGdiDdColorControl@8
-	OsThunkDdCreateD3DBuffer@32 = NtGdiDdCreateD3DBuffer@32
-	OsThunkDdCreateDirectDrawObject@4 = NtGdiDdCreateDirectDrawObject@4
-	OsThunkDdCreateMoComp@8 = NtGdiDdCreateMoComp@8
-	OsThunkDdCreateSurface@32 = NtGdiDdCreateSurface@32
-	OsThunkDdCreateSurfaceEx@12 = NtGdiDdCreateSurfaceEx@12
-	OsThunkDdCreateSurfaceObject@24 = NtGdiDdCreateSurfaceObject@24
-	OsThunkDdDeleteDirectDrawObject@4 = NtGdiDdDeleteDirectDrawObject@4
-	OsThunkDdDeleteSurfaceObject@4 = NtGdiDdDeleteSurfaceObject@4
-	OsThunkDdDestroyD3DBuffer@4 = NtGdiDdDestroyD3DBuffer@4
-	OsThunkDdDestroyMoComp@8 = NtGdiDdDestroyMoComp@8
-	OsThunkDdDestroySurface@8 = NtGdiDdDestroySurface@8
-	OsThunkDdEndMoCompFrame@8 = NtGdiDdEndMoCompFrame@8
-	OsThunkDdFlip@20 = NtGdiDdFlip@20
-	OsThunkDdFlipToGDISurface@8 = NtGdiDdFlipToGDISurface@8
-	OsThunkDdGetAvailDriverMemory@8 = NtGdiDdGetAvailDriverMemory@8
-	OsThunkDdGetBltStatus@8 = NtGdiDdGetBltStatus@8
-	OsThunkDdGetDC@8 = NtGdiDdGetDC@8
-	OsThunkDdGetDriverInfo@8 = NtGdiDdGetDriverInfo@8
-	OsThunkDdGetDriverState@4 = NtGdiDdGetDriverState@4
-	OsThunkDdGetDxHandle@12 = NtGdiDdGetDxHandle@12
-	OsThunkDdGetFlipStatus@8 = NtGdiDdGetFlipStatus@8
-	OsThunkDdGetInternalMoCompInfo@8 = NtGdiDdGetInternalMoCompInfo@8
-	OsThunkDdGetMoCompBuffInfo@8 = NtGdiDdGetMoCompBuffInfo@8
-	OsThunkDdGetMoCompFormats@8 = NtGdiDdGetMoCompFormats@8
-	OsThunkDdGetMoCompGuids@8 = NtGdiDdGetMoCompGuids@8
-	OsThunkDdGetScanLine@8 = NtGdiDdGetScanLine@8
-	OsThunkDdLock@12 = NtGdiDdLock@12
-	OsThunkDdLockD3D@8 = NtGdiDdLockD3D@8
-	OsThunkDdQueryDirectDrawObject@44 = NtGdiDdQueryDirectDrawObject@44
-	OsThunkDdQueryMoCompStatus@8 = NtGdiDdQueryMoCompStatus@8
-	OsThunkDdReenableDirectDrawObject@8 = NtGdiDdReenableDirectDrawObject@8
-	OsThunkDdReleaseDC@4 = NtGdiDdReleaseDC@4
-	OsThunkDdRenderMoComp@8 = NtGdiDdRenderMoComp@8
-	OsThunkDdResetVisrgn@8 = NtGdiDdResetVisrgn@8
-	OsThunkDdSetColorKey@8 = NtGdiDdSetColorKey@8
-	OsThunkDdSetExclusiveMode@8 = NtGdiDdSetExclusiveMode@8
-	OsThunkDdSetGammaRamp@12 = NtGdiDdSetGammaRamp@12
-	OsThunkDdSetOverlayPosition@12 = NtGdiDdSetOverlayPosition@12
-	OsThunkDdUnattachSurface@8 = NtGdiDdUnattachSurface@8
-	OsThunkDdUnlock@8 = NtGdiDdUnlock@8
-	OsThunkDdUnlockD3D@8 = NtGdiDdUnlockD3D@8
-	OsThunkDdUpdateOverlay@12 = NtGdiDdUpdateOverlay@12
-	OsThunkDdWaitForVerticalBlank@8 = NtGdiDdWaitForVerticalBlank@8
+	OsThunkD3dContextCreate@16 = DdEntry1@16
+	OsThunkD3dContextDestroy@4 = DdEntry2@4
+	OsThunkD3dContextDestroyAll@0 = DdEntry3@0
+	OsThunkD3dDrawPrimitives2@28 = DdEntry5@28
+	OsThunkD3dValidateTextureStageState@4 = DdEntry4@4
+	OsThunkDdAddAttachedSurface@12 = DdEntry7@12
+	OsThunkDdAlphaBlt@12 = DdEntry8@12
+	OsThunkDdAttachSurface@8 = DdEntry9@8
+	OsThunkDdBeginMoCompFrame@8 = DdEntry10@8
+	OsThunkDdBlt@12 = DdEntry11@12
+	OsThunkDdCanCreateD3DBuffer@8 = DdEntry13@8
+	OsThunkDdCanCreateSurface@8 = DdEntry12@8
+	OsThunkDdColorControl@8 = DdEntry14@8
+	OsThunkDdCreateD3DBuffer@32 = DdEntry17@32
+	OsThunkDdCreateDirectDrawObject@4 = DdEntry15@4
+	OsThunkDdCreateMoComp@8 = DdEntry18@8
+	OsThunkDdCreateSurface@32 = DdEntry16@32
+	OsThunkDdCreateSurfaceEx@12 = DdEntry50@12
+	OsThunkDdCreateSurfaceObject@24 = DdEntry19@24
+	OsThunkDdDeleteDirectDrawObject@4 = DdEntry20@4
+	OsThunkDdDeleteSurfaceObject@4 = DdEntry21@4
+	OsThunkDdDestroyD3DBuffer@4 = DdEntry24@4
+	OsThunkDdDestroyMoComp@8 = DdEntry22@8
+	OsThunkDdDestroySurface@8 = DdEntry23@8
+	OsThunkDdEndMoCompFrame@8 = DdEntry25@8
+	OsThunkDdFlip@20 = DdEntry26@20
+	OsThunkDdFlipToGDISurface@8 = DdEntry27@8
+	OsThunkDdGetAvailDriverMemory@8 = DdEntry28@8
+	OsThunkDdGetBltStatus@8 = DdEntry29@8
+	OsThunkDdGetDC@8 = DdEntry30@8
+	OsThunkDdGetDriverInfo@8 = DdEntry31@8
+	OsThunkDdGetDriverState@4 = DdEntry6@4
+	OsThunkDdGetDxHandle@12 = DdEntry32@12
+	OsThunkDdGetFlipStatus@8 = DdEntry33@8
+	OsThunkDdGetInternalMoCompInfo@8 = DdEntry34@8
+	OsThunkDdGetMoCompBuffInfo@8 = DdEntry35@8
+	OsThunkDdGetMoCompFormats@8 = DdEntry37@8
+	OsThunkDdGetMoCompGuids@8 = DdEntry36@8
+	OsThunkDdGetScanLine@8 = DdEntry38@8
+	OsThunkDdLock@12 = DdEntry39@12
+	OsThunkDdLockD3D@8 = DdEntry40@8
+	OsThunkDdQueryDirectDrawObject@44 = DdEntry41@44
+	OsThunkDdQueryMoCompStatus@8 = DdEntry42@8
+	OsThunkDdReenableDirectDrawObject@8 = DdEntry43@8
+	OsThunkDdReleaseDC@4 = DdEntry44@4
+	OsThunkDdRenderMoComp@8 = DdEntry45@8
+	OsThunkDdResetVisrgn@8 = DdEntry46@8
+	OsThunkDdSetColorKey@8 = DdEntry47@8
+	OsThunkDdSetExclusiveMode@8 = DdEntry48@8
+	OsThunkDdSetGammaRamp@12 = DdEntry49@12
+	OsThunkDdSetOverlayPosition@12 = DdEntry51@12
+	OsThunkDdUnattachSurface@8 = DdEntry52@8
+	OsThunkDdUnlock@8 = DdEntry53@8
+	OsThunkDdUnlockD3D@8 = DdEntry54@8
+	OsThunkDdUpdateOverlay@12 = DdEntry55@12
+	OsThunkDdWaitForVerticalBlank@8 = DdEntry56@8
diff --git a/reactos/lib/d3d8thk/d3d8thk.xml b/reactos/lib/d3d8thk/d3d8thk.xml
index e2e9466d7ff..594bb29a9c4 100644
--- a/reactos/lib/d3d8thk/d3d8thk.xml
+++ b/reactos/lib/d3d8thk/d3d8thk.xml
@@ -1,5 +1,5 @@
 <module name="d3d8thk" type="win32dll" installbase="system32" installname="d3d8thk.dll">
 	<importlibrary definition="d3d8thk.def" />
+	<library>gdi32</library> 
 	<file>d3d8thk.rc</file>
-	<file>win32k.S</file>
 </module>
diff --git a/reactos/lib/d3d8thk/win32k.S b/reactos/lib/d3d8thk/win32k.S
deleted file mode 100644
index 3d91e68c619..00000000000
--- a/reactos/lib/d3d8thk/win32k.S
+++ /dev/null
@@ -1 +0,0 @@
-#include "../gdi32/misc/win32k.S"