From 45f03998312392046fa014245caff6ef6754f0af Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 12:50:25 +0000
Subject: [PATCH] [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
---
 reactos/base/services/svchost/netbios.c    |  3 +++
 reactos/base/services/svchost/security.cxx |  3 +++
 reactos/base/services/svchost/svchost.c    |  2 ++
 reactos/base/services/svchost/svchost.h    | 10 ++++++----
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/reactos/base/services/svchost/netbios.c b/reactos/base/services/svchost/netbios.c
index ba52b0e7d7b..8537e61a66d 100644
--- 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 8d4a22ec04a..342aaf0d4b0 100644
--- 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 e114cd4de16..e1085d08a79 100644
--- 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 0588d002fad..e871eedd5d7 100644
--- 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