diff --git a/reactos/dll/win32/gdi32/include/precomp.h b/reactos/dll/win32/gdi32/include/precomp.h
index d825612c082..9f1b62770f0 100644
--- a/reactos/dll/win32/gdi32/include/precomp.h
+++ b/reactos/dll/win32/gdi32/include/precomp.h
@@ -12,9 +12,11 @@
 #define WIN32_NO_STATUS
 #define NTOS_MODE_USER
 
+#include <stdio.h>
+
 /* SDK/DDK/NDK Headers. */
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 #include <wingdi.h>
 #include <winddi.h>
 #include <d3dnthal.h>
@@ -24,6 +26,12 @@
 
 #include <pseh/pseh2.h>
 
+#include <ddraw.h>
+#include <ddrawi.h>
+#include <ddrawint.h>
+#include <ddrawgdi.h>
+#include <d3dhal.h>
+
 /* Public Win32K Headers */
 #include <win32k/ntgdityp.h>
 #include <ntgdi.h>
diff --git a/reactos/dll/win32/gdi32/misc/gdientry.c b/reactos/dll/win32/gdi32/misc/gdientry.c
index 6e51ea19d17..6203fa03461 100644
--- a/reactos/dll/win32/gdi32/misc/gdientry.c
+++ b/reactos/dll/win32/gdi32/misc/gdientry.c
@@ -10,12 +10,6 @@
 /* INCLUDES ******************************************************************/
 
 #include "precomp.h"
-#include <ddraw.h>
-#include <ddrawi.h>
-#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 4b5db776cfd..27bd7931a90 100644
--- a/reactos/dll/win32/gdi32/misc/historic.c
+++ b/reactos/dll/win32/gdi32/misc/historic.c
@@ -9,12 +9,6 @@
  */
 
 #include "precomp.h"
-#include <ddraw.h>
-#include <ddrawi.h>
-#include <ddrawint.h>
-#include <ddrawgdi.h>
-#include <ntgdi.h>
-#include <d3dhal.h>
 
 /*
  * @implemented