From be1c410130833d6a16ddebde07b3d563d4c3b644 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 5 Feb 2014 16:27:14 +0000
Subject: [PATCH] [USERSRV] * Remove one time inclusions from the main header
 and put them back where they belong. * Improve header inclusions. CORE-7716

svn path=/trunk/; revision=61990
---
 reactos/win32ss/user/winsrv/usersrv/api.h     |  2 --
 .../win32ss/user/winsrv/usersrv/harderror.c   |  6 +++--
 reactos/win32ss/user/winsrv/usersrv/init.c    |  1 +
 .../win32ss/user/winsrv/usersrv/shutdown.c    |  7 +++++
 reactos/win32ss/user/winsrv/usersrv/usersrv.h | 26 +++----------------
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/reactos/win32ss/user/winsrv/usersrv/api.h b/reactos/win32ss/user/winsrv/usersrv/api.h
index 34e9c459f4a..0692b971a35 100644
--- a/reactos/win32ss/user/winsrv/usersrv/api.h
+++ b/reactos/win32ss/user/winsrv/usersrv/api.h
@@ -28,5 +28,3 @@ CSR_API(SrvExitWindowsEx);
 CSR_API(SrvEndTask);
 CSR_API(SrvLogon);
 CSR_API(SrvRecordShutdownReason);
-
-/* EOF */
diff --git a/reactos/win32ss/user/winsrv/usersrv/harderror.c b/reactos/win32ss/user/winsrv/usersrv/harderror.c
index 31281c6d6f1..705146c0c14 100644
--- a/reactos/win32ss/user/winsrv/usersrv/harderror.c
+++ b/reactos/win32ss/user/winsrv/usersrv/harderror.c
@@ -11,11 +11,13 @@
 
 #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
 
diff --git a/reactos/win32ss/user/winsrv/usersrv/init.c b/reactos/win32ss/user/winsrv/usersrv/init.c
index 563792e5940..8949e60eca5 100644
--- a/reactos/win32ss/user/winsrv/usersrv/init.c
+++ b/reactos/win32ss/user/winsrv/usersrv/init.c
@@ -10,6 +10,7 @@
 /* INCLUDES *******************************************************************/
 
 #include "usersrv.h"
+
 #include "api.h"
 
 #define NDEBUG
diff --git a/reactos/win32ss/user/winsrv/usersrv/shutdown.c b/reactos/win32ss/user/winsrv/usersrv/shutdown.c
index 76b0f056bef..b0de4d31045 100644
--- a/reactos/win32ss/user/winsrv/usersrv/shutdown.c
+++ b/reactos/win32ss/user/winsrv/usersrv/shutdown.c
@@ -11,8 +11,15 @@
 /* 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>
 
diff --git a/reactos/win32ss/user/winsrv/usersrv/usersrv.h b/reactos/win32ss/user/winsrv/usersrv/usersrv.h
index 3ac83be9d7e..511acd40ac7 100644
--- a/reactos/win32ss/user/winsrv/usersrv/usersrv.h
+++ b/reactos/win32ss/user/winsrv/usersrv/usersrv.h
@@ -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__ */