diff --git a/reactos/subsys/system/winlogon/sas.c b/reactos/subsys/system/winlogon/sas.c
index 006b56fe00c..24dedb5a69f 100644
--- a/reactos/subsys/system/winlogon/sas.c
+++ b/reactos/subsys/system/winlogon/sas.c
@@ -9,18 +9,7 @@
  *                  Created 28/03/2004
  */
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <windows.h>
-#include <stdio.h>
-#include <ntsecapi.h>
-#include <wchar.h>
-#include <userenv.h>
-#include <reactos/winlogon.h>
-
-#include "setup.h"
 #include "winlogon.h"
-#include "resource.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/system/winlogon/winlogon.c b/reactos/subsys/system/winlogon/winlogon.c
index 2458e066522..3b089041cc8 100644
--- a/reactos/subsys/system/winlogon/winlogon.c
+++ b/reactos/subsys/system/winlogon/winlogon.c
@@ -10,18 +10,7 @@
  */
 
 /* INCLUDES *****************************************************************/
-
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <windows.h>
-#include <stdio.h>
-#include <ntsecapi.h>
-#include <wchar.h>
-#include <userenv.h>
-
-#include "setup.h"
 #include "winlogon.h"
-#include "resource.h"
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/system/winlogon/winlogon.h b/reactos/subsys/system/winlogon/winlogon.h
index 504d26ce07a..fde30ffb0e1 100644
--- a/reactos/subsys/system/winlogon/winlogon.h
+++ b/reactos/subsys/system/winlogon/winlogon.h
@@ -27,7 +27,17 @@
 #ifndef __WINLOGON_MAIN_H__
 #define __WINLOGON_MAIN_H__
 
+#include <windows.h>
+#include <ntsecapi.h>
+#include <userenv.h>
 #include <winwlx.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+#include <reactos/winlogon.h>
+
+#include "setup.h"
+#include "resource.h"
 
 VOID WINAPI WlxUseCtrlAltDel(HANDLE hWlx);
 VOID WINAPI WlxSetContextPointer(HANDLE hWlx, PVOID pWlxContext);
diff --git a/reactos/subsys/system/winlogon/wlx.c b/reactos/subsys/system/winlogon/wlx.c
index 3684a9073e2..6d8df8fec71 100644
--- a/reactos/subsys/system/winlogon/wlx.c
+++ b/reactos/subsys/system/winlogon/wlx.c
@@ -11,16 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntos.h>
-#include <windows.h>
-#include <stdio.h>
-#include <winwlx.h>
-#include <wchar.h>
-#include <reactos/winlogon.h>
-
-#include "setup.h"
 #include "winlogon.h"
-#include "resource.h"
 
 #define NDEBUG
 #include <debug.h>