diff --git a/reactos/base/system/lsass/lsass.c b/reactos/base/system/lsass/lsass.c
index 57216a4d9a6..3dae3ca15d7 100644
--- a/reactos/base/system/lsass/lsass.c
+++ b/reactos/base/system/lsass/lsass.c
@@ -27,7 +27,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/psfuncs.h>
 
 #include <lsass/lsasrv.h>
 //#include <samsrv.h>
diff --git a/reactos/dll/directx/ksuser/ksuser.h b/reactos/dll/directx/ksuser/ksuser.h
index 3c4fc09a1b0..10953981dda 100644
--- a/reactos/dll/directx/ksuser/ksuser.h
+++ b/reactos/dll/directx/ksuser/ksuser.h
@@ -4,7 +4,6 @@
 
 #define WIN32_NO_STATUS
 #include <windows.h>
-//#include <ndk/ntndk.h>
 #include <ndk/iofuncs.h>
 #include <ndk/obtypes.h>
 #include <ndk/rtlfuncs.h>
diff --git a/reactos/drivers/directx/dxapi/dxapi_driver.h b/reactos/drivers/directx/dxapi/dxapi_driver.h
index 996353c7f2d..09a2ba7958a 100644
--- a/reactos/drivers/directx/dxapi/dxapi_driver.h
+++ b/reactos/drivers/directx/dxapi/dxapi_driver.h
@@ -1,20 +1,10 @@
+#include <wdm.h>
 
-/* DDK/NDK/SDK Headers */
-#include <ntddk.h>
-#include <ntddmou.h>
-#include <ntifs.h>
-#include <tvout.h>
-#include <ntndk.h>
-
-#include <stdarg.h>
 #include <windef.h>
 #include <winerror.h>
 #include <wingdi.h>
 #define NT_BUILD_ENVIRONMENT
 #include <winddi.h>
-#include <prntfont.h>
-#include <dde.h>
-
 
 #include <ddkmapi.h>
 
@@ -123,7 +113,6 @@ DWORD tblCheckOutBuffer [] =
     sizeof(DWORD)
 };
 
-
 /* Internal driver function */
 DRVFN gDxApiEntryPoint [] = 
 {
@@ -150,6 +139,3 @@ DRVFN gDxApiEntryPoint [] =
     {DD_DXAPI_ADDVPCAPTUREBUFFER - DD_FIRST_DXAPI, (PFN) DxAddVpCaptureBuffer},
     {DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI, (PFN) DxFlushVpCaptureBuffs}
 };
-
-
-
diff --git a/reactos/drivers/ksfilter/ks/priv.h b/reactos/drivers/ksfilter/ks/priv.h
index 395708f27e4..eec30e2a38b 100644
--- a/reactos/drivers/ksfilter/ks/priv.h
+++ b/reactos/drivers/ksfilter/ks/priv.h
@@ -1,25 +1,22 @@
 #define _KSDDK_
 
+#include <stdio.h>
+
 #include <ntifs.h>
-#include <ntddk.h>
 #define NDEBUG
 //#define YDEBUG
 #include <debug.h>
 #include <portcls.h>
-#include <ks.h>
 #include <kcom.h>
 #include <pseh/pseh2.h>
-#include <ntndk.h>
+
+#include <ntimage.h>
+#include <ndk/ldrfuncs.h>
 
 #include "ksfunc.h"
-#include "kstypes.h"
-#include "ksiface.h"
-
-#include "ksmedia.h"
 #include "bdamedia.h"
 #include <swenum.h>
 
-
 #define TAG_DEVICE_HEADER 'KSDH'
 #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */
 #define MERIT_DO_NOT_USE 0x200000 /* dshow.h */
@@ -49,7 +46,6 @@ DEFINE_KSPROPERTY_TABLE(PinSet) {\
     DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\
 }
 
-
 #define DEFINE_KSPROPERTY_STREAMSET(PinSet,\
     PropStreamAllocator, PropMasterClock, PropPipeId)\
 DEFINE_KSPROPERTY_TABLE(PinSet) {\
@@ -57,7 +53,3 @@ DEFINE_KSPROPERTY_TABLE(PinSet) {\
     DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\
     DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\
 }
-
-
-
-
diff --git a/reactos/drivers/video/videoprt/videoprt.h b/reactos/drivers/video/videoprt/videoprt.h
index 1bf794ee9d2..e89d7a1e1f2 100644
--- a/reactos/drivers/video/videoprt/videoprt.h
+++ b/reactos/drivers/video/videoprt/videoprt.h
@@ -23,17 +23,20 @@
 #define VIDEOPRT_H
 
 #include <stdio.h>
-#include <ntddk.h>
+
+#include <ntifs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/halfuncs.h>
+#include <ndk/inbvfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/rtlfuncs.h>
+
 #define __BROKEN__
 #include <miniport.h>
 #include <video.h>
-#include <ntddvdeo.h>
 #include <ntagp.h>
-#include <ntifs.h>
-#include <ndk/ntndk.h>
 #include <dderror.h>
 #include <windef.h>
-
 #include <initguid.h>
 #include <wdmguid.h>
 
diff --git a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
index 6c2ab8d8451..92b7f6514ac 100644
--- a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
+++ b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
@@ -4,26 +4,17 @@
 #define _KSDDK_
 
 #include <windows.h>
-#include <mmsystem.h>
 #include <stdio.h>
 #include <math.h>
 #include <setupapi.h>
-#include <ndk/ntndk.h>
-#include <ks.h>
+#include <ndk/umtypes.h>
 #include <ksmedia.h>
 #include "interface.h"
 
-
 #define _2pi                6.283185307179586476925286766559
 
-
-
-#include <ks.h>
-
-
 GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO};
 
-
 const GUID KSPROPSETID_Pin                     = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}};
 const GUID KSPROPSETID_Connection               = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
 const GUID KSPROPSETID_Sysaudio                 = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}};
@@ -34,7 +25,6 @@ const GUID KSDATAFORMAT_TYPE_AUDIO              = {0x73647561L, 0x0000, 0x0010,
 const GUID KSDATAFORMAT_SUBTYPE_PCM             = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX  = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
 
-
 VOID
 TestKs()
 {
diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h
index 701c374620b..124d716b95f 100644
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -27,7 +27,13 @@
 #include <bugcodes.h>
 #include <ntdddisk.h>
 #include <arc/arc.h>
-#include <ntndk.h>
+
+#include <ndk/asm.h>
+#include <ndk/halfuncs.h>
+#include <ndk/inbvfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/rtlfuncs.h>
 
 /* Internal shared PCI and ACPI header */
 #include <drivers/pci/pci.h>
diff --git a/reactos/lib/epsapi/enum/precomp.h b/reactos/lib/epsapi/enum/precomp.h
index d53731b1571..3d029daf987 100644
--- a/reactos/lib/epsapi/enum/precomp.h
+++ b/reactos/lib/epsapi/enum/precomp.h
@@ -1,6 +1,9 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <epsapi/epsapi.h>
diff --git a/reactos/lib/fslib/ntfslib/ntfslib.h b/reactos/lib/fslib/ntfslib/ntfslib.h
index b50dfbf16c6..cf6713e6558 100644
--- a/reactos/lib/fslib/ntfslib/ntfslib.h
+++ b/reactos/lib/fslib/ntfslib/ntfslib.h
@@ -6,5 +6,5 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 #include <fmifs/fmifs.h>
diff --git a/reactos/lib/fslib/vfatxlib/vfatxlib.h b/reactos/lib/fslib/vfatxlib/vfatxlib.h
index 4c035e2dfb5..ce3a62e271d 100644
--- a/reactos/lib/fslib/vfatxlib/vfatxlib.h
+++ b/reactos/lib/fslib/vfatxlib/vfatxlib.h
@@ -6,7 +6,10 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <fmifs/fmifs.h>
 
 #include <pshpack1.h>
diff --git a/reactos/lib/lsalib/lsa.c b/reactos/lib/lsalib/lsa.c
index 31c2aeb197f..f2fe9d702bb 100644
--- a/reactos/lib/lsalib/lsa.c
+++ b/reactos/lib/lsalib/lsa.c
@@ -9,7 +9,9 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ndk/ntndk.h>
+#include <ndk/lpctypes.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <psdk/ntsecapi.h>
 #include <lsass/lsass.h>
 
diff --git a/reactos/lib/newinflib/builddep.h b/reactos/lib/newinflib/builddep.h
index 398cb88e236..f00bdda03a0 100644
--- a/reactos/lib/newinflib/builddep.h
+++ b/reactos/lib/newinflib/builddep.h
@@ -61,7 +61,9 @@ BOOLEAN NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf );
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/iofuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 extern PVOID InfpHeap;
 
diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h
index 848ab3d0b04..15a6ba843aa 100644
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@@ -22,7 +22,19 @@
 
 /* PSDK/NDK Headers */
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kdfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/ldrfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/setypes.h>
+#include <ndk/sefuncs.h>
+#include <ndk/umfuncs.h>
 
 /* Internal RTL header */
 #include "rtlp.h"
diff --git a/reactos/lib/sdk/crt/precomp.h b/reactos/lib/sdk/crt/precomp.h
index acc6e6d7dec..b257c931382 100644
--- a/reactos/lib/sdk/crt/precomp.h
+++ b/reactos/lib/sdk/crt/precomp.h
@@ -27,7 +27,7 @@
 /* PSDK/NDK Headers */
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 
 #if !defined(_MSC_VER)
   #include <stdint.h>
diff --git a/reactos/lib/sdk/nt/entry_point.c b/reactos/lib/sdk/nt/entry_point.c
index 01255a9cedb..5cf7ef6d1e2 100644
--- a/reactos/lib/sdk/nt/entry_point.c
+++ b/reactos/lib/sdk/nt/entry_point.c
@@ -13,7 +13,8 @@
 #include <stdio.h>
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 NTSTATUS
 __cdecl
diff --git a/reactos/lib/smlib/precomp.h b/reactos/lib/smlib/precomp.h
index efb3720aaf4..49da659bf1a 100644
--- a/reactos/lib/smlib/precomp.h
+++ b/reactos/lib/smlib/precomp.h
@@ -12,7 +12,11 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/lpctypes.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <sm/helper.h>
 
diff --git a/reactos/ntoskrnl/include/ntoskrnl.h b/reactos/ntoskrnl/include/ntoskrnl.h
index 84937f2168d..21e1a0e1be1 100644
--- a/reactos/ntoskrnl/include/ntoskrnl.h
+++ b/reactos/ntoskrnl/include/ntoskrnl.h
@@ -33,7 +33,25 @@
 #include <arc/arc.h>
 #undef NTHALAPI
 #define NTHALAPI __declspec(dllimport)
-#include <ntndk.h>
+#include <ndk/asm.h>
+#include <ndk/cctypes.h>
+#include <ndk/cmfuncs.h>
+#include <ndk/dbgkfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/halfuncs.h>
+#include <ndk/inbvfuncs.h>
+#include <ndk/iofuncs.h>
+#include <ndk/kdfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/ldrfuncs.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/pofuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/sefuncs.h>
+#include <ndk/vftypes.h>
 #undef TEXT
 #define TEXT(s) L##s
 #include <regstr.h>
diff --git a/reactos/subsystems/ntvdm/ntvdm.c b/reactos/subsystems/ntvdm/ntvdm.c
index 5a9a29a8e58..47cebc4e49a 100644
--- a/reactos/subsystems/ntvdm/ntvdm.c
+++ b/reactos/subsystems/ntvdm/ntvdm.c
@@ -13,12 +13,8 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #include <stdio.h>
-#include <wchar.h>
 #include "resource.h"
 
-#define NTOS_MODE_USER
-#include <ndk/ntndk.h>
-
 #define NDEBUG
 #include <debug.h>
 
diff --git a/reactos/subsystems/win32/csrss/csrsrv/srv.h b/reactos/subsystems/win32/csrss/csrsrv/srv.h
index 34d2e4130a8..099324c626b 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/srv.h
+++ b/reactos/subsystems/win32/csrss/csrsrv/srv.h
@@ -4,7 +4,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #include <winnt.h>
-#include <ndk/ntndk.h>
+#include <ndk/lpctypes.h>
 
 /* CSR Header */
 //#include <csr/server.h>
diff --git a/reactos/subsystems/win32/csrss/csrss.c b/reactos/subsystems/win32/csrss/csrss.c
index c5f574584fb..280cee466d3 100644
--- a/reactos/subsystems/win32/csrss/csrss.c
+++ b/reactos/subsystems/win32/csrss/csrss.c
@@ -11,7 +11,6 @@
 
 #define WIN32_NO_STATUS
 #include <windows.h>
-#include <ndk/ntndk.h>
 #include <api.h>
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsystems/win32/csrss/include/api.h b/reactos/subsystems/win32/csrss/include/api.h
index 7e956b66698..fab8af89151 100644
--- a/reactos/subsystems/win32/csrss/include/api.h
+++ b/reactos/subsystems/win32/csrss/include/api.h
@@ -9,7 +9,8 @@
 #pragma once
 
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 
 #include <csrss/csrss.h>
 
diff --git a/reactos/subsystems/win32/csrss/win32csr/w32csr.h b/reactos/subsystems/win32/csrss/win32csr/w32csr.h
index 8516cccd034..575ab2a73bc 100644
--- a/reactos/subsystems/win32/csrss/win32csr/w32csr.h
+++ b/reactos/subsystems/win32/csrss/win32csr/w32csr.h
@@ -2,35 +2,24 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/mmtypes.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
 
-#include <accctrl.h>
 #include <psapi.h>
 
-/* Our own BLUE.SYS Driver for Console Output */
-#include <blue/ntddblue.h>
-
 /* External Winlogon Header */
 #include <winlogon.h>
 
 /* Internal CSRSS Headers */
-#include <api.h>
 #include <conio.h>
 #include <csrplugin.h>
 #include <desktopbg.h>
-#include "file.h"
 #include "guiconsole.h"
 #include "tuiconsole.h"
-#include <win32csr.h>
 
 /* Public Win32K Headers */
-#include <win32k/ntusrtyp.h>
 #include <win32k/ntuser.h>
-#include <win32k/callback.h>
-
-#include <tchar.h>
-#include <wchar.h>
-#include <cpl.h>
 
 #include "resource.h"
 
diff --git a/reactos/subsystems/win32/win32k/pch.h b/reactos/subsystems/win32/win32k/pch.h
index 67281678916..47fda2295d5 100644
--- a/reactos/subsystems/win32/win32k/pch.h
+++ b/reactos/subsystems/win32/win32k/pch.h
@@ -19,7 +19,14 @@
 #include <ntddmou.h>
 #include <ntifs.h>
 #include <tvout.h>
-#include <ntndk.h>
+#include <ndk/exfuncs.h>
+#include <ndk/kdfuncs.h>
+#include <ndk/kefuncs.h>
+#include <ndk/lpcfuncs.h>
+#include <ndk/mmfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/rtlfuncs.h>
 #include <ntstrsafe.h>
 
 /* Win32 Headers */