diff --git a/reactos/subsystems/win32/win32k/include/input.h b/reactos/subsystems/win32/win32k/include/input.h
index bb489045a76..fb9c04dbce1 100644
--- a/reactos/subsystems/win32/win32k/include/input.h
+++ b/reactos/subsystems/win32/win32k/include/input.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ndk/kbd.h>
+
 typedef struct _KBL
 {
   LIST_ENTRY List;
diff --git a/reactos/subsystems/win32/win32k/include/intddraw.h b/reactos/subsystems/win32/win32k/include/intddraw.h
index 05809ccd074..934900353c8 100644
--- a/reactos/subsystems/win32/win32k/include/intddraw.h
+++ b/reactos/subsystems/win32/win32k/include/intddraw.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#include <ddrawint.h>
+#include <ddkernel.h>
+#include <reactos/drivers/directx/directxint.h>
+#include <reactos/drivers/directx/dxg.h>
+#include <reactos/drivers/directx/dxeng.h>
+
 /* From ddraw.c */
 BOOL intEnableReactXDriver(HDC);
 NTSTATUS APIENTRY DxDdStartupDxGraphics(ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/subsystems/win32/win32k/pch.h
index f09730534fc..b152d719be9 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/subsystems/win32/win32k/pch.h
@@ -21,7 +21,6 @@
 #include <ntifs.h>
 #include <tvout.h>
 #include <ndk/exfuncs.h>
-#include <ndk/kbd.h>
 #include <ndk/kdfuncs.h>
 #include <ndk/kefuncs.h>
 #include <ndk/lpcfuncs.h>
@@ -83,13 +82,6 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 /* Undocumented user definitions */
 #include <undocuser.h>
 
-/* DirectX headers */
-#include <ddrawint.h>
-#include <ddkernel.h>
-#include <reactos/drivers/directx/directxint.h>
-#include <reactos/drivers/directx/dxg.h>
-#include <reactos/drivers/directx/dxeng.h>
-
 /* Freetype headers*/
 #include <ft2build.h>
 #include FT_FREETYPE_H