[akhaldi] 61606: [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

Author: akhaldi
Date: Mon Jan 13 12:50:25 2014
New Revision: 61606

URL: http://svn.reactos.org/svn/reactos?rev=61606&view=rev
Log:
[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

Modified:
    trunk/reactos/base/services/svchost/netbios.c
    trunk/reactos/base/services/svchost/security.cxx
    trunk/reactos/base/services/svchost/svchost.c
    trunk/reactos/base/services/svchost/svchost.h

Modified: trunk/reactos/base/services/svchost/netbios.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/netbi...
==============================================================================
--- trunk/reactos/base/services/svchost/netbios.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/svchost/netbios.c	[iso-8859-1] Mon Jan 13 12:50:25 2014
@@ -9,6 +9,9 @@
 /* INCLUDES ******************************************************************/

#include "svchost.h"
+
+#include <lmerr.h>
+#include <nb30.h>

/* GLOBALS *******************************************************************/

Modified: trunk/reactos/base/services/svchost/security.cxx
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/secur...
==============================================================================
--- trunk/reactos/base/services/svchost/security.cxx	[iso-8859-1] (original)
+++ trunk/reactos/base/services/svchost/security.cxx	[iso-8859-1] Mon Jan 13 12:50:25 2014
@@ -11,6 +11,9 @@
 extern "C"
 {
 #include "svchost.h"
+
+#include <aclapi.h>
+#include <objidl.h>
 }

/* GLOBALS *******************************************************************/

Modified: trunk/reactos/base/services/svchost/svchost.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svcho...
==============================================================================
--- trunk/reactos/base/services/svchost/svchost.c	[iso-8859-1] (original)
+++ trunk/reactos/base/services/svchost/svchost.c	[iso-8859-1] Mon Jan 13 12:50:25 2014
@@ -9,6 +9,8 @@
 /* INCLUDES ******************************************************************/

#include "svchost.h"
+
+#include <objidl.h>

/* GLOBALS *******************************************************************/

Modified: trunk/reactos/base/services/svchost/svchost.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svcho...
==============================================================================
--- trunk/reactos/base/services/svchost/svchost.h	[iso-8859-1] (original)
+++ trunk/reactos/base/services/svchost/svchost.h	[iso-8859-1] Mon Jan 13 12:50:25 2014
@@ -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