[CSRSRV]

* Remove one time inclusions from the main header and put them back where they belong.
* Remove inclusions and definitions that already exist in the main header.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61518

diff --git a/reactos/subsystems/win32/csrsrv/api.c b/reactos/subsystems/win32/csrsrv/api.c
index 125fc67..12bcfba 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/api.c
+++ b/reactos/subsystems/win32/csrsrv/api.c
@@ -11,6 +11,8 @@
 
 #include "srv.h"
 
+#include <ndk/kefuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/subsystems/win32/csrsrv/api.h b/reactos/subsystems/win32/csrsrv/api.h
index 5171b09..bf83165 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/api.h
+++ b/reactos/subsystems/win32/csrsrv/api.h
@@ -7,13 +7,6 @@
 
 #pragma once
 
-#define NTOS_MODE_USER
-#include <ndk/psfuncs.h>
-#include <ndk/rtlfuncs.h>
-
-#include <csr/csrsrv.h>
-
-
 extern RTL_CRITICAL_SECTION CsrProcessLock, CsrWaitListsLock;
 
 #define CsrAcquireProcessLock() \

diff --git a/reactos/subsystems/win32/csrsrv/init.c b/reactos/subsystems/win32/csrsrv/init.c
index fb8b393..694bb1e 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/init.c
+++ b/reactos/subsystems/win32/csrsrv/init.c
@@ -11,6 +11,9 @@
 
 #include "srv.h"
 
+#include <winreg.h>
+#include <ndk/cmfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/subsystems/win32/csrsrv/procsup.c b/reactos/subsystems/win32/csrsrv/procsup.c
index dcc40c4..d682c37 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/procsup.c
+++ b/reactos/subsystems/win32/csrsrv/procsup.c
@@ -11,6 +11,8 @@
 
 #include <srv.h>
 
+#include <winuser.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/subsystems/win32/csrsrv/server.c b/reactos/subsystems/win32/csrsrv/server.c
index 5efeb0d..2ac9ba8 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/server.c
+++ b/reactos/subsystems/win32/csrsrv/server.c
@@ -10,6 +10,8 @@
 
 #include "srv.h"
 
+#include <ndk/mmfuncs.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/subsystems/win32/csrsrv/srv.h b/reactos/subsystems/win32/csrsrv/srv.h
index 1bf21bb..d99c963 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/srv.h
+++ b/reactos/subsystems/win32/csrsrv/srv.h
@@ -15,19 +15,15 @@
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>    // For EWX_FORCE
 #define NTOS_MODE_USER
 #include <ndk/setypes.h>
 #include <ndk/sefuncs.h>
 #include <ndk/exfuncs.h>
-#include <ndk/cmfuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/lpcfuncs.h>
-#include <ndk/kefuncs.h>
-//#include <ndk/dbgktypes.h>
-#include <ndk/mmfuncs.h>
 #include <ndk/umfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 /* CSR Header */
 #include <csr/csrsrv.h>
@@ -36,7 +32,6 @@
 #include <pseh/pseh2.h>
 
 /* Subsystem Manager Header */
-#include <sm/helper.h>
 #include <sm/smmsg.h>
 
 /* Internal CSRSS Header */
@@ -58,6 +53,4 @@
 #define InterlockedIncrementUL(Value) _InterlockedIncrement((PLONG)Value)
 #define InterlockedDecrementUL(Value) _InterlockedDecrement((PLONG)Value)
 
-#endif // _SRV_H
-
-/* EOF */
+#endif /* _SRV_H */