[SERVICES]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve the main header.
CORE-7716

svn path=/trunk/; revision=61614

diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c
index 58c5350..aea3f89 100644 (file)
--- a/reactos/base/system/services/database.c
+++ b/reactos/base/system/services/database.c
@@ -14,6 +14,8 @@
 
 #include "services.h"
 
+#include <winuser.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/base/system/services/driver.c b/reactos/base/system/services/driver.c
index 405474b..0f03c29 100644 (file)
--- a/reactos/base/system/services/driver.c
+++ b/reactos/base/system/services/driver.c
@@ -11,6 +11,9 @@
 
 #include "services.h"
 
+#include <ndk/iofuncs.h>
+#include <ndk/setypes.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/base/system/services/groupdb.c b/reactos/base/system/services/groupdb.c
index c5452ec..50db8d3 100644 (file)
--- a/reactos/base/system/services/groupdb.c
+++ b/reactos/base/system/services/groupdb.c
@@ -14,7 +14,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS *******************************************************************/
 
 LIST_ENTRY GroupListHead;

diff --git a/reactos/base/system/services/lock.c b/reactos/base/system/services/lock.c
index 6993e3d..b670fb6 100644 (file)
--- a/reactos/base/system/services/lock.c
+++ b/reactos/base/system/services/lock.c
@@ -10,10 +10,11 @@
 
 #include "services.h"
 
+#include <time.h>
+
 #define NDEBUG
 #include <debug.h>
 
-
 /* GLOBALS *******************************************************************/
 
 /* The unique user service start lock of the SCM */

diff --git a/reactos/base/system/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
index 7fc7222..ba53003 100644 (file)
--- a/reactos/base/system/services/rpcserver.c
+++ b/reactos/base/system/services/rpcserver.c
@@ -12,6 +12,8 @@
 
 #include "services.h"
 
+#include <winnls.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/base/system/services/services.c b/reactos/base/system/services/services.c
index b7a97f1..4163a3c 100644 (file)
--- a/reactos/base/system/services/services.c
+++ b/reactos/base/system/services/services.c
@@ -12,6 +12,8 @@
 
 #include "services.h"
 
+#include <wincon.h>
+
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h
index 20afb30..01a04c4 100644 (file)
--- a/reactos/base/system/services/services.h
+++ b/reactos/base/system/services/services.h
@@ -3,18 +3,19 @@
  */
 
 #include <stdio.h>
-#include <time.h>
 
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winsvc.h>
+#include <winreg.h>
 #include <netevent.h>
 #define NTOS_MODE_USER
-#include <ndk/iofuncs.h>
 #include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
-#include <ndk/setypes.h>
 #include <services/services.h>
 #include <svcctl_s.h>