diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt
index a3ffa1ccbff..516e940dd37 100644
--- a/modules/rostests/apitests/win32nt/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/CMakeLists.txt
@@ -61,10 +61,13 @@ list(APPEND SOURCE
     ntuser/NtUserUpdatePerUserSystemParameters.c
 
     #osver.c
+    win32nt.h)
+
+add_executable(win32knt_apitest
+    ${SOURCE}
     testlist.c
     w32knapi.rc)
 
-add_executable(win32knt_apitest ${SOURCE})
 target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
 set_module_type(win32knt_apitest win32cui)
 add_importlibs(win32knt_apitest
@@ -78,4 +81,5 @@ add_importlibs(win32knt_apitest
     ntdll)
 
 add_dependencies(win32knt_apitest xdk)
+add_pch(win32knt_apitest win32nt.h SOURCE)
 add_rostests_file(TARGET win32knt_apitest)
diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
index 07961e9372d..1105860c6bb 100644
--- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
+++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
@@ -7,6 +7,8 @@
 
 #include <win32nt.h>
 
+#include <ddrawi.h>
+
 /* Note : OsThunkDdQueryDirectDrawObject is the usermode name of NtGdiDdQueryDirectDrawObject
  *        it lives in d3d8thk.dll and in windows 2000 it doing syscall direcly to win32k.sus
  *        in windows xp and higher it call to gdi32.dll to DdEntry41 and it doing the syscall
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
index 5239dc587b9..feb14b30c70 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
@@ -7,6 +7,8 @@
 
 #include <win32nt.h>
 
+#include <winreg.h>
+
 static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse";
 //static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1";
 //static const WCHAR* VAL_MOUSE2 = L"MouseThreshold2";
diff --git a/modules/rostests/apitests/win32nt/win32nt.h b/modules/rostests/apitests/win32nt/win32nt.h
index 3cd54f85bc7..6b0f6178d98 100644
--- a/modules/rostests/apitests/win32nt/win32nt.h
+++ b/modules/rostests/apitests/win32nt/win32nt.h
@@ -1,5 +1,5 @@
-
-#pragma once
+#ifndef _WIN32NT_APITEST_H_
+#define _WIN32NT_APITEST_H_
 
 /* Definitions */
 #define WIN32_NO_STATUS
@@ -11,34 +11,18 @@
 
 /* SDK/DDK/NDK Headers. */
 #include <stdio.h>
-#include <excpt.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
 #include <wingdi.h>
-#include <winuser.h>
-#include <wincon.h>
-#include <winnls.h>
-#include <winver.h>
-#include <winnetwk.h>
-#include <winreg.h>
-#include <winsvc.h>
 #include <objbase.h>
 #include <imm.h>
 
 #include <winddi.h>
 #include <prntfont.h>
-#include <winddiui.h>
-#include <winspool.h>
-#include <ddrawi.h>
-#include <ddrawgdi.h>
 
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/mmfuncs.h>
 
 /* Public Win32K Headers */
-#include <ntusrtyp.h>
 #include <ntuser.h>
-#include <callback.h>
 #include <ntgdityp.h>
 #include <ntgdi.h>
 #include <ntgdihdl.h>
@@ -51,4 +35,4 @@
 
 #define GdiHandleTable GdiQueryTable()
 
-
+#endif /* !_WIN32NT_APITEST_H_ */