[akhaldi] 61984: [USER32] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Tue Feb  4 19:40:45 2014
New Revision: 61984

URL: http://svn.reactos.org/svn/reactos?rev=61984&view=rev
Log:
[USER32]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/win32ss/user/user32/include/ntwrapper.h
    trunk/reactos/win32ss/user/user32/include/regcontrol.h
    trunk/reactos/win32ss/user/user32/include/user32.h
    trunk/reactos/win32ss/user/user32/include/user_x.h
    trunk/reactos/win32ss/user/user32/misc/dllmain.c
    trunk/reactos/win32ss/user/user32/misc/imm.c
    trunk/reactos/win32ss/user/user32/windows/input.c

Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h	[iso-8859-1] Tue Feb  4 19:40:45
2014
@@ -1,3 +1,5 @@
+#pragma once
+
 #if defined(__GNUC__)
 #define EXTINLINE extern inline __attribute__((always_inline)) 
 #elif defined(_MSC_VER)

Modified: trunk/reactos/win32ss/user/user32/include/regcontrol.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/regcontrol.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/regcontrol.h	[iso-8859-1] Tue Feb  4
19:40:45 2014
@@ -7,6 +7,7 @@
  * REVISION HISTORY: 2003/06/16 GvG Created
  * NOTES:
  */
+
 #pragma once
 
 /* Built-in class descriptor */

Modified: trunk/reactos/win32ss/user/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/user32.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/user32.h	[iso-8859-1] Tue Feb  4 19:40:45
2014
@@ -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>

Modified: trunk/reactos/win32ss/user/user32/include/user_x.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ…
==============================================================================
--- trunk/reactos/win32ss/user/user32/include/user_x.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/include/user_x.h	[iso-8859-1] Tue Feb  4 19:40:45
2014
@@ -1,3 +1,4 @@
+#pragma once
 
 static __inline PVOID
 SharedPtrToUser(PVOID Ptr)

Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/dllmain.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/dllmain.c	[iso-8859-1] Tue Feb  4 19:40:45
2014
@@ -1,4 +1,6 @@
 #include <user32.h>
+
+#include <ndk/cmfuncs.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);

Modified: trunk/reactos/win32ss/user/user32/misc/imm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/i…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/imm.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/imm.c	[iso-8859-1] Tue Feb  4 19:40:45 2014
@@ -9,6 +9,8 @@
  */
 
 #include <user32.h>
+
+#include <winnls32.h>
 
 #include <wine/debug.h>
 

Modified: trunk/reactos/win32ss/user/user32/windows/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/input.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/input.c	[iso-8859-1] Tue Feb  4 19:40:45
2014
@@ -28,6 +28,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <user32.h>
+
+#include <strsafe.h>
 
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);