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

Author: akhaldi
Date: Wed Feb  5 16:27:14 2014
New Revision: 61990

URL: http://svn.reactos.org/svn/reactos?rev=61990&view=rev
Log:
[USERSRV]
* 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/winsrv/usersrv/api.h
    trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c
    trunk/reactos/win32ss/user/winsrv/usersrv/init.c
    trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
    trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h

Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/api.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h	[iso-8859-1] Wed Feb  5 16:27:14 2014
@@ -28,5 +28,3 @@
 CSR_API(SrvEndTask);
 CSR_API(SrvLogon);
 CSR_API(SrvRecordShutdownReason);
-
-/* EOF */

Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c	[iso-8859-1] Wed Feb  5 16:27:14
2014
@@ -11,10 +11,12 @@
 
 #include "usersrv.h"
 
+#include <ndk/mmfuncs.h>
+#include <pseh/pseh2.h>
+#include <strsafe.h>
+
 #define NDEBUG
 #include <debug.h>
-
-#include <strsafe.h>
 
 #define IDTRYAGAIN 10
 #define IDCONTINUE 11

Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/init.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c	[iso-8859-1] Wed Feb  5 16:27:14
2014
@@ -10,6 +10,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "usersrv.h"
+
 #include "api.h"
 
 #define NDEBUG

Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c	[iso-8859-1] Wed Feb  5 16:27:14
2014
@@ -11,7 +11,14 @@
 /* INCLUDES *******************************************************************/
 
 #include "usersrv.h"
+
+#include <stdlib.h>
+#include <winreg.h>
+#include <winlogon.h>
+#include <commctrl.h>
 #include <sddl.h>
+
+#include "resource.h"
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h	[iso-8859-1] Wed Feb  5 16:27:14
2014
@@ -9,23 +9,19 @@
 #ifndef __USERSRV_H__
 #define __USERSRV_H__
 
-#pragma once
-
 /* PSDK/NDK Headers */
 #include <stdarg.h>
-#include <stdlib.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winreg.h>
 #include <winuser.h>
+
 #define NTOS_MODE_USER
-#include <ndk/iofuncs.h>
-#include <ndk/kefuncs.h>
-#include <ndk/mmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/psfuncs.h>
 #include <ndk/rtlfuncs.h>
@@ -33,29 +29,15 @@
 /* Public Win32K Headers */
 #include <ntuser.h>
 
-/* PSEH for SEH Support */
-#include <pseh/pseh2.h>
-
-/* External Winlogon Header */
-#include <winlogon.h>
-
 /* CSRSS Header */
 #include <csr/csrsrv.h>
 
 /* USER Headers */
 #include <win/winmsg.h>
 
-/* Public Win32 Headers */
-#include <commctrl.h>
-
-#include "resource.h"
-
-
 /* Globals */
 extern HINSTANCE UserServerDllInstance;
 extern HANDLE UserServerHeap;
 extern ULONG_PTR LogonProcessId;
 
-#endif // __USERSRV_H__
-
-/* EOF */
+#endif /* __USERSRV_H__ */