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

svn path=/trunk/; revision=53235
---
 reactos/base/system/services/services.h       | 1 -
 reactos/dll/win32/lpk/ros_lpk.h               | 2 +-
 reactos/dll/win32/lsasrv/lsasrv.h             | 5 ++++-
 reactos/dll/win32/msafd/msafd.h               | 5 ++++-
 reactos/dll/win32/netcfgx/precomp.h           | 3 ++-
 reactos/dll/win32/ntmarta/ntmarta.h           | 4 +++-
 reactos/dll/win32/opengl32/opengl32.h         | 2 +-
 reactos/dll/win32/psapi/precomp.h             | 6 +++++-
 reactos/dll/win32/samsrv/samsrv.c             | 2 +-
 reactos/dll/win32/secur32/precomp.h           | 2 +-
 reactos/dll/win32/secur32/stubs.c             | 5 +----
 reactos/dll/win32/setupapi/setupapi_private.h | 4 +++-
 reactos/dll/win32/shell32/precomp.h           | 2 +-
 reactos/dll/win32/syssetup/precomp.h          | 4 +++-
 reactos/dll/win32/uext2/uext2.c               | 2 +-
 reactos/dll/win32/ufat/ufat.c                 | 2 +-
 reactos/dll/win32/untfs/untfs.c               | 2 +-
 reactos/dll/win32/user32/include/user32.h     | 7 +++++--
 reactos/dll/win32/userenv/precomp.h           | 3 ++-
 reactos/dll/win32/wshirda/wshirda.h           | 2 +-
 20 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/reactos/base/system/services/services.h b/reactos/base/system/services/services.h
index a5c365372d4..210f8db5219 100644
--- a/reactos/base/system/services/services.h
+++ b/reactos/base/system/services/services.h
@@ -8,7 +8,6 @@
 #include <netevent.h>
 #define NTOS_MODE_USER
 #include <ndk/iofuncs.h>
-#include <ndk/obtypes.h>
 #include <ndk/obfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <services/services.h>
diff --git a/reactos/dll/win32/lpk/ros_lpk.h b/reactos/dll/win32/lpk/ros_lpk.h
index 06eeb0d24da..1c11e06e813 100644
--- a/reactos/dll/win32/lpk/ros_lpk.h
+++ b/reactos/dll/win32/lpk/ros_lpk.h
@@ -9,7 +9,7 @@
 #define NTOS_MODE_USER
 
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 
 /* FIXME USP10 api that does not have prototype in any include file */
 VOID WINAPI LpkPresent(VOID);
diff --git a/reactos/dll/win32/lsasrv/lsasrv.h b/reactos/dll/win32/lsasrv/lsasrv.h
index 45fc4f96409..bf5febba6af 100644
--- a/reactos/dll/win32/lsasrv/lsasrv.h
+++ b/reactos/dll/win32/lsasrv/lsasrv.h
@@ -11,7 +11,10 @@
 #include <windows.h>
 #include <ntsecapi.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/lpctypes.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/setypes.h>
 
 #include <string.h>
 
diff --git a/reactos/dll/win32/msafd/msafd.h b/reactos/dll/win32/msafd/msafd.h
index 19f843d8dc4..d26cca9d351 100644
--- a/reactos/dll/win32/msafd/msafd.h
+++ b/reactos/dll/win32/msafd/msafd.h
@@ -15,7 +15,10 @@
 #include <windows.h>
 #include <ws2spi.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 /* This includes ntsecapi.h so it needs to come after the NDK */
 #include <wsahelp.h>
diff --git a/reactos/dll/win32/netcfgx/precomp.h b/reactos/dll/win32/netcfgx/precomp.h
index 6a6640c98f4..a6a6021b0a6 100644
--- a/reactos/dll/win32/netcfgx/precomp.h
+++ b/reactos/dll/win32/netcfgx/precomp.h
@@ -8,7 +8,8 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <netcfgx.h>
 #include <setupapi.h>
 #include <stdio.h>
diff --git a/reactos/dll/win32/ntmarta/ntmarta.h b/reactos/dll/win32/ntmarta/ntmarta.h
index 79a2fe755c5..cf7202eea37 100644
--- a/reactos/dll/win32/ntmarta/ntmarta.h
+++ b/reactos/dll/win32/ntmarta/ntmarta.h
@@ -1,7 +1,9 @@
 #define WIN32_NO_STATUS
 #define NTOS_MODE_USER
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <accctrl.h>
 #include <aclapi.h>
 #include <winsvc.h>
diff --git a/reactos/dll/win32/opengl32/opengl32.h b/reactos/dll/win32/opengl32/opengl32.h
index e22386c6cd1..037419ef6bc 100644
--- a/reactos/dll/win32/opengl32/opengl32.h
+++ b/reactos/dll/win32/opengl32/opengl32.h
@@ -37,7 +37,7 @@ extern "C" {
 
 #define NTOS_MODE_USER
 #include <winddi.h>
-#include <ndk/ntndk.h>
+#include <ndk/pstypes.h>
 
 #include <GL/gl.h>
 #include <GL/glu.h>
diff --git a/reactos/dll/win32/psapi/precomp.h b/reactos/dll/win32/psapi/precomp.h
index c53971f982e..c07d6a28d7e 100644
--- a/reactos/dll/win32/psapi/precomp.h
+++ b/reactos/dll/win32/psapi/precomp.h
@@ -1,7 +1,11 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
+#include <ndk/mmtypes.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <psapi.h>
 #include <epsapi/epsapi.h>
diff --git a/reactos/dll/win32/samsrv/samsrv.c b/reactos/dll/win32/samsrv/samsrv.c
index f87e6e69a74..c3418fce387 100644
--- a/reactos/dll/win32/samsrv/samsrv.c
+++ b/reactos/dll/win32/samsrv/samsrv.c
@@ -22,7 +22,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 
 //#include <samsrv.h>
 
diff --git a/reactos/dll/win32/secur32/precomp.h b/reactos/dll/win32/secur32/precomp.h
index 08cf17c4b7c..b28355c09e2 100644
--- a/reactos/dll/win32/secur32/precomp.h
+++ b/reactos/dll/win32/secur32/precomp.h
@@ -12,7 +12,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 #include <lsass/lsass.h>
 
 #include <ntsecapi.h>
diff --git a/reactos/dll/win32/secur32/stubs.c b/reactos/dll/win32/secur32/stubs.c
index e7003bc7eed..a864105de12 100644
--- a/reactos/dll/win32/secur32/stubs.c
+++ b/reactos/dll/win32/secur32/stubs.c
@@ -1,14 +1,11 @@
 
-
-#include <windows.h>
+#include <precomp.h>
 
 #define NDEBUG
 #include <reactos/debug.h>
 
 #define SEC_ENTRY WINAPI
-#define STATUS_UNSUCCESSFUL ((SECURITY_STATUS)0x80000001)
 
-typedef LONG SECURITY_STATUS;
 typedef PVOID PSECURITY_PACKAGE_OPTIONS, PSecurityUserData;
 
 SECURITY_STATUS
diff --git a/reactos/dll/win32/setupapi/setupapi_private.h b/reactos/dll/win32/setupapi/setupapi_private.h
index a3ff489b9c3..a8aa5917ab2 100644
--- a/reactos/dll/win32/setupapi/setupapi_private.h
+++ b/reactos/dll/win32/setupapi/setupapi_private.h
@@ -41,7 +41,9 @@
 #include <wine/debug.h>
 #include <wine/unicode.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <pseh/pseh2.h>
 
diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h
index 1c84e8a8a2e..a4fca384777 100644
--- a/reactos/dll/win32/shell32/precomp.h
+++ b/reactos/dll/win32/shell32/precomp.h
@@ -44,7 +44,7 @@
 #include <ntquery.h>
 #include <recyclebin.h>
 #include <shtypes.h>
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 #include <fmifs/fmifs.h>
 #include <largeint.h>
 #include <sddl.h>
diff --git a/reactos/dll/win32/syssetup/precomp.h b/reactos/dll/win32/syssetup/precomp.h
index 7411b2fb32e..db7010b9e42 100644
--- a/reactos/dll/win32/syssetup/precomp.h
+++ b/reactos/dll/win32/syssetup/precomp.h
@@ -3,7 +3,9 @@
 #include <windowsx.h>
 
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <setupapi.h>
 #include <commctrl.h>
diff --git a/reactos/dll/win32/uext2/uext2.c b/reactos/dll/win32/uext2/uext2.c
index 2e3ecfe0367..7b6ddc99d19 100644
--- a/reactos/dll/win32/uext2/uext2.c
+++ b/reactos/dll/win32/uext2/uext2.c
@@ -10,7 +10,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 #include <fmifs/fmifs.h>
 
 INT WINAPI
diff --git a/reactos/dll/win32/ufat/ufat.c b/reactos/dll/win32/ufat/ufat.c
index 8a876a29ab3..af0c81a0317 100644
--- a/reactos/dll/win32/ufat/ufat.c
+++ b/reactos/dll/win32/ufat/ufat.c
@@ -10,7 +10,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 #include <fmifs/fmifs.h>
 
 INT WINAPI
diff --git a/reactos/dll/win32/untfs/untfs.c b/reactos/dll/win32/untfs/untfs.c
index f359e5f90e6..b033ea725f7 100644
--- a/reactos/dll/win32/untfs/untfs.c
+++ b/reactos/dll/win32/untfs/untfs.c
@@ -10,7 +10,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 #include <fmifs/fmifs.h>
 
 INT WINAPI
diff --git a/reactos/dll/win32/user32/include/user32.h b/reactos/dll/win32/user32/include/user32.h
index f93eee60a27..d54f31a3e6b 100644
--- a/reactos/dll/win32/user32/include/user32.h
+++ b/reactos/dll/win32/user32/include/user32.h
@@ -22,8 +22,11 @@
 #include <winuser.h>
 #include <windowsx.h>
 #include <winnls32.h>
-#include <ndk/ntndk.h>
-#include <ntstatus.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/umfuncs.h>
 
 /* CSRSS Headers */
 #include <csrss/csrss.h>
diff --git a/reactos/dll/win32/userenv/precomp.h b/reactos/dll/win32/userenv/precomp.h
index ae1fb5f04d5..77f4faaf224 100644
--- a/reactos/dll/win32/userenv/precomp.h
+++ b/reactos/dll/win32/userenv/precomp.h
@@ -2,7 +2,8 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/sefuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <userenv.h>
 #include <sddl.h>
 #include <shlobj.h>
diff --git a/reactos/dll/win32/wshirda/wshirda.h b/reactos/dll/win32/wshirda/wshirda.h
index 127b8251d1b..0402cf7144a 100644
--- a/reactos/dll/win32/wshirda/wshirda.h
+++ b/reactos/dll/win32/wshirda/wshirda.h
@@ -10,7 +10,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 
 #include <wsahelp.h>