diff --git a/reactos/win32ss/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
index b2ec18e1b7c..8da9a027914 100644
--- a/reactos/win32ss/user/user32/include/ntwrapper.h
+++ b/reactos/win32ss/user/user32/include/ntwrapper.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #if defined(__GNUC__)
 #define EXTINLINE extern inline __attribute__((always_inline)) 
 #elif defined(_MSC_VER)
diff --git a/reactos/win32ss/user/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
index daed43b8def..568913c0824 100644
--- a/reactos/win32ss/user/user32/include/regcontrol.h
+++ b/reactos/win32ss/user/user32/include/regcontrol.h
@@ -7,6 +7,7 @@
  * REVISION HISTORY: 2003/06/16 GvG Created
  * NOTES:
  */
+
 #pragma once
 
 /* Built-in class descriptor */
diff --git a/reactos/win32ss/user/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h
index cc13bed8144..554e4185283 100644
--- a/reactos/win32ss/user/user32/include/user32.h
+++ b/reactos/win32ss/user/user32/include/user32.h
@@ -9,9 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 /* C Headers */
-#include <assert.h>
 #include <stdio.h>
-#include <math.h>
 
 /* SDK/NDK Headers */
 #define _USER32_
@@ -22,7 +20,6 @@
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <wincon.h>
 #include <wingdi.h>
 #include <winreg.h>
 #include <winuser.h>
@@ -30,13 +27,9 @@
 #include <ddeml.h>
 #include <dde.h>
 #include <windowsx.h>
-#include <winnls32.h>
-#include <strsafe.h>
-#include <ndk/cmfuncs.h>
 #include <ndk/kefuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/umfuncs.h>
 
 /* CSRSS Header */
 #include <csr/csr.h>
diff --git a/reactos/win32ss/user/user32/include/user_x.h b/reactos/win32ss/user/user32/include/user_x.h
index 16b5a6f073d..c040afefb9c 100644
--- a/reactos/win32ss/user/user32/include/user_x.h
+++ b/reactos/win32ss/user/user32/include/user_x.h
@@ -1,3 +1,4 @@
+#pragma once
 
 static __inline PVOID
 SharedPtrToUser(PVOID Ptr)
diff --git a/reactos/win32ss/user/user32/misc/dllmain.c b/reactos/win32ss/user/user32/misc/dllmain.c
index 207df9c7791..5072b1bc3f7 100644
--- a/reactos/win32ss/user/user32/misc/dllmain.c
+++ b/reactos/win32ss/user/user32/misc/dllmain.c
@@ -1,5 +1,7 @@
 #include <user32.h>
 
+#include <ndk/cmfuncs.h>
+
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
diff --git a/reactos/win32ss/user/user32/misc/imm.c b/reactos/win32ss/user/user32/misc/imm.c
index 13beaaf6636..088b3ec2833 100644
--- a/reactos/win32ss/user/user32/misc/imm.c
+++ b/reactos/win32ss/user/user32/misc/imm.c
@@ -10,6 +10,8 @@
 
 #include <user32.h>
 
+#include <winnls32.h>
+
 #include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
diff --git a/reactos/win32ss/user/user32/windows/input.c b/reactos/win32ss/user/user32/windows/input.c
index b9c1d88676a..3e50a2901ce 100644
--- a/reactos/win32ss/user/user32/windows/input.c
+++ b/reactos/win32ss/user/user32/windows/input.c
@@ -29,6 +29,8 @@
 
 #include <user32.h>
 
+#include <strsafe.h>
+
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);