diff --git a/modules/rostests/apitests/win32nt/CMakeLists.txt b/modules/rostests/apitests/win32nt/CMakeLists.txt
index 9968d8a0c9d..cab6970201e 100644
--- a/modules/rostests/apitests/win32nt/CMakeLists.txt
+++ b/modules/rostests/apitests/win32nt/CMakeLists.txt
@@ -76,7 +76,7 @@ list(APPEND PCH_SKIP_SOURCE
 add_executable(win32knt_apitest
     ${SOURCE}
     ${PCH_SKIP_SOURCE}
-    w32knapi.rc)
+    win32knt.rc)
 
 target_link_libraries(win32knt_apitest ${PSEH_LIB} gditools)
 set_module_type(win32knt_apitest win32cui)
diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c
index 4e0f5c8ec4f..5ba2958cec1 100644
--- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c
+++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdCreateDirectDrawObject.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiDdCreateDirectDrawObject)
 {
diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c
index 78d1af7a325..43cb7b92deb 100644
--- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c
+++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdDeleteDirectDrawObject.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiDdDeleteDirectDrawObject)
 {
diff --git a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
index 3b380dabbe0..16ffc45ec07 100644
--- a/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
+++ b/modules/rostests/apitests/win32nt/ntdd/NtGdiDdQueryDirectDrawObject.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 #include <ddrawi.h>
 
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c
index 8ff437e81f2..c8099055eed 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiArcInternal.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiArcInternal)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c
index 95f838f315c..e46dadf0f37 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiBitBlt.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiBitBlt)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c
index c5f27cc68ed..379207e79f8 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCombineRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiCombineRgn)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
index fd0bd1601a7..fee272af496 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateBitmap.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void Test_NtGdiCreateBitmap_Params(void)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c
index 34035295d07..5546f63c9d2 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleBitmap.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiCreateCompatibleBitmap)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c
index 9edb8e96201..013e6bbba39 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateCompatibleDC.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiCreateCompatibleDC)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c
index 07fcad20a45..94453326e43 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiCreateDIBSection.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 /*
 HBITMAP
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c
index a464f829d27..6332deedb38 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDeleteObjectApp.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiDeleteObjectApp)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c
index 9893cbe4875..1cd434c088f 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiDoPalette.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 HPALETTE
 CreateTestPalette()
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c
index a77d0c88fab..c8ec86b9db4 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEngCreatePalette.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiEngCreatePalette)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c
index 0393dbfbbb5..1dcadf6f7fa 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiEnumFontOpen)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c
index 6dd1a22a86e..df6fe63aed0 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExcludeClipRect.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiExcludeClipRect)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c
index 847c1377cef..996a45546b4 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtSelectClipRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiExtSelectClipRgn)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c
index 3a75f9f0b9f..a7c139e5463 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiExtTextOutW.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 /*
 BOOL
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c
index 729a7a49b5e..7fe302dc209 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiFlushUserBatch.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 NTSTATUS
 (NTAPI
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c
index e7d0f3e8edf..0a2cae7c8a1 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetBitmapBits.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiGetBitmapBits)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c
index f8069d60170..928af110fb2 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetDIBits.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 /* taken from gdi32, bitmap.c */
 UINT
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c
index 107a00b8148..b06426f9c36 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetFontResourceInfoInternalW.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiGetFontResourceInfoInternalW)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c
index 05c501ea752..09628aad653 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetRandomRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiGetRandomRgn)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c
index df14a9f3f46..72d2f66661e 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiGetStockObject.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiGetStockObject)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c
index cbe66134ab7..3d55be7bbc9 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiIntersectClipRect.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiIntersectClipRect)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c
index ef28a23c8f2..d6e2ce9f721 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiOffsetClipRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiOffsetClipRgn)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c
index 82b99fd0cff..a834a6ec4ec 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiPolyPolyDraw.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 static
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c
index 1eafc20b6a2..a36957304cb 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiRestoreDC.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 static HBRUSH hbrush;
 static HBITMAP hbitmap;
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c
index 0e39eb4d8bc..3799289de4c 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSaveDC.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiSaveDC)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c
index ec5acdec3a3..3e1fdeabb78 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBitmap.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 Test_SelectDIBSection(void)
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c
index 08451977cbb..d2db64e6e07 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectBrush.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiSelectBrush)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c
index 08e04b28a89..1ebc6b63782 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectFont.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiSelectFont)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c
index 67e6d66d7eb..3f0a0c32282 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSelectPen.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiSelectPen)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
index 8b6fa267436..96477898192 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetBitmapBits.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiSetBitmapBits)
 {
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c
index ff8e3e9dac9..dde7a5c18dd 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiSetDIBitsToDeviceInternal.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 ReadBits(HDC hDC, PDWORD OutBits)
diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c
index 33b4dfd4427..6f0e520baa4 100644
--- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c
+++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiTransformPoints.c
@@ -5,7 +5,7 @@
  * COPYRIGHT:   Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtGdiTransformPoints)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c
index 7fd68813611..fe43b81103c 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwnd.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 Test_HwndRoutine_DeregisterShellHookWindow(HWND hWnd)
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c
index c16bebe1649..aed4af88190 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndLock.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c
index 1d98af434da..aa345d1d599 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndOpt.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 Test_HwndOptRoutine_SetProgmanWindow(void) /* 0x4a */
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c
index 93f321c5f74..0b35a6bb284 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParam.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 Test_HwndParamRoutine_SetWindowContextHelpId(HWND hWnd)
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c
index 9868434f018..55b37ea7cb3 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallHwndParamLock.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserCallHwndParamLock)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c
index 1d269080bcd..da7905d1642 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallNoParam.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 void
 Test_NoParamRoutine_CreateMenu(void) /* 0 */
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c
index 1fce205bdaf..5b3c405e606 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCallOneParam.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c
index 5dccf655d6b..52281ee79b6 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCountClipboardFormats.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 START_TEST(NtUserCountClipboardFormats)
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c
index 45d9ea6fe3e..4b680725206 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c
@@ -4,7 +4,7 @@
  * PURPOSE:         Test for NtUserCreateWindowEx
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 static
 inline
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c
index 317234320f6..c600c248cbd 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplayMonitors.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 ULONG gMonitorCount = 0;
 HDC ghdcMonitor = 0;
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c
index 5a954489145..cd084fff16f 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserEnumDisplaySettings.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c
index 2356344e88d..9dae79fa969 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserFindExistingCursorIcon.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserFindExistingCursorIcon)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c
index 8e5e4cab544..c65ab07b974 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetAsyncKeyState.c
@@ -5,7 +5,7 @@
  * COPYRIGHT:   Copyright 2022 Thomas Faber (thomas.faber@reactos.org)
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserGetAsyncKeyState)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c
index 65002ced27a..3023d35c1c1 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserGetClassInfo)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c
index a5a2129987c..d89685782da 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetIconInfo.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
+#include "../resource.h"
 
 START_TEST(NtUserGetIconInfo)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
index 00e378dcddf..af8af7c44b4 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetKeyboardLayoutName.c
@@ -5,7 +5,7 @@
  * COPYRIGHT:   Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 #include <pseh/pseh2.h>
 
 typedef BOOL (APIENTRY *FN_NtUserGetKeyboardLayoutName)(PVOID);
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c
index 772d00b7355..d5e2712a023 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetThreadState.c
@@ -5,7 +5,7 @@
  * COPYRIGHT:   Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 #include <pseh/pseh2.h>
 
 #define MAX_COUNT 8
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c
index d9587462dc5..fb81c2370d6 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetTitleBarInfo.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserGetTitleBarInfo)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c
index 9ff9e7d82f4..eadf710ac6d 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserProcessConnect.c
@@ -6,7 +6,7 @@
  *              Copyright 2021 Hermes Belusca-Maito
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 #define NTOS_MODE_USER
 #include <ndk/exfuncs.h>
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c
index fda02281348..5d84fa39336 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserRedrawWindow.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserRedrawWindow)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c
index 4d9534563d0..a2daa8bbf80 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserScrollDC.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserScrollDC)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c
index 8c00d39f3b7..687709982a1 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSelectPalette.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 FORCEINLINE
 PALETTEENTRY
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c
index dd1067a5157..aad40f49698 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSetTimer.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserSetTimer)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
index 491a67d0c92..9ecef4907b4 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserSystemParametersInfo.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 #include <winreg.h>
 
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c
index 1263f19ac4c..2506783d885 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserToUnicodeEx.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 START_TEST(NtUserToUnicodeEx)
 {
diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c
index 274be855dc4..7ff974de766 100644
--- a/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c
+++ b/modules/rostests/apitests/win32nt/ntuser/NtUserUpdatePerUserSystemParameters.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:
  */
 
-#include <win32nt.h>
+#include "../win32nt.h"
 
 
 
diff --git a/modules/rostests/apitests/win32nt/w32knapi.h b/modules/rostests/apitests/win32nt/w32knapi.h
index 57f00a63fa7..a2bfab000c0 100644
--- a/modules/rostests/apitests/win32nt/w32knapi.h
+++ b/modules/rostests/apitests/win32nt/w32knapi.h
@@ -27,7 +27,6 @@
 #include <ntgdihdl.h>
 
 #include "../apitest.h"
-#include "resource.h"
 
 typedef struct
 {
diff --git a/modules/rostests/apitests/win32nt/w32knapi.rc b/modules/rostests/apitests/win32nt/win32knt.rc
similarity index 100%
rename from modules/rostests/apitests/win32nt/w32knapi.rc
rename to modules/rostests/apitests/win32nt/win32knt.rc