* Include NDK headers on-demand.

svn path=/trunk/; revision=53235

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>

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);

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>
 

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>

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>

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>

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>

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>

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>
 

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>

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

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>
 

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>

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>

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

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

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

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>

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>

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>