diff --git a/reactos/subsys/csrss/api/handle.c b/reactos/subsys/csrss/api/handle.c
index 2ff795b65d4..8ee6758a408 100644
--- a/reactos/subsys/csrss/api/handle.c
+++ b/reactos/subsys/csrss/api/handle.c
@@ -9,9 +9,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #include "api.h"
 
 #define NDEBUG
diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsys/csrss/api/process.c
index 70d765ea733..ebf3f0e17ce 100644
--- a/reactos/subsys/csrss/api/process.c
+++ b/reactos/subsys/csrss/api/process.c
@@ -9,9 +9,10 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 #include "api.h"
 #include "conio.h"
 
diff --git a/reactos/subsys/csrss/api/user.c b/reactos/subsys/csrss/api/user.c
index 1a6cf9fcc24..cb34595ad5e 100644
--- a/reactos/subsys/csrss/api/user.c
+++ b/reactos/subsys/csrss/api/user.c
@@ -9,11 +9,11 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <ddk/ntddk.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
-#include <csrss/csrss.h>
 #include "api.h"
-#include <ntdll/rtl.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsys/csrss/api/wapi.c
index efb189c9f7a..4a50bed7893 100644
--- a/reactos/subsys/csrss/api/wapi.c
+++ b/reactos/subsys/csrss/api/wapi.c
@@ -10,18 +10,16 @@
 
 /* INCLUDES ******************************************************************/
 
+#include <windows.h>
 #define NTOS_MODE_USER
-#include <ntos.h>
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-
+#include <ndk/ntndk.h>
+#include <rosrtl/thread.h>
 
+#include "api.h"
 
 #define NDEBUG
 #include <debug.h>
 
-#include "api.h"
-
 /* GLOBALS *******************************************************************/
 
 HANDLE CsrssApiHeap = (HANDLE) 0;
diff --git a/reactos/subsys/csrss/csrss.c b/reactos/subsys/csrss/csrss.c
index 5114f539522..39460e11b39 100644
--- a/reactos/subsys/csrss/csrss.c
+++ b/reactos/subsys/csrss/csrss.c
@@ -31,8 +31,10 @@
  * 		First standalone run under ReactOS (it
  * 		actually does nothing but running).
  */
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <csrss/csrss.h>
 #include <rosrtl/string.h>
 #include <reactos/buildno.h>
diff --git a/reactos/subsys/csrss/include/api.h b/reactos/subsys/csrss/include/api.h
index ae4bdc1fa90..13d3a0a857e 100644
--- a/reactos/subsys/csrss/include/api.h
+++ b/reactos/subsys/csrss/include/api.h
@@ -9,7 +9,8 @@
 #ifndef API_H_INCLUDED
 #define API_H_INCLUDED
 
-#include <ntos.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #include <csrss/csrss.h>
 
diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c
index e8510b33187..5a2b8233065 100644
--- a/reactos/subsys/csrss/init.c
+++ b/reactos/subsys/csrss/init.c
@@ -10,12 +10,12 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <csrss/csrss.h>
-#include <ddk/ntddk.h>
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <ntdll/csr.h>
 #include <ntdll/rtl.h>
 #include <ntdll/ldr.h>
-#include <win32k/win32k.h>
 #include <rosrtl/string.h>
 #include <sm/helper.h>
 
@@ -423,15 +423,15 @@ CsrpLoadKernelModeDriver (ULONG argc, PWSTR* argv)
 	if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0]))
 	{
 		WCHAR                      ImagePath [MAX_PATH + 1] = {0};
-		SYSTEM_LOAD_AND_CALL_IMAGE ImageInfo;
+		UNICODE_STRING             ModuleName;
 
 		wcscpy (ImagePath, L"\\??\\");
 		wcscat (ImagePath, Data);
-		RtlZeroMemory (& ImageInfo, sizeof ImageInfo);
-		RtlInitUnicodeString (& ImageInfo.ModuleName, ImagePath);
-		Status = NtSetSystemInformation(SystemLoadAndCallImage,
-						& ImageInfo,
-						sizeof ImageInfo);
+		RtlInitUnicodeString (& ModuleName, ImagePath);
+		Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */
+		                                SystemExtendServiceTableInformation,
+						& ModuleName,
+						sizeof ModuleName);
 		if(!NT_SUCCESS(Status))
 		{
 			DPRINT("WIN: %s: loading Kmode failed (Status=0x%08lx)\n",
diff --git a/reactos/subsys/csrss/print.c b/reactos/subsys/csrss/print.c
index 2cef0e469c7..87862afa4d2 100644
--- a/reactos/subsys/csrss/print.c
+++ b/reactos/subsys/csrss/print.c
@@ -27,9 +27,10 @@
  * 		Compiled successfully with egcs 1.1.2
  */
 
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <csrss/csrss.h>
-#include <ddk/ntddk.h>
-#include <ntos.h>
 
 VOID STDCALL DisplayString(LPCWSTR lpwString)
 {
diff --git a/reactos/subsys/csrss/video.c b/reactos/subsys/csrss/video.c
index 0649900c06f..3964addbe2e 100644
--- a/reactos/subsys/csrss/video.c
+++ b/reactos/subsys/csrss/video.c
@@ -4,8 +4,8 @@
  */
 
 #include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntapi.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <rosrtl/string.h>
 
 ULONG
diff --git a/reactos/subsys/csrss/win32csr/conio.c b/reactos/subsys/csrss/win32csr/conio.c
index 5468951fe1a..a18f52a006f 100644
--- a/reactos/subsys/csrss/win32csr/conio.c
+++ b/reactos/subsys/csrss/win32csr/conio.c
@@ -8,15 +8,15 @@
 
 /* INCLUDES ******************************************************************/
 
-#include <string.h>
 #include <windows.h>
-
-#include <csrss/csrss.h>
-#include <ntdll/rtl.h>
-#include <ntdll/ldr.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <ddk/ntddblue.h>
 #include <rosrtl/string.h>
 #include <rosrtl/minmax.h>
+
+#include <string.h>
+
 #include "api.h"
 #include "conio.h"
 #include "desktopbg.h"
diff --git a/reactos/subsys/csrss/win32csr/desktopbg.c b/reactos/subsys/csrss/win32csr/desktopbg.c
index 0eb3bd5ccf7..4862cb718f4 100644
--- a/reactos/subsys/csrss/win32csr/desktopbg.c
+++ b/reactos/subsys/csrss/win32csr/desktopbg.c
@@ -7,20 +7,9 @@
  * ReactOS Operating System
  */
 
-/*
- * There is a problem with size of LPC_MESSAGE structure. In the old ReactOS
- * headers it doesn't contain the data field and so it has a different size.
- * We must use this workaround to get our Data field 0-sized.
- */
-
-#include <windef.h>
-#include <winnt.h>
-#undef ANYSIZE_ARRAY
-#define ANYSIZE_ARRAY 0
-#include <ddk/ntapi.h>
-
 #include <windows.h>
-#include <csrss/csrss.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 #include "api.h"
 #include "desktopbg.h"
diff --git a/reactos/subsys/csrss/win32csr/exitros.c b/reactos/subsys/csrss/win32csr/exitros.c
index 11a0f247986..ea79baafdf1 100644
--- a/reactos/subsys/csrss/win32csr/exitros.c
+++ b/reactos/subsys/csrss/win32csr/exitros.c
@@ -9,7 +9,10 @@
 /* INCLUDES ******************************************************************/
 
 #include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 #include <reactos/winlogon.h>
+
 #include "api.h"
 #include "win32csr.h"