diff --git a/reactos/subsystems/win/basesrv/basesrv.h b/reactos/subsystems/win/basesrv/basesrv.h
index 4a1b5dcb7bf..66e4efcdcf4 100644
--- a/reactos/subsystems/win/basesrv/basesrv.h
+++ b/reactos/subsystems/win/basesrv/basesrv.h
@@ -9,18 +9,19 @@
 #ifndef __BASESRV_H__
 #define __BASESRV_H__
 
-#pragma once
-
 /* PSDK/NDK Headers */
-#include <stdarg.h>
+#include <stdio.h>
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
 #define NTOS_MODE_USER
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/obfuncs.h>
+#include <ndk/psfuncs.h>
+#include <ndk/exfuncs.h>
+#include <ndk/umfuncs.h>
 
 /* PSEH for SEH Support */
 #include <pseh/pseh2.h>
@@ -63,6 +64,4 @@ extern HANDLE BaseSrvHeap;
 extern HANDLE BaseSrvSharedHeap;
 extern PBASE_STATIC_SERVER_DATA BaseStaticServerData;
 
-#endif // __BASESRV_H__
-
-/* EOF */
+#endif /* __BASESRV_H__ */
diff --git a/reactos/subsystems/win/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c
index b08d6bc5c69..49e9485304c 100644
--- a/reactos/subsystems/win/basesrv/init.c
+++ b/reactos/subsystems/win/basesrv/init.c
@@ -9,11 +9,14 @@
 /* INCLUDES *******************************************************************/
 
 #include "basesrv.h"
-#include "api.h"
+
+#include <winreg.h>
 
 #define NDEBUG
 #include <debug.h>
 
+#include "api.h"
+
 /* GLOBALS ********************************************************************/
 
 HANDLE BaseSrvDllInstance = NULL;
diff --git a/reactos/subsystems/win/basesrv/nls.c b/reactos/subsystems/win/basesrv/nls.c
index 4a40d211f0d..26de88cd9d8 100644
--- a/reactos/subsystems/win/basesrv/nls.c
+++ b/reactos/subsystems/win/basesrv/nls.c
@@ -10,6 +10,8 @@
 
 #include "basesrv.h"
 
+#include <ndk/mmfuncs.h>
+
 #define NDEBUG
 #include <debug.h>