diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/lib/gdi32/gdi32.def
index 0b50416c599..a99a73b713c 100644
--- a/reactos/lib/gdi32/gdi32.def
+++ b/reactos/lib/gdi32/gdi32.def
@@ -273,22 +273,22 @@ GdiDllInitialize@12
 GdiDrawStream@12
 GdiEndDocEMF@4
 GdiEndPageEMF@8
-GdiEntry1@8=DdCreateDirectDrawObject@8
-GdiEntry2@44=DdQueryDirectDrawObject@44
-GdiEntry3@4=DdDeleteDirectDrawObject@4
-GdiEntry4@8=DdCreateSurfaceObject@8
-GdiEntry5@4=DdDeleteSurfaceObject@4
-GdiEntry6@8=DdResetVisrgn@8
-GdiEntry7@8=DdGetDC@8
-GdiEntry8@4=DdReleaseDC@4
-GdiEntry9@24=DdCreateDIBSection@24
-GdiEntry10@8=DdReenableDirectDrawObject@8
-GdiEntry11@8=DdAttachSurface@8
-GdiEntry12@8=DdUnattachSurface@8
-GdiEntry13@0=DdQueryDisplaySettingsUniqueness@0
-GdiEntry14@12=DdGetDxHandle@12
-GdiEntry15@12=DdSetGammaRamp@12
-GdiEntry16@12=DdSwapTextureHandles@12
+GdiEntry1@8
+GdiEntry2@44
+GdiEntry3@4
+GdiEntry4@8
+GdiEntry5@4
+GdiEntry6@8
+GdiEntry7@8
+GdiEntry8@4
+GdiEntry9@24
+GdiEntry10@8
+GdiEntry11@8
+GdiEntry12@8
+GdiEntry13@0
+GdiEntry14@12
+GdiEntry15@12
+GdiEntry16@12
 GdiFixUpHandle@4
 GdiFlush@0
 GdiFullscreenControl@20
diff --git a/reactos/w32api/include/ddrawgdi.h b/reactos/w32api/include/ddrawgdi.h
index a591972f5a9..a6c46514a98 100644
--- a/reactos/w32api/include/ddrawgdi.h
+++ b/reactos/w32api/include/ddrawgdi.h
@@ -16,9 +16,10 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+
+#include <ddk/d3dhal.h>
  
 /* Define the real export names */
-#if 0 /* FIXME */
 #define DdCreateDirectDrawObject            GdiEntry1
 #define DdQueryDirectDrawObject             GdiEntry2
 #define DdDeleteDirectDrawObject            GdiEntry3
@@ -35,10 +36,7 @@
 #define DdGetDxHandle                       GdiEntry14
 #define DdSetGammaRamp                      GdiEntry15
 #define DdSwapTextureHandles                GdiEntry16
-#endif 
 
-typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS;
-typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA;
 
 BOOL 
 STDCALL