diff --git a/reactos/win32ss/gdi/gdi32/include/gdi32p.h b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
index 63715679111..590872a323f 100644
--- a/reactos/win32ss/gdi/gdi32/include/gdi32p.h
+++ b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
@@ -6,6 +6,7 @@
  * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
+#pragma once
 
 /* DATA **********************************************************************/
 
diff --git a/reactos/win32ss/gdi/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h
index d7afb96bda0..d3baf53a236 100644
--- a/reactos/win32ss/gdi/gdi32/include/precomp.h
+++ b/reactos/win32ss/gdi/gdi32/include/precomp.h
@@ -14,7 +14,7 @@
 #define COM_NO_WINDOWS_H
 #define NTOS_MODE_USER
 
-#include <stdio.h>
+#include <stdarg.h>
 
 /* SDK/DDK/NDK Headers. */
 #include <windef.h>
@@ -25,18 +25,12 @@
 #include <wingdi.h>
 #define _ENGINE_EXPORT_
 #include <winddi.h>
-#include <d3dnthal.h>
 #include <prntfont.h>
 #include <winddiui.h>
 #include <winspool.h>
 
-#include <pseh/pseh2.h>
-
-#include <ddraw.h>
 #include <ddrawi.h>
-#include <ddrawint.h>
 #include <ddrawgdi.h>
-#include <d3dhal.h>
 
 /* Public Win32K Headers */
 #include <ntgdityp.h>
diff --git a/reactos/win32ss/gdi/gdi32/misc/gdientry.c b/reactos/win32ss/gdi/gdi32/misc/gdientry.c
index 5ee3363add9..ac6545a28eb 100644
--- a/reactos/win32ss/gdi/gdi32/misc/gdientry.c
+++ b/reactos/win32ss/gdi/gdi32/misc/gdientry.c
@@ -11,6 +11,9 @@
 
 #include <precomp.h>
 
+#include <stdio.h>
+#include <d3dhal.h>
+
 /* DATA **********************************************************************/
 
 HANDLE ghDirectDraw;