diff --git a/reactos/dll/directx/ddraw/startup.c b/reactos/dll/directx/ddraw/startup.c
index 327e1083275..ef660ef1ef1 100644
--- a/reactos/dll/directx/ddraw/startup.c
+++ b/reactos/dll/directx/ddraw/startup.c
@@ -9,7 +9,6 @@
  */
 
 #include "rosdraw.h"
-#include "ddrawgdi.h"
 
 DDRAWI_DIRECTDRAW_GBL ddgbl;
 DDRAWI_DDRAWSURFACE_GBL ddSurfGbl;
diff --git a/reactos/dll/win32/gdi32/misc/gdientry.c b/reactos/dll/win32/gdi32/misc/gdientry.c
index 227b73f2eb2..84e7c191c67 100644
--- a/reactos/dll/win32/gdi32/misc/gdientry.c
+++ b/reactos/dll/win32/gdi32/misc/gdientry.c
@@ -15,6 +15,7 @@
 #include <ddrawint.h>
 #include <ddrawgdi.h>
 #include <ntgdi.h>
+#include <d3dhal.h>
 
 /* DATA **********************************************************************/
 
diff --git a/reactos/dll/win32/gdi32/misc/historic.c b/reactos/dll/win32/gdi32/misc/historic.c
index 287169c956d..380c6da9cab 100644
--- a/reactos/dll/win32/gdi32/misc/historic.c
+++ b/reactos/dll/win32/gdi32/misc/historic.c
@@ -14,6 +14,7 @@
 #include <ddrawint.h>
 #include <ddrawgdi.h>
 #include <ntgdi.h>
+#include <d3dhal.h>
 
 /*
  * @implemented
diff --git a/reactos/include/ddk/d3dhal.h b/reactos/include/ddk/d3dhal.h
index 67a5e1781b9..325e18669ce 100644
--- a/reactos/include/ddk/d3dhal.h
+++ b/reactos/include/ddk/d3dhal.h
@@ -59,7 +59,12 @@ typedef struct _D3DHAL_GLOBALDRIVERDATA {
   DWORD			dwNumClipVertices;
   DWORD			dwNumTextureFormats;
   LPDDSURFACEDESC	lpTextureFormats;
-} D3DHAL_GLOBALDRIVERDATA,*LPD3DHAL_GLOBALDRIVERDATA;
+} D3DHAL_GLOBALDRIVERDATA;
+
+#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED
+typedef D3DHAL_GLOBALDRIVERDATA *LPD3DHAL_GLOBALDRIVERDATA;
+#define D3DHAL_GLOBALDRIVERDATA_DEFINED
+#endif
 
 typedef struct _D3DHAL_D3DEXTENDEDCAPS {
   DWORD			dwSize;
@@ -159,7 +164,12 @@ typedef struct _D3DHAL_CALLBACKS {
   DWORD				dwReserved7;
   DWORD				dwReserved8;
   DWORD				dwReserved9;
-} D3DHAL_CALLBACKS,*LPD3DHAL_CALLBACKS;
+} D3DHAL_CALLBACKS;
+
+#ifndef D3DHAL_CALLBACKS_DEFINED
+typedef D3DHAL_CALLBACKS *LPD3DHAL_CALLBACKS;
+#define D3DHAL_CALLBACKS_DEFINED
+#endif
 
 typedef struct _D3DHAL_SETRENDERTARGETDATA		*LPD3DHAL_SETRENDERTARGETDATA;
 typedef struct _D3DHAL_CLEARDATA			*LPD3DHAL_CLEARDATA;
diff --git a/reactos/include/psdk/ddrawgdi.h b/reactos/include/psdk/ddrawgdi.h
index 10ecdec8c3a..79b1f0b1383 100644
--- a/reactos/include/psdk/ddrawgdi.h
+++ b/reactos/include/psdk/ddrawgdi.h
@@ -19,7 +19,6 @@
 
 #ifndef _DDRAWGDI_
 #define _DDRAWGDI_
-#include <d3dhal.h>
 
 /* Define the real export names */
 #define DdCreateDirectDrawObject            GdiEntry1
@@ -39,6 +38,15 @@
 #define DdSetGammaRamp                      GdiEntry15
 #define DdSwapTextureHandles                GdiEntry16
 
+#ifndef D3DHAL_CALLBACKS_DEFINED
+typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS;
+#define D3DHAL_CALLBACKS_DEFINED
+#endif
+
+#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED
+typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA;
+#define D3DHAL_GLOBALDRIVERDATA_DEFINED
+#endif
 
 BOOL
 STDCALL