diff --git a/reactos/dll/win32/kernel32/client/debugger.c b/reactos/dll/win32/kernel32/client/debugger.c
index c3244f42a55..02891937fed 100644
--- a/reactos/dll/win32/kernel32/client/debugger.c
+++ b/reactos/dll/win32/kernel32/client/debugger.c
@@ -9,6 +9,9 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
+
+#include <ndk/dbgkfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/kernel32/client/dosdev.c b/reactos/dll/win32/kernel32/client/dosdev.c
index a7a7aba7656..ddd20106f57 100644
--- a/reactos/dll/win32/kernel32/client/dosdev.c
+++ b/reactos/dll/win32/kernel32/client/dosdev.c
@@ -11,6 +11,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <k32.h>
+
 #define NDEBUG
 #include <debug.h>
 #include <dbt.h>
diff --git a/reactos/dll/win32/kernel32/client/file/deviceio.c b/reactos/dll/win32/kernel32/client/file/deviceio.c
index c477c4f0653..892ac806163 100644
--- a/reactos/dll/win32/kernel32/client/file/deviceio.c
+++ b/reactos/dll/win32/kernel32/client/file/deviceio.c
@@ -9,6 +9,9 @@
 /* INCLUDES *******************************************************************/
 
 #include <k32.h>
+
+#include <ntddbeep.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/kernel32/client/power.c b/reactos/dll/win32/kernel32/client/power.c
index 411d209571d..7864221f378 100644
--- a/reactos/dll/win32/kernel32/client/power.c
+++ b/reactos/dll/win32/kernel32/client/power.c
@@ -12,6 +12,8 @@
 
 #include <k32.h>
 
+#include <ndk/pofuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/kernel32/client/toolhelp.c b/reactos/dll/win32/kernel32/client/toolhelp.c
index 0eae03bb0fe..5a574f0051f 100644
--- a/reactos/dll/win32/kernel32/client/toolhelp.c
+++ b/reactos/dll/win32/kernel32/client/toolhelp.c
@@ -17,8 +17,6 @@
 
 #include <k32.h>
 
-#include <tlhelp32.h>
-
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/dll/win32/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h
index 8a812383a12..e544b0c7eef 100644
--- a/reactos/dll/win32/kernel32/k32.h
+++ b/reactos/dll/win32/kernel32/k32.h
@@ -11,10 +11,10 @@
 
 /* INCLUDES ******************************************************************/
 
+#include <stdio.h>
+
 /* PSDK/NDK Headers */
 #define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <stdio.h>
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
@@ -28,7 +28,6 @@
 #define NTDDI_VERSION NTDDI_WS03SP1
 
 #include <ndk/cmfuncs.h>
-#include <ndk/dbgkfuncs.h>
 #include <ndk/exfuncs.h>
 #include <ndk/iofuncs.h>
 #include <ndk/kdtypes.h>
@@ -36,7 +35,6 @@
 #include <ndk/ldrfuncs.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
-#include <ndk/pofuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <ndk/setypes.h>
@@ -48,10 +46,8 @@
 #include <win/basemsg.h>
 #include <win/console.h>
 #include <win/conmsg.h>
-#include <win/winmsg.h>
 
 /* DDK Driver Headers */
-#include <ntddbeep.h>
 #include <mountmgr.h>
 
 /* Internal Kernel32 Header */
@@ -69,4 +65,4 @@
 /* Virtual DOS Machines (VDM) Support Definitions */
 #include "include/vdm.h"
 
-#endif
+#endif /* __K32_H */