diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index 5a0e59ec1e7..59a10f161d0 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -97,22 +97,57 @@ DdEntry13@8=NtGdiDdCanCreateD3DBuffer@8
 DdEntry14@8=NtGdiDdColorControl@8
 DdEntry15@4=NtGdiDdCreateDirectDrawObject@4
 DdEntry16@32=NtGdiDdCreateSurface@32
-DdEntry17=NtGdiDdCreateD3DBuffer@32
-DdEntry18=NtGdiDdCreateMoComp@8
-DdEntry19=NtGdiDdCreateSurfaceObject@24
-DdEntry1=NtGdiD3dContextCreate@16
-DdEntry20=NtGdiDdDeleteDirectDrawObject@4
-DdEntry21=NtGdiDdDeleteSurfaceObject@4
-DdEntry22=NtGdiDdDestroyMoComp@8
-DdEntry23=NtGdiDdDestroySurface@8
-DdEntry24=NtGdiDdDestroyD3DBuffer@4
-DdEntry25=NtGdiDdEndMoCompFrame@8
-DdEntry26=NtGdiDdFlip@20
-DdEntry27=NtGdiDdFlipToGDISurface@8
-DdEntry28=NtGdiDdGetAvailDriverMemory@8
-DdEntry29=NtGdiDdGetBltStatus@8
-DdEntry2=NtGdiD3dContextDestroy@4
-DdEntry30=NtGdiDdGetDC@8
+DdEntry17@32=NtGdiDdCreateD3DBuffer@32
+DdEntry18@8=NtGdiDdCreateMoComp@8
+DdEntry19@24=NtGdiDdCreateSurfaceObject@24
+DdEntry1@16=NtGdiD3dContextCreate@16
+DdEntry20@4=NtGdiDdDeleteDirectDrawObject@4
+DdEntry21@4=NtGdiDdDeleteSurfaceObject@4
+DdEntry22@8=NtGdiDdDestroyMoComp@8
+DdEntry23@8=NtGdiDdDestroySurface@8
+DdEntry24@4=NtGdiDdDestroyD3DBuffer@4
+DdEntry25@8=NtGdiDdEndMoCompFrame@8
+DdEntry26@20=NtGdiDdFlip@20
+DdEntry27@8=NtGdiDdFlipToGDISurface@8
+DdEntry28@8=NtGdiDdGetAvailDriverMemory@8
+DdEntry29@8=NtGdiDdGetBltStatus@8
+DdEntry2@4=NtGdiD3dContextDestroy@4
+DdEntry30@8=NtGdiDdGetDC@8
+DdEntry31@8=NtGdiDdGetDriverInfo@8
+DdEntry32@12=NtGdiDdGetDxHandle@12
+DdEntry33@8=NtGdiDdGetFlipStatus@8
+DdEntry34@8=NtGdiDdGetInternalMoCompInfo@8
+DdEntry35@8=NtGdiDdGetMoCompBuffInfo@8
+DdEntry36@8=NtGdiDdGetMoCompGuids@8
+DdEntry37@8=NtGdiDdGetMoCompFormats@8
+DdEntry38@8=NtGdiDdGetScanLine@8
+DdEntry39@12=NtGdiDdLock@12
+DdEntry3l@4=NtGdiD3dContextDestroyAll@4
+DdEntry40@8=NtGdiDdLockD3D@8
+DdEntry41@44=NtGdiDdQueryDirectDrawObject@44
+DdEntry42@8=NtGdiDdQueryMoCompStatus@8
+DdEntry43@8=NtGdiDdReenableDirectDrawObject@8
+DdEntry44@4=NtGdiDdReleaseDC@4
+DdEntry45@8=NtGdiDdRenderMoComp@8
+DdEntry46@8=NtGdiDdResetVisrgn@8
+DdEntry47@8=NtGdiDdSetColorKey@8
+DdEntry48@8=NtGdiDdSetExclusiveMode@8
+DdEntry49@12=NtGdiDdSetGammaRamp@12
+DdEntry4@4=NtGdiD3dValidateTextureStageState@4
+DdEntry50@12=NtGdiDdCreateSurfaceEx@12
+DdEntry51@12=NtGdiDdSetOverlayPosition@12
+DdEntry52@8=NtGdiDdUnattachSurface@8
+DdEntry53@8=NtGdiDdUnlock@8
+DdEntry54@8=NtGdiDdUnlockD3D@8
+DdEntry55@12=NtGdiDdUpdateOverlay@12
+DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
+DdEntry5@28=NtGdiD3dDrawPrimitives2@28
+DdEntry6@4=NtGdiDdGetDriverState@4
+DdEntry7@12=NtGdiDdAddAttachedSurface@12
+DdEntry8@12=NtGdiDdAlphaBlt@12
+DdEntry9@8=NtGdiDdAttachSurface@8
+
+
 
 DeleteColorSpace@4=NtGdiDeleteColorSpace@4
 DeleteDC@4
@@ -574,41 +609,6 @@ XFORMOBJ_iGetXform@8=NtGdiXFORMOBJ_iGetXform@8
 XLATEOBJ_cGetPalette@16=NtGdiXLATEOBJ_cGetPalette@16
 XLATEOBJ_hGetColorTransform@4=NtGdiXLATEOBJ_hGetColorTransform@4
 
-
-
-DdEntry3@4=NtGdiD3dContextDestroyAll@4
-DdEntry4@4=NtGdiD3dValidateTextureStageState@4
-DdEntry5@28=NtGdiD3dDrawPrimitives2@28
-DdEntry6@4=NtGdiDdGetDriverState@4
-DdEntry7@12=NtGdiDdAddAttachedSurface@12
-DdEntry8@12=NtGdiDdAlphaBlt@12
-DdEntry9@8=NtGdiDdAttachSurface@8
-DdEntry31@8=NtGdiDdGetDriverInfo@8
-DdEntry32@12=NtGdiDdGetDxHandle@12
-DdEntry33@8=NtGdiDdGetFlipStatus@8
-DdEntry34@8=NtGdiDdGetInternalMoCompInfo@8
-DdEntry35@8=NtGdiDdGetMoCompBuffInfo@8
-DdEntry36@8=NtGdiDdGetMoCompGuids@8
-DdEntry37@8=NtGdiDdGetMoCompFormats@8
-DdEntry38@8=NtGdiDdGetScanLine@8
-DdEntry39@12=NtGdiDdLock@12
-DdEntry40@8=NtGdiDdLockD3D@8
-DdEntry41@44=NtGdiDdQueryDirectDrawObject@44
-DdEntry42@8=NtGdiDdQueryMoCompStatus@8
-DdEntry43@8=NtGdiDdReenableDirectDrawObject@8
-DdEntry44@4=NtGdiDdReleaseDC@4
-DdEntry45@8=NtGdiDdRenderMoComp@8
-DdEntry46@8=NtGdiDdResetVisrgn@8
-DdEntry47@8=NtGdiDdSetColorKey@8
-DdEntry48@8=NtGdiDdSetExclusiveMode@8
-DdEntry49@12=NtGdiDdSetGammaRamp@12
-DdEntry50@12=NtGdiDdCreateSurfaceEx@12
-DdEntry51@12=NtGdiDdSetOverlayPosition@12
-DdEntry52@8=NtGdiDdUnattachSurface@8 
-DdEntry53@8=NtGdiDdUnlock@8
-DdEntry54@8=NtGdiDdUnlockD3D@8
-DdEntry55@12=NtGdiDdUpdateOverlay@12
-DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
 GdiDrawStream@12
 GetBitmapAttributes@4
 GetBrushAttributes@4