From 704a9a3f493d57efc22e24cbbccedd90485adc51 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 14 Aug 2011 12:59:05 +0000
Subject: [PATCH] * Include NDK headers on-demand.

svn path=/trunk/; revision=53231
---
 reactos/base/system/services/services.h       |  5 ++++-
 reactos/base/system/smss/smss.h               | 11 ++++++++++-
 reactos/dll/directx/ksuser/ksuser.h           |  5 ++++-
 reactos/dll/ntdll/include/ntdll.h             | 14 +++++++++++++-
 reactos/dll/win32/aclui/precomp.h             |  6 +++---
 reactos/dll/win32/beepmidi/beepmidi.c         |  6 ++++--
 reactos/dll/win32/dnsapi/dnsapi/precomp.h     |  2 +-
 reactos/dll/win32/dnsapi/dnsapi/stubs.c       |  8 +-------
 reactos/dll/win32/fmifs/precomp.h             |  6 +++++-
 reactos/dll/win32/iphlpapi/iphlpapi_private.h |  5 ++++-
 reactos/dll/win32/kernel32/k32.h              | 15 ++++++++++++++-
 11 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h
index dc9c6098da6..a5c365372d4 100644
--- a/reactos/base/system/services/services.h
+++ b/reactos/base/system/services/services.h
@@ -7,7 +7,10 @@
 #include <windows.h>
 #include <netevent.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obtypes.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <services/services.h>
 
 
diff --git a/reactos/base/system/smss/smss.h b/reactos/base/system/smss/smss.h
index 61f3b4bead4..f0fff9b48b5 100644
--- a/reactos/base/system/smss/smss.h
+++ b/reactos/base/system/smss/smss.h
@@ -6,7 +6,16 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/mmtypes.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/umfuncs.h>
 
 #include <sm/api.h>
 #include <sm/helper.h>
diff --git a/reactos/dll/directx/ksuser/ksuser.h b/reactos/dll/directx/ksuser/ksuser.h
index de44aab6d8b..3c4fc09a1b0 100644
--- a/reactos/dll/directx/ksuser/ksuser.h
+++ b/reactos/dll/directx/ksuser/ksuser.h
@@ -4,7 +4,10 @@
 
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <ndk/ntndk.h>
+//#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obtypes.h>
+#include <ndk/rtlfuncs.h>
 
 
 #include <ks.h>
diff --git a/reactos/dll/ntdll/include/ntdll.h b/reactos/dll/ntdll/include/ntdll.h
index 6c05a3e9d35..edbce5ae68d 100644
--- a/reactos/dll/ntdll/include/ntdll.h
+++ b/reactos/dll/ntdll/include/ntdll.h
@@ -24,7 +24,19 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/dbgkfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kdtypes.h>
+#include <ndk/kefuncs.h>
+#include <ndk/ldrfuncs.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/umfuncs.h>
 
 /* Internal NTDLL */
 #include "ntdllp.h"
diff --git a/reactos/dll/win32/aclui/precomp.h b/reactos/dll/win32/aclui/precomp.h
index d300be0953b..95706946af4 100644
--- a/reactos/dll/win32/aclui/precomp.h
+++ b/reactos/dll/win32/aclui/precomp.h
@@ -1,8 +1,8 @@
-#define WIN32_NO_STATUS
-#define NTOS_MODE_USER
 #define _ACLUI_
+#define WIN32_NO_STATUS
 #include <windows.h>
-#include <ndk/ntndk.h>
+#define NTOS_MODE_USER
+#include <ndk/rtlfuncs.h>
 #include <commctrl.h>
 #include <oleauto.h>
 #include <objsel.h>
diff --git a/reactos/dll/win32/beepmidi/beepmidi.c b/reactos/dll/win32/beepmidi/beepmidi.c
index 6365d05e65c..cc8cfa19a88 100644
--- a/reactos/dll/win32/beepmidi/beepmidi.c
+++ b/reactos/dll/win32/beepmidi/beepmidi.c
@@ -41,9 +41,11 @@
 #define CONTINUOUS_NOTES
 
 #define WIN32_NO_STATUS
-#define NTOS_MODE_USER
 #include <windows.h>
-#include <ndk/ntndk.h>
+#define NTOS_MODE_USER
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <stdio.h>
 #include <ntddbeep.h>
 #include <math.h>
diff --git a/reactos/dll/win32/dnsapi/dnsapi/precomp.h b/reactos/dll/win32/dnsapi/dnsapi/precomp.h
index 19bee75948b..cf50fb6a353 100644
--- a/reactos/dll/win32/dnsapi/dnsapi/precomp.h
+++ b/reactos/dll/win32/dnsapi/dnsapi/precomp.h
@@ -15,7 +15,7 @@
 #include <windows.h>
 #include <winerror.h>
 #include <windns.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 
 /* Internal DNSAPI Headers */
 #include <internal/windns.h>
diff --git a/reactos/dll/win32/dnsapi/dnsapi/stubs.c b/reactos/dll/win32/dnsapi/dnsapi/stubs.c
index 36cd71731e4..be67929c2bc 100644
--- a/reactos/dll/win32/dnsapi/dnsapi/stubs.c
+++ b/reactos/dll/win32/dnsapi/dnsapi/stubs.c
@@ -1,10 +1,4 @@
-/* Can't use precomp.h because these weren't stubbed properly */
-#define WIN32_NO_STATUS
-#define NTOS_MODE_USER
-#include <windows.h>
-#include <windns.h>
-#include <ndk/ntndk.h>
-
+#include "precomp.h"
 #include <debug.h>
 
 DNS_STATUS WINAPI
diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h
index 647ce1c04f8..17b4a023435 100644
--- a/reactos/dll/win32/fmifs/precomp.h
+++ b/reactos/dll/win32/fmifs/precomp.h
@@ -15,9 +15,13 @@
 #define UNICODE
 #define _UNICODE
 
+#include <stdio.h>
+
 /* PSDK/NDK Headers */
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 /* FMIFS Public Header */
 #include <fmifs/fmifs.h>
diff --git a/reactos/dll/win32/iphlpapi/iphlpapi_private.h b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
index 4fc8b551014..b721c0eca55 100644
--- a/reactos/dll/win32/iphlpapi/iphlpapi_private.h
+++ b/reactos/dll/win32/iphlpapi/iphlpapi_private.h
@@ -4,6 +4,7 @@
 #define NtCurrentTeb NtXCurrentTeb
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
@@ -24,7 +25,9 @@
 #include <ws2tcpip.h>
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <nspapi.h>
 #include <iptypes.h>
 #include "iphlpapi.h"
diff --git a/reactos/dll/win32/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h
index 553347ce27f..d791465e56f 100644
--- a/reactos/dll/win32/kernel32/k32.h
+++ b/reactos/dll/win32/kernel32/k32.h
@@ -20,7 +20,20 @@
 #undef NTDDI_VERSION
 #define NTDDI_VERSION NTDDI_WS03SP1
 
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/dbgkfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kdtypes.h>
+#include <ndk/kefuncs.h>
+#include <ndk/ldrfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/pofuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/setypes.h>
+#include <ndk/umfuncs.h>
 
 /* CSRSS Header */
 #include <csrss/csrss.h>