diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index a28fa473d1c..b7d7a29e3c4 100644
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(
+    include)
 
 add_library(apitest apitest.c)
 
diff --git a/rostests/apitests/advapi32/CreateService.c b/rostests/apitests/advapi32/CreateService.c
index eef0df83e54..0c9022b9d99 100644
--- a/rostests/apitests/advapi32/CreateService.c
+++ b/rostests/apitests/advapi32/CreateService.c
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Thomas Faber
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winreg.h>
 #include <winsvc.h>
 #include <strsafe.h>
diff --git a/rostests/apitests/advapi32/LockDatabase.c b/rostests/apitests/advapi32/LockDatabase.c
index 3933c36939e..ddc3fcdbc26 100644
--- a/rostests/apitests/advapi32/LockDatabase.c
+++ b/rostests/apitests/advapi32/LockDatabase.c
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winsvc.h>
 #include <strsafe.h>
 
diff --git a/rostests/apitests/advapi32/QueryServiceConfig2.c b/rostests/apitests/advapi32/QueryServiceConfig2.c
index d5c920c78da..133b9a26acd 100644
--- a/rostests/apitests/advapi32/QueryServiceConfig2.c
+++ b/rostests/apitests/advapi32/QueryServiceConfig2.c
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <winreg.h>
 #include <winsvc.h>
 #include <strsafe.h>
diff --git a/rostests/apitests/advapi32/SaferIdentifyLevel.c b/rostests/apitests/advapi32/SaferIdentifyLevel.c
index c0aba386f85..c6ed54f322e 100644
--- a/rostests/apitests/advapi32/SaferIdentifyLevel.c
+++ b/rostests/apitests/advapi32/SaferIdentifyLevel.c
@@ -5,17 +5,13 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
-#include <wine/test.h>
 #include <windows.h>
 #include <ndk/ntndk.h>
 #include <winsafer.h>
 
-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
-#define InvalidPointer ((PVOID)0x5555555555555555ULL)
-
 #define SaferIdentifyLevel(c, p, h, r) SaferIdentifyLevel(c, (PSAFER_CODE_PROPERTIES)(p), h, r)
 
 START_TEST(SaferIdentifyLevel)
diff --git a/rostests/apitests/advapi32/testlist.c b/rostests/apitests/advapi32/testlist.c
index d5debe96f3d..2d8697627d6 100644
--- a/rostests/apitests/advapi32/testlist.c
+++ b/rostests/apitests/advapi32/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_CreateService(void);
 extern void func_LockDatabase(void);
diff --git a/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/rostests/apitests/browseui/SHExplorerParseCmdLine.c
index 59fb9bbccba..ef300a5d363 100644
--- a/rostests/apitests/browseui/SHExplorerParseCmdLine.c
+++ b/rostests/apitests/browseui/SHExplorerParseCmdLine.c
@@ -5,8 +5,9 @@
  * PROGRAMMER:      Thomas Faber
  */
 
-#define UNICODE
-#include <wine/test.h>
+#include <apitest.h>
+
+//#define UNICODE
 #include <strsafe.h>
 #include <shlobj.h>
 
@@ -128,8 +129,8 @@ START_TEST(SHExplorerParseCmdLine)
     WCHAR OriginalCommandLine[1024];
     int i;
 
-    CommandLine = GetCommandLine();
-    (VOID)StringCbCopy(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine);
+    CommandLine = GetCommandLineW();
+    StringCbCopyW(OriginalCommandLine, sizeof(OriginalCommandLine), CommandLine);
 
     for (i = 0; i < TestCount; i++)
     {
diff --git a/rostests/apitests/browseui/testlist.c b/rostests/apitests/browseui/testlist.c
index 6a47ca483e7..9ab96c76775 100644
--- a/rostests/apitests/browseui/testlist.c
+++ b/rostests/apitests/browseui/testlist.c
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>
 
 extern void func_SHExplorerParseCmdLine(void);
 
diff --git a/rostests/apitests/com/testlist.c b/rostests/apitests/com/testlist.c
index 941a9916e69..100d2a9232d 100644
--- a/rostests/apitests/com/testlist.c
+++ b/rostests/apitests/com/testlist.c
@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <apitest.h>
 
 extern void func_browseui(void);
 extern void func_ieframe(void);
diff --git a/rostests/apitests/crt/_vscprintf.c b/rostests/apitests/crt/_vscprintf.c
index 7396995dce9..cc8481ee26c 100644
--- a/rostests/apitests/crt/_vscprintf.c
+++ b/rostests/apitests/crt/_vscprintf.c
@@ -4,8 +4,9 @@
  * PURPOSE:         Test for _vscprintf
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>
 
diff --git a/rostests/apitests/crt/_vscwprintf.c b/rostests/apitests/crt/_vscwprintf.c
index 308cf62a395..0195f7cc5a0 100644
--- a/rostests/apitests/crt/_vscwprintf.c
+++ b/rostests/apitests/crt/_vscwprintf.c
@@ -4,8 +4,9 @@
  * PURPOSE:         Test for _vscprintf
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <errno.h>
 
diff --git a/rostests/apitests/crt/_vsnprintf.c b/rostests/apitests/crt/_vsnprintf.c
index e7657c3c98b..5b607584a47 100644
--- a/rostests/apitests/crt/_vsnprintf.c
+++ b/rostests/apitests/crt/_vsnprintf.c
@@ -4,17 +4,15 @@
  * PURPOSE:         Test for _vsnprintf
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/rtlfuncs.h>
 
-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static void call_varargs(char* buf, size_t buf_size, int expected_ret, LPCSTR formatString, ...)
 {
     va_list args;
diff --git a/rostests/apitests/crt/_vsnwprintf.c b/rostests/apitests/crt/_vsnwprintf.c
index e37616cc9fb..58fb97bed93 100644
--- a/rostests/apitests/crt/_vsnwprintf.c
+++ b/rostests/apitests/crt/_vsnwprintf.c
@@ -4,17 +4,15 @@
  * PURPOSE:         Test for _vsnprintf
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
 #include <ndk/rtlfuncs.h>
 
-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static void call_varargs(wchar_t* buf, size_t buf_size, int expected_ret, LPCWSTR formatString, ...)
 {
     va_list args;
diff --git a/rostests/apitests/crt/mbstowcs_s.c b/rostests/apitests/crt/mbstowcs_s.c
index e78ac10adbf..3976fd6a3f7 100644
--- a/rostests/apitests/crt/mbstowcs_s.c
+++ b/rostests/apitests/crt/mbstowcs_s.c
@@ -4,10 +4,11 @@
  * PURPOSE:         Test for mbstowcs_s
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
 #include <stdlib.h>
-#include <wine/test.h>
 #include <specstrings.h>
 
 #define ok_errno(x) ok_hex(errno, (x))
diff --git a/rostests/apitests/crt/sprintf.c b/rostests/apitests/crt/sprintf.c
index 27658f27aab..b0f221556dd 100644
--- a/rostests/apitests/crt/sprintf.c
+++ b/rostests/apitests/crt/sprintf.c
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <tchar.h>
 #include <pseh/pseh2.h>
 #include <ndk/mmfuncs.h>
@@ -19,9 +20,6 @@
 #pragma GCC diagnostic ignored "-Wnonnull"
 #endif
 
-#define StartSeh()              ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY {
-#define EndSeh(ExpectedStatus)  } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok(ExceptionStatus == ExpectedStatus, "Exception %lx, expected %lx\n", ExceptionStatus, ExpectedStatus)
-
 static
 PVOID
 AllocateGuarded(
diff --git a/rostests/apitests/crt/strcpy.c b/rostests/apitests/crt/strcpy.c
index a44623f1f53..a246a197637 100644
--- a/rostests/apitests/crt/strcpy.c
+++ b/rostests/apitests/crt/strcpy.c
@@ -1,6 +1,7 @@
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 
 START_TEST(strcpy)
 {
diff --git a/rostests/apitests/crt/testlist.c b/rostests/apitests/crt/testlist.c
index 557a19c5593..12532923837 100644
--- a/rostests/apitests/crt/testlist.c
+++ b/rostests/apitests/crt/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 #if defined(TEST_MSVCRT)
 extern void func_mbstowcs_s(void);
diff --git a/rostests/apitests/crt/wcstombs_s.c b/rostests/apitests/crt/wcstombs_s.c
index 17105612b7a..324de4468c3 100644
--- a/rostests/apitests/crt/wcstombs_s.c
+++ b/rostests/apitests/crt/wcstombs_s.c
@@ -4,10 +4,11 @@
  * PURPOSE:         Test for wcstombs_s
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
 #include <stdlib.h>
-#include <wine/test.h>
 #include <specstrings.h>
 
 #define ok_errno(x) ok_hex(errno, (x))
diff --git a/rostests/apitests/dciman32/DCICreatePrimary.c b/rostests/apitests/dciman32/DCICreatePrimary.c
index e368f59cb30..afd27175f3a 100644
--- a/rostests/apitests/dciman32/DCICreatePrimary.c
+++ b/rostests/apitests/dciman32/DCICreatePrimary.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
 
 void Test_DCICreatePrimary()
 {
diff --git a/rostests/apitests/dciman32/testlist.c b/rostests/apitests/dciman32/testlist.c
index c1d8a80e327..76d74d29f65 100644
--- a/rostests/apitests/dciman32/testlist.c
+++ b/rostests/apitests/dciman32/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_DCICreatePrimary(void);
 
diff --git a/rostests/apitests/gdi32/AddFontResource.c b/rostests/apitests/gdi32/AddFontResource.c
index 434603097f0..6a67699d932 100644
--- a/rostests/apitests/gdi32/AddFontResource.c
+++ b/rostests/apitests/gdi32/AddFontResource.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
+#include <apitest.h>
+
 #include <wine/test.h>
 #include <wingdi.h>
 
diff --git a/rostests/apitests/gdi32/AddFontResourceEx.c b/rostests/apitests/gdi32/AddFontResourceEx.c
index c6b5254057c..56d034479db 100644
--- a/rostests/apitests/gdi32/AddFontResourceEx.c
+++ b/rostests/apitests/gdi32/AddFontResourceEx.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <libs/pseh/pseh2.h>
 
diff --git a/rostests/apitests/gdi32/BeginPath.c b/rostests/apitests/gdi32/BeginPath.c
index 1458d1bd5de..db4761dfe21 100644
--- a/rostests/apitests/gdi32/BeginPath.c
+++ b/rostests/apitests/gdi32/BeginPath.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_BeginPath()
diff --git a/rostests/apitests/gdi32/CombineRgn.c b/rostests/apitests/gdi32/CombineRgn.c
index 209f7207e6c..7be5bf70ad0 100644
--- a/rostests/apitests/gdi32/CombineRgn.c
+++ b/rostests/apitests/gdi32/CombineRgn.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_CombineRgn_Params()
diff --git a/rostests/apitests/gdi32/CombineTransform.c b/rostests/apitests/gdi32/CombineTransform.c
index 7085b5e2126..679d34c74b3 100644
--- a/rostests/apitests/gdi32/CombineTransform.c
+++ b/rostests/apitests/gdi32/CombineTransform.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 
diff --git a/rostests/apitests/gdi32/CreateBitmap.c b/rostests/apitests/gdi32/CreateBitmap.c
index e4da9ee91ad..78a90715de1 100644
--- a/rostests/apitests/gdi32/CreateBitmap.c
+++ b/rostests/apitests/gdi32/CreateBitmap.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define DEFAULT_BITMAP 21
diff --git a/rostests/apitests/gdi32/CreateBitmapIndirect.c b/rostests/apitests/gdi32/CreateBitmapIndirect.c
index 25d81c39151..fb448d99024 100644
--- a/rostests/apitests/gdi32/CreateBitmapIndirect.c
+++ b/rostests/apitests/gdi32/CreateBitmapIndirect.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_CreateBitmapIndirect()
diff --git a/rostests/apitests/gdi32/CreateCompatibleDC.c b/rostests/apitests/gdi32/CreateCompatibleDC.c
index e4cb51bbcfa..3d7c7dc6c2e 100644
--- a/rostests/apitests/gdi32/CreateCompatibleDC.c
+++ b/rostests/apitests/gdi32/CreateCompatibleDC.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/CreateDIBPatternBrush.c b/rostests/apitests/gdi32/CreateDIBPatternBrush.c
index 36578e4cd9d..ea259556bbf 100644
--- a/rostests/apitests/gdi32/CreateDIBPatternBrush.c
+++ b/rostests/apitests/gdi32/CreateDIBPatternBrush.c
@@ -5,12 +5,11 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
-
 #include "init.h"
 
-
 void Test_CreateDIBPatternBrush()
 {
 
diff --git a/rostests/apitests/gdi32/CreateDIBitmap.c b/rostests/apitests/gdi32/CreateDIBitmap.c
index 0c75f16fbc1..3be66e8da3d 100644
--- a/rostests/apitests/gdi32/CreateDIBitmap.c
+++ b/rostests/apitests/gdi32/CreateDIBitmap.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 #include <pseh/pseh2.h>
diff --git a/rostests/apitests/gdi32/CreateFont.c b/rostests/apitests/gdi32/CreateFont.c
index 0422395776f..e4a378de4eb 100644
--- a/rostests/apitests/gdi32/CreateFont.c
+++ b/rostests/apitests/gdi32/CreateFont.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define INVALIDFONT "ThisFontDoesNotExist"
diff --git a/rostests/apitests/gdi32/CreateFontIndirect.c b/rostests/apitests/gdi32/CreateFontIndirect.c
index fe8127147c8..c017b2ea75e 100644
--- a/rostests/apitests/gdi32/CreateFontIndirect.c
+++ b/rostests/apitests/gdi32/CreateFontIndirect.c
@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
-#include <wingdi.h>
+#include <apitest.h>
 
+#include <wingdi.h>
 
 void
 Test_CreateFontIndirectA(void)
diff --git a/rostests/apitests/gdi32/CreateIconIndirect.c b/rostests/apitests/gdi32/CreateIconIndirect.c
index 59e70009103..bfd78e2add2 100644
--- a/rostests/apitests/gdi32/CreateIconIndirect.c
+++ b/rostests/apitests/gdi32/CreateIconIndirect.c
@@ -1,5 +1,6 @@
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/CreatePen.c b/rostests/apitests/gdi32/CreatePen.c
index 1f818b4c287..ad03b3b804b 100644
--- a/rostests/apitests/gdi32/CreatePen.c
+++ b/rostests/apitests/gdi32/CreatePen.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
diff --git a/rostests/apitests/gdi32/CreateRectRgn.c b/rostests/apitests/gdi32/CreateRectRgn.c
index bbe17692554..e5904696f3c 100644
--- a/rostests/apitests/gdi32/CreateRectRgn.c
+++ b/rostests/apitests/gdi32/CreateRectRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
 
 void Test_CreateRectRgn()
 {
diff --git a/rostests/apitests/gdi32/DPtoLP.c b/rostests/apitests/gdi32/DPtoLP.c
index 3ecd0faf6d8..940e7a7e5e1 100644
--- a/rostests/apitests/gdi32/DPtoLP.c
+++ b/rostests/apitests/gdi32/DPtoLP.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/EngAcquireSemaphore.c b/rostests/apitests/gdi32/EngAcquireSemaphore.c
index fadb8f937e7..94014546a12 100644
--- a/rostests/apitests/gdi32/EngAcquireSemaphore.c
+++ b/rostests/apitests/gdi32/EngAcquireSemaphore.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 
diff --git a/rostests/apitests/gdi32/EngCreateSemaphore.c b/rostests/apitests/gdi32/EngCreateSemaphore.c
index e2d487715b5..eb6ccec67a2 100644
--- a/rostests/apitests/gdi32/EngCreateSemaphore.c
+++ b/rostests/apitests/gdi32/EngCreateSemaphore.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 
diff --git a/rostests/apitests/gdi32/EngDeleteSemaphore.c b/rostests/apitests/gdi32/EngDeleteSemaphore.c
index 25dad71f2b9..f129fb94c73 100644
--- a/rostests/apitests/gdi32/EngDeleteSemaphore.c
+++ b/rostests/apitests/gdi32/EngDeleteSemaphore.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 
diff --git a/rostests/apitests/gdi32/EngReleaseSemaphore.c b/rostests/apitests/gdi32/EngReleaseSemaphore.c
index c1e3e7cbad5..c6d20bb89e5 100644
--- a/rostests/apitests/gdi32/EngReleaseSemaphore.c
+++ b/rostests/apitests/gdi32/EngReleaseSemaphore.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 
diff --git a/rostests/apitests/gdi32/ExtCreatePen.c b/rostests/apitests/gdi32/ExtCreatePen.c
index 84c0f95d9a0..3c625477021 100644
--- a/rostests/apitests/gdi32/ExtCreatePen.c
+++ b/rostests/apitests/gdi32/ExtCreatePen.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
diff --git a/rostests/apitests/gdi32/GdiConvertBitmap.c b/rostests/apitests/gdi32/GdiConvertBitmap.c
index fb3a0a02774..78f5899ad30 100644
--- a/rostests/apitests/gdi32/GdiConvertBitmap.c
+++ b/rostests/apitests/gdi32/GdiConvertBitmap.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);
diff --git a/rostests/apitests/gdi32/GdiConvertBrush.c b/rostests/apitests/gdi32/GdiConvertBrush.c
index 640a268cfe8..4fb97f3e2b1 100644
--- a/rostests/apitests/gdi32/GdiConvertBrush.c
+++ b/rostests/apitests/gdi32/GdiConvertBrush.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);
diff --git a/rostests/apitests/gdi32/GdiConvertDC.c b/rostests/apitests/gdi32/GdiConvertDC.c
index 4ad2b1ba33b..dd9f7368611 100644
--- a/rostests/apitests/gdi32/GdiConvertDC.c
+++ b/rostests/apitests/gdi32/GdiConvertDC.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HDC WINAPI GdiConvertDC(HDC hdc);
diff --git a/rostests/apitests/gdi32/GdiConvertFont.c b/rostests/apitests/gdi32/GdiConvertFont.c
index 48bdc79eb26..d8e90785b38 100644
--- a/rostests/apitests/gdi32/GdiConvertFont.c
+++ b/rostests/apitests/gdi32/GdiConvertFont.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HFONT WINAPI GdiConvertFont(HFONT);
diff --git a/rostests/apitests/gdi32/GdiConvertPalette.c b/rostests/apitests/gdi32/GdiConvertPalette.c
index 7721beb6656..85dc8787b0d 100644
--- a/rostests/apitests/gdi32/GdiConvertPalette.c
+++ b/rostests/apitests/gdi32/GdiConvertPalette.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HPALETTE WINAPI GdiConvertPalette(HPALETTE);
diff --git a/rostests/apitests/gdi32/GdiConvertRegion.c b/rostests/apitests/gdi32/GdiConvertRegion.c
index 503fd4db08c..028842c13b8 100644
--- a/rostests/apitests/gdi32/GdiConvertRegion.c
+++ b/rostests/apitests/gdi32/GdiConvertRegion.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HRGN WINAPI GdiConvertRegion(HRGN);
diff --git a/rostests/apitests/gdi32/GdiDeleteLocalDC.c b/rostests/apitests/gdi32/GdiDeleteLocalDC.c
index 76194c2f03b..6de9eba2421 100644
--- a/rostests/apitests/gdi32/GdiDeleteLocalDC.c
+++ b/rostests/apitests/gdi32/GdiDeleteLocalDC.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiDeleteLocalDC(HDC);
diff --git a/rostests/apitests/gdi32/GdiGetCharDimensions.c b/rostests/apitests/gdi32/GdiGetCharDimensions.c
index 24672e620ab..2f03dfe2e79 100644
--- a/rostests/apitests/gdi32/GdiGetCharDimensions.c
+++ b/rostests/apitests/gdi32/GdiGetCharDimensions.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GdiGetCharDimensions()
diff --git a/rostests/apitests/gdi32/GdiGetLocalBrush.c b/rostests/apitests/gdi32/GdiGetLocalBrush.c
index 76e13237f60..7af9a1a89bb 100644
--- a/rostests/apitests/gdi32/GdiGetLocalBrush.c
+++ b/rostests/apitests/gdi32/GdiGetLocalBrush.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);
diff --git a/rostests/apitests/gdi32/GdiGetLocalDC.c b/rostests/apitests/gdi32/GdiGetLocalDC.c
index 2c9b1cf40e0..e445da1e874 100644
--- a/rostests/apitests/gdi32/GdiGetLocalDC.c
+++ b/rostests/apitests/gdi32/GdiGetLocalDC.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 HDC WINAPI GdiGetLocalDC(HDC);
diff --git a/rostests/apitests/gdi32/GdiReleaseLocalDC.c b/rostests/apitests/gdi32/GdiReleaseLocalDC.c
index a65f63a8251..2c9572ce9ff 100644
--- a/rostests/apitests/gdi32/GdiReleaseLocalDC.c
+++ b/rostests/apitests/gdi32/GdiReleaseLocalDC.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiReleaseLocalDC(HDC);
diff --git a/rostests/apitests/gdi32/GdiSetAttrs.c b/rostests/apitests/gdi32/GdiSetAttrs.c
index 7e7ef1c1eb8..537250efc7d 100644
--- a/rostests/apitests/gdi32/GdiSetAttrs.c
+++ b/rostests/apitests/gdi32/GdiSetAttrs.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 BOOL WINAPI GdiSetAttrs(HDC);
diff --git a/rostests/apitests/gdi32/GetClipRgn.c b/rostests/apitests/gdi32/GetClipRgn.c
index 619836ce772..c952d22c9e9 100644
--- a/rostests/apitests/gdi32/GetClipRgn.c
+++ b/rostests/apitests/gdi32/GetClipRgn.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/GetCurrentObject.c b/rostests/apitests/gdi32/GetCurrentObject.c
index 65a175951a4..5aea2653090 100644
--- a/rostests/apitests/gdi32/GetCurrentObject.c
+++ b/rostests/apitests/gdi32/GetCurrentObject.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
diff --git a/rostests/apitests/gdi32/GetDIBColorTable.c b/rostests/apitests/gdi32/GetDIBColorTable.c
index feeac824d00..ff700910c8c 100644
--- a/rostests/apitests/gdi32/GetDIBColorTable.c
+++ b/rostests/apitests/gdi32/GetDIBColorTable.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GetDIBColorTable()
diff --git a/rostests/apitests/gdi32/GetDIBits.c b/rostests/apitests/gdi32/GetDIBits.c
index 7f03a81e919..86aa6d3375e 100644
--- a/rostests/apitests/gdi32/GetDIBits.c
+++ b/rostests/apitests/gdi32/GetDIBits.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/GetObject.c b/rostests/apitests/gdi32/GetObject.c
index 5a6fa021523..6ab39eecaa2 100644
--- a/rostests/apitests/gdi32/GetObject.c
+++ b/rostests/apitests/gdi32/GetObject.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
diff --git a/rostests/apitests/gdi32/GetPixel.c b/rostests/apitests/gdi32/GetPixel.c
index d8e14cff9a9..ddd6ed791d1 100644
--- a/rostests/apitests/gdi32/GetPixel.c
+++ b/rostests/apitests/gdi32/GetPixel.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_GetPixel_1bpp()
diff --git a/rostests/apitests/gdi32/GetRandomRgn.c b/rostests/apitests/gdi32/GetRandomRgn.c
index 947dd4e89c7..e2f4d74e5cc 100644
--- a/rostests/apitests/gdi32/GetRandomRgn.c
+++ b/rostests/apitests/gdi32/GetRandomRgn.c
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/GetStockObject.c b/rostests/apitests/gdi32/GetStockObject.c
index 14c9336543e..4f7c01ec0cc 100644
--- a/rostests/apitests/gdi32/GetStockObject.c
+++ b/rostests/apitests/gdi32/GetStockObject.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
diff --git a/rostests/apitests/gdi32/GetTextExtentExPoint.c b/rostests/apitests/gdi32/GetTextExtentExPoint.c
index 35b9ad90a5e..594838c14fe 100644
--- a/rostests/apitests/gdi32/GetTextExtentExPoint.c
+++ b/rostests/apitests/gdi32/GetTextExtentExPoint.c
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/GetTextFace.c b/rostests/apitests/gdi32/GetTextFace.c
index dba06d3acc2..9686d1b6600 100644
--- a/rostests/apitests/gdi32/GetTextFace.c
+++ b/rostests/apitests/gdi32/GetTextFace.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 #define TEST(x) ok(x, #x"\n")
diff --git a/rostests/apitests/gdi32/MaskBlt.c b/rostests/apitests/gdi32/MaskBlt.c
index 492aa9a2930..dcdcda16046 100644
--- a/rostests/apitests/gdi32/MaskBlt.c
+++ b/rostests/apitests/gdi32/MaskBlt.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/PatBlt.c b/rostests/apitests/gdi32/PatBlt.c
index 18832f19b48..c80f519f4a6 100644
--- a/rostests/apitests/gdi32/PatBlt.c
+++ b/rostests/apitests/gdi32/PatBlt.c
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 
 HBITMAP ghbmpTarget;
diff --git a/rostests/apitests/gdi32/Rectangle.c b/rostests/apitests/gdi32/Rectangle.c
index 4dfa212977f..308680c7ceb 100644
--- a/rostests/apitests/gdi32/Rectangle.c
+++ b/rostests/apitests/gdi32/Rectangle.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_Rectangle(void)
diff --git a/rostests/apitests/gdi32/SelectObject.c b/rostests/apitests/gdi32/SelectObject.c
index 77cfb3a1db9..077593b507f 100644
--- a/rostests/apitests/gdi32/SelectObject.c
+++ b/rostests/apitests/gdi32/SelectObject.c
@@ -5,8 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
+#include <apitest.h>
+
 #include <stdio.h>
-#include <wine/test.h>
 #include <wingdi.h>
 #include <winddi.h>
 #include <winuser.h>
diff --git a/rostests/apitests/gdi32/SetBrushOrgEx.c b/rostests/apitests/gdi32/SetBrushOrgEx.c
index 576d1355428..fdc9f7e40a4 100644
--- a/rostests/apitests/gdi32/SetBrushOrgEx.c
+++ b/rostests/apitests/gdi32/SetBrushOrgEx.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <pseh/pseh2.h>
 
diff --git a/rostests/apitests/gdi32/SetDCPenColor.c b/rostests/apitests/gdi32/SetDCPenColor.c
index bd3c4689bb8..0f91656badb 100644
--- a/rostests/apitests/gdi32/SetDCPenColor.c
+++ b/rostests/apitests/gdi32/SetDCPenColor.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/SetDIBits.c b/rostests/apitests/gdi32/SetDIBits.c
index 84405fac1f6..6a008148916 100644
--- a/rostests/apitests/gdi32/SetDIBits.c
+++ b/rostests/apitests/gdi32/SetDIBits.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 
 void Test_SetDIBits()
diff --git a/rostests/apitests/gdi32/SetDIBitsToDevice.c b/rostests/apitests/gdi32/SetDIBitsToDevice.c
index 18f4a88bdc2..8b36866fbe4 100644
--- a/rostests/apitests/gdi32/SetDIBitsToDevice.c
+++ b/rostests/apitests/gdi32/SetDIBitsToDevice.c
@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
-#include <wingdi.h>
+#include <apitest.h>
 
+#include <wingdi.h>
 #include "init.h"
 
 static void
diff --git a/rostests/apitests/gdi32/SetMapMode.c b/rostests/apitests/gdi32/SetMapMode.c
index fd795835c58..7c8c04857c0 100644
--- a/rostests/apitests/gdi32/SetMapMode.c
+++ b/rostests/apitests/gdi32/SetMapMode.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/SetPixel.c b/rostests/apitests/gdi32/SetPixel.c
index aded5936e0e..1d2758397a7 100644
--- a/rostests/apitests/gdi32/SetPixel.c
+++ b/rostests/apitests/gdi32/SetPixel.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <mmsystem.h>
 
diff --git a/rostests/apitests/gdi32/SetSysColors.c b/rostests/apitests/gdi32/SetSysColors.c
index 7250e1aa897..d662996b87f 100644
--- a/rostests/apitests/gdi32/SetSysColors.c
+++ b/rostests/apitests/gdi32/SetSysColors.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/SetWindowExtEx.c b/rostests/apitests/gdi32/SetWindowExtEx.c
index 5338234e2c9..70f1e55fea7 100644
--- a/rostests/apitests/gdi32/SetWindowExtEx.c
+++ b/rostests/apitests/gdi32/SetWindowExtEx.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/SetWorldTransform.c b/rostests/apitests/gdi32/SetWorldTransform.c
index 5c73ece790e..55e9e092a8e 100644
--- a/rostests/apitests/gdi32/SetWorldTransform.c
+++ b/rostests/apitests/gdi32/SetWorldTransform.c
@@ -5,7 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <wingdi.h>
 #include <winuser.h>
 
diff --git a/rostests/apitests/gdi32/testlist.c b/rostests/apitests/gdi32/testlist.c
index 2724d3b0e79..789ef616e49 100644
--- a/rostests/apitests/gdi32/testlist.c
+++ b/rostests/apitests/gdi32/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_AddFontResource(void);
 extern void func_AddFontResourceEx(void);
diff --git a/rostests/apitests/include/apitest.h b/rostests/apitests/include/apitest.h
new file mode 100644
index 00000000000..85d241bc9ac
--- /dev/null
+++ b/rostests/apitests/include/apitest.h
@@ -0,0 +1,28 @@
+#ifndef _APITEST_H
+#define _APITEST_H
+
+// #define __ROS_LONG64__
+
+#define WIN32_NO_STATUS
+
+/* The user must #define STANDALONE if it uses this header in testlist.c */
+#include <wine/test.h>
+#include <pseh/pseh2.h>
+
+/* See kmtests/include/kmt_test.h */
+#define InvalidPointer ((PVOID)0x5555555555555555ULL)
+
+#define StartSeh()                                  \
+    ExceptionStatus = STATUS_SUCCESS;               \
+    _SEH2_TRY                                       \
+    {
+#define EndSeh(ExpectedStatus)                      \
+    }                                               \
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)         \
+    {                                               \
+        ExceptionStatus = _SEH2_GetExceptionCode(); \
+    }                                               \
+    _SEH2_END;                                      \
+    ok(ExceptionStatus == ExpectedStatus, "Exception 0x%08lx, expected 0x%08lx\n", ExceptionStatus, ExpectedStatus)
+
+#endif /* _APITEST_H */
diff --git a/rostests/apitests/kernel32/FindFiles.c b/rostests/apitests/kernel32/FindFiles.c
index 8350d2e2a44..52a031aa64e 100644
--- a/rostests/apitests/kernel32/FindFiles.c
+++ b/rostests/apitests/kernel32/FindFiles.c
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <windows.h>
 
 /*
diff --git a/rostests/apitests/kernel32/GetCurrentDirectory.c b/rostests/apitests/kernel32/GetCurrentDirectory.c
index a927169b7bc..6da946d47d7 100644
--- a/rostests/apitests/kernel32/GetCurrentDirectory.c
+++ b/rostests/apitests/kernel32/GetCurrentDirectory.c
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 
 static
diff --git a/rostests/apitests/kernel32/GetDriveType.c b/rostests/apitests/kernel32/GetDriveType.c
index e5b79c8dfe2..00b534c548b 100644
--- a/rostests/apitests/kernel32/GetDriveType.c
+++ b/rostests/apitests/kernel32/GetDriveType.c
@@ -1,4 +1,4 @@
-#include <wine/test.h>
+#include <apitest.h>
 
 #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR)
 
diff --git a/rostests/apitests/kernel32/GetModuleFileName.c b/rostests/apitests/kernel32/GetModuleFileName.c
index f0d6f14a9b7..4b16319333d 100644
--- a/rostests/apitests/kernel32/GetModuleFileName.c
+++ b/rostests/apitests/kernel32/GetModuleFileName.c
@@ -5,12 +5,12 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#define UNICODE
 #include <stdio.h>
-#include <wine/test.h>
 #include <winreg.h>
 #include <winnls.h>
 #include <shlwapi.h>
@@ -24,7 +24,7 @@ StartChild(char **argv)
     PWSTR FileName;
     PWSTR Slash;
     WCHAR CommandLine[MAX_PATH];
-    STARTUPINFO StartupInfo;
+    STARTUPINFOW StartupInfo;
     PROCESS_INFORMATION ProcessInfo;
     DWORD Ret;
     int Length;
@@ -48,7 +48,7 @@ StartChild(char **argv)
         FileName++;
         FileName[-1] = L'\0';
 
-        Success = SetCurrentDirectory(Path);
+        Success = SetCurrentDirectoryW(Path);
         ok(Success == TRUE, "SetCurrentDirectory failed for path '%ls'\n", Path);
 
         trace("Starting '%ls' in path '%ls'\n", FileName, Path);
@@ -64,16 +64,16 @@ StartChild(char **argv)
     RtlZeroMemory(&StartupInfo, sizeof(StartupInfo));
     StartupInfo.cb = sizeof(StartupInfo);
 
-    Success = CreateProcess(FileName,
-                            CommandLine,
-                            NULL,
-                            NULL,
-                            FALSE,
-                            0,
-                            NULL,
-                            NULL,
-                            &StartupInfo,
-                            &ProcessInfo);
+    Success = CreateProcessW(FileName,
+                             CommandLine,
+                             NULL,
+                             NULL,
+                             FALSE,
+                             0,
+                             NULL,
+                             NULL,
+                             &StartupInfo,
+                             &ProcessInfo);
     if (!Success)
     {
         skip("CreateProcess failed with %lu\n", GetLastError());
diff --git a/rostests/apitests/kernel32/MultiByteToWideChar.c b/rostests/apitests/kernel32/MultiByteToWideChar.c
index 0dd6ce62192..00242a6d114 100644
--- a/rostests/apitests/kernel32/MultiByteToWideChar.c
+++ b/rostests/apitests/kernel32/MultiByteToWideChar.c
@@ -5,9 +5,9 @@
  * PROGRAMMER:      Mike "tamlin" Nordell
  */
 
-#include <wine/test.h>
-#include <winnls.h>
+#include <apitest.h>
 
+#include <winnls.h>
 
 START_TEST(MultiByteToWideChar)
 {
diff --git a/rostests/apitests/kernel32/SetCurrentDirectory.c b/rostests/apitests/kernel32/SetCurrentDirectory.c
index be20bd95d93..e55409c6333 100644
--- a/rostests/apitests/kernel32/SetCurrentDirectory.c
+++ b/rostests/apitests/kernel32/SetCurrentDirectory.c
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Thomas Faber <thfabba@gmx.de>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 
 static
diff --git a/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
index 0105575c62f..ddf6b3f5093 100644
--- a/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
+++ b/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c
@@ -5,9 +5,10 @@
  * PROGRAMMER:      Mike "tamlin" Nordell
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/rtltypes.h>
 #include <xmmintrin.h>
 
diff --git a/rostests/apitests/kernel32/lstrcpynW.c b/rostests/apitests/kernel32/lstrcpynW.c
index 7bdd6efbc39..a6e953b570b 100644
--- a/rostests/apitests/kernel32/lstrcpynW.c
+++ b/rostests/apitests/kernel32/lstrcpynW.c
@@ -4,9 +4,10 @@
  * PURPOSE:         Test for lstrcpynW
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <wine/test.h>
 
 START_TEST(lstrcpynW)
 {
diff --git a/rostests/apitests/kernel32/testlist.c b/rostests/apitests/kernel32/testlist.c
index 08b6caf5201..94cff64698f 100644
--- a/rostests/apitests/kernel32/testlist.c
+++ b/rostests/apitests/kernel32/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_FindFiles(void);
 extern void func_GetCurrentDirectory(void);
diff --git a/rostests/apitests/msvcrt/CommandLine.c b/rostests/apitests/msvcrt/CommandLine.c
index c466d550669..7f752fdd2ed 100644
--- a/rostests/apitests/msvcrt/CommandLine.c
+++ b/rostests/apitests/msvcrt/CommandLine.c
@@ -5,10 +5,10 @@
  * PROGRAMMER:      Hermès BÉLUSCA - MAÏTO <hermes.belusca@sfr.fr>
  */
 
+#include <apitest.h>
+
 #define WIN32_NO_STATUS
-#define UNICODE
 #include <stdio.h>
-#include <wine/test.h>
 #include <ndk/umtypes.h>
 
 #include "./CmdLineUtil/CmdLineUtil.h"
diff --git a/rostests/apitests/msvcrt/ieee.c b/rostests/apitests/msvcrt/ieee.c
index 814b1c320ed..5ecd8b1a973 100644
--- a/rostests/apitests/msvcrt/ieee.c
+++ b/rostests/apitests/msvcrt/ieee.c
@@ -6,7 +6,8 @@
  * REFERENCES:      http://msdn.microsoft.com/en-US/library/h7zkk1bz%28v=VS.80%29.aspx
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <float.h>
 #include <math.h>
 
diff --git a/rostests/apitests/msvcrt/splitpath.c b/rostests/apitests/msvcrt/splitpath.c
index db4ae60c826..55f8277799c 100644
--- a/rostests/apitests/msvcrt/splitpath.c
+++ b/rostests/apitests/msvcrt/splitpath.c
@@ -5,7 +5,8 @@
  * PROGRAMMER:      Timo Kreuzer
  */
 
-#include <wine/test.h>
+#include <apitest.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
diff --git a/rostests/apitests/msvcrt/testlist.c b/rostests/apitests/msvcrt/testlist.c
index 505205e6fdb..96a9ef4c57d 100644
--- a/rostests/apitests/msvcrt/testlist.c
+++ b/rostests/apitests/msvcrt/testlist.c
@@ -1,7 +1,7 @@
 #define __ROS_LONG64__
 
 #define STANDALONE
-#include <wine/test.h>
+#include <apitest.h>
 
 extern void func_CommandLine(void);
 extern void func_ieee(void);