From 8f8d12f21e1ecae600147bc754e8933d9f3f1d66 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 13:10:28 +0000
Subject: [PATCH] [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
---
 reactos/base/system/services/database.c  | 2 ++
 reactos/base/system/services/driver.c    | 3 +++
 reactos/base/system/services/groupdb.c   | 1 -
 reactos/base/system/services/lock.c      | 3 ++-
 reactos/base/system/services/rpcserver.c | 2 ++
 reactos/base/system/services/services.c  | 2 ++
 reactos/base/system/services/services.h  | 7 ++++---
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/reactos/base/system/services/database.c b/reactos/base/system/services/database.c
index 58c53502d1c..aea3f8950bb 100644
--- 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 405474b1471..0f03c294a21 100644
--- 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 c5452ecd930..50db8d35ed0 100644
--- 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 6993e3dcb72..b670fb69909 100644
--- 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 7fc7222c9f7..ba53003c67e 100644
--- 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 b7a97f1064d..4163a3c7a01 100644
--- 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 20afb30c08d..01a04c4005f 100644
--- 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>