[SVCHOST]

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

svn path=/trunk/; revision=61606

diff --git a/reactos/base/services/svchost/netbios.c b/reactos/base/services/svchost/netbios.c
index ba52b0e..8537e61 100644 (file)
--- a/reactos/base/services/svchost/netbios.c
+++ b/reactos/base/services/svchost/netbios.c
@@ -10,6 +10,9 @@
 
 #include "svchost.h"
 
+#include <lmerr.h>
+#include <nb30.h>
+
 /* GLOBALS *******************************************************************/
 
 LONG GlobalNetBiosUseCount;

diff --git a/reactos/base/services/svchost/security.cxx b/reactos/base/services/svchost/security.cxx
index 8d4a22e..342aaf0 100644 (file)
--- a/reactos/base/services/svchost/security.cxx
+++ b/reactos/base/services/svchost/security.cxx
@@ -11,6 +11,9 @@
 extern "C"
 {
 #include "svchost.h"
+
+#include <aclapi.h>
+#include <objidl.h>
 }
 
 /* GLOBALS *******************************************************************/

diff --git a/reactos/base/services/svchost/svchost.c b/reactos/base/services/svchost/svchost.c
index e114cd4..e1085d0 100644 (file)
--- a/reactos/base/services/svchost/svchost.c
+++ b/reactos/base/services/svchost/svchost.c
@@ -10,6 +10,8 @@
 
 #include "svchost.h"
 
+#include <objidl.h>
+
 /* GLOBALS *******************************************************************/
 
 LIST_ENTRY DllList;

diff --git a/reactos/base/services/svchost/svchost.h b/reactos/base/services/svchost/svchost.h
index 0588d00..e871eed 100644 (file)
--- a/reactos/base/services/svchost/svchost.h
+++ b/reactos/base/services/svchost/svchost.h
@@ -7,11 +7,13 @@
  */
 
 #pragma once
+
 #define WIN32_NO_STATUS
-#include <windows.h>
-#include <aclapi.h>
-#include <ntndk.h>
-#include <lmerr.h>
+#define WIN32_LEAN_AND_MEAN
+
+#include <rpc.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/kdtypes.h>
 
 //
 // FIXME: Should go in public headers