[ros-diffs] [reactos] 01/01: [GDI32_APITEST] Add a PCH.

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aee83c359c6ff976005d2…

commit aee83c359c6ff976005d2443b7e07b465f1d06c2
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Dec 2 21:00:06 2017 +0100

    [GDI32_APITEST] Add a PCH.
---
 .../rostests/apitests/gdi32/AddFontMemResourceEx.c |  5 +----
 modules/rostests/apitests/gdi32/AddFontResource.c  |  4 +---
 .../rostests/apitests/gdi32/AddFontResourceEx.c    |  4 +---
 modules/rostests/apitests/gdi32/BeginPath.c        |  4 +---
 modules/rostests/apitests/gdi32/CMakeLists.txt     |  5 +++--
 modules/rostests/apitests/gdi32/CombineRgn.c       |  3 +--
 modules/rostests/apitests/gdi32/CombineTransform.c |  5 +----
 modules/rostests/apitests/gdi32/CreateBitmap.c     |  6 +-----
 .../rostests/apitests/gdi32/CreateBitmapIndirect.c |  4 +---
 .../rostests/apitests/gdi32/CreateCompatibleDC.c   |  5 +----
 .../apitests/gdi32/CreateDIBPatternBrush.c         |  3 +--
 modules/rostests/apitests/gdi32/CreateDIBitmap.c   |  5 +----
 modules/rostests/apitests/gdi32/CreateFont.c       |  4 +---
 .../rostests/apitests/gdi32/CreateFontIndirect.c   |  3 +--
 .../rostests/apitests/gdi32/CreateIconIndirect.c   |  8 +------
 modules/rostests/apitests/gdi32/CreatePen.c        |  7 +-----
 modules/rostests/apitests/gdi32/CreateRectRgn.c    |  3 +--
 modules/rostests/apitests/gdi32/DPtoLP.c           |  5 +----
 .../rostests/apitests/gdi32/EngAcquireSemaphore.c  |  5 +----
 .../rostests/apitests/gdi32/EngCreateSemaphore.c   |  5 +----
 .../rostests/apitests/gdi32/EngDeleteSemaphore.c   |  5 +----
 .../rostests/apitests/gdi32/EngReleaseSemaphore.c  |  5 +----
 modules/rostests/apitests/gdi32/EnumFontFamilies.c |  7 +-----
 modules/rostests/apitests/gdi32/ExcludeClipRect.c  | 13 +----------
 modules/rostests/apitests/gdi32/ExtCreatePen.c     |  8 +------
 modules/rostests/apitests/gdi32/ExtCreateRegion.c  |  3 +--
 modules/rostests/apitests/gdi32/FrameRgn.c         |  5 ++---
 modules/rostests/apitests/gdi32/GdiConvertBitmap.c |  4 +---
 modules/rostests/apitests/gdi32/GdiConvertBrush.c  |  4 +---
 modules/rostests/apitests/gdi32/GdiConvertDC.c     |  4 +---
 modules/rostests/apitests/gdi32/GdiConvertFont.c   |  4 +---
 .../rostests/apitests/gdi32/GdiConvertPalette.c    |  4 +---
 modules/rostests/apitests/gdi32/GdiConvertRegion.c |  4 +---
 modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c |  4 +---
 .../rostests/apitests/gdi32/GdiGetCharDimensions.c |  4 +---
 modules/rostests/apitests/gdi32/GdiGetLocalBrush.c |  4 +---
 modules/rostests/apitests/gdi32/GdiGetLocalDC.c    |  4 +---
 .../rostests/apitests/gdi32/GdiReleaseLocalDC.c    |  4 +---
 modules/rostests/apitests/gdi32/GdiSetAttrs.c      |  4 +---
 modules/rostests/apitests/gdi32/GetClipBox.c       | 11 +---------
 modules/rostests/apitests/gdi32/GetClipRgn.c       |  5 +----
 modules/rostests/apitests/gdi32/GetCurrentObject.c |  8 +------
 modules/rostests/apitests/gdi32/GetDIBColorTable.c |  4 +---
 modules/rostests/apitests/gdi32/GetDIBits.c        |  5 +----
 .../rostests/apitests/gdi32/GetFontResourceInfoW.c |  7 ++----
 modules/rostests/apitests/gdi32/GetGlyphIndices.c  |  6 +-----
 modules/rostests/apitests/gdi32/GetObject.c        |  8 +------
 modules/rostests/apitests/gdi32/GetPixel.c         |  4 +---
 modules/rostests/apitests/gdi32/GetRandomRgn.c     |  7 +-----
 modules/rostests/apitests/gdi32/GetStockObject.c   | 10 +--------
 .../rostests/apitests/gdi32/GetTextExtentExPoint.c |  9 +-------
 modules/rostests/apitests/gdi32/GetTextFace.c      |  7 +-----
 modules/rostests/apitests/gdi32/MaskBlt.c          |  4 +---
 .../rostests/apitests/gdi32/NtGdiAddFontResource.c |  6 ++----
 modules/rostests/apitests/gdi32/OffsetClipRgn.c    |  5 +----
 modules/rostests/apitests/gdi32/OffsetRgn.c        |  5 +----
 modules/rostests/apitests/gdi32/PaintRgn.c         |  6 ++----
 modules/rostests/apitests/gdi32/PatBlt.c           |  5 +----
 modules/rostests/apitests/gdi32/RealizePalette.c   |  6 ++----
 modules/rostests/apitests/gdi32/Rectangle.c        |  4 +---
 modules/rostests/apitests/gdi32/SelectObject.c     | 12 +----------
 modules/rostests/apitests/gdi32/SetBoundsRect.c    |  4 +---
 modules/rostests/apitests/gdi32/SetBrushOrgEx.c    |  4 +---
 modules/rostests/apitests/gdi32/SetDCPenColor.c    |  5 +----
 modules/rostests/apitests/gdi32/SetDIBits.c        |  4 +---
 .../rostests/apitests/gdi32/SetDIBitsToDevice.c    |  3 +--
 modules/rostests/apitests/gdi32/SetMapMode.c       |  8 +------
 modules/rostests/apitests/gdi32/SetPixel.c         |  3 +--
 modules/rostests/apitests/gdi32/SetSysColors.c     |  7 +-----
 modules/rostests/apitests/gdi32/SetWindowExtEx.c   |  8 +------
 .../rostests/apitests/gdi32/SetWorldTransform.c    |  5 +----
 modules/rostests/apitests/gdi32/init.c             |  5 ++---
 modules/rostests/apitests/gdi32/init.h             |  1 +
 modules/rostests/apitests/gdi32/precomp.h          | 25 ++++++++++++++++++++++
 74 files changed, 106 insertions(+), 307 deletions(-)

diff --git a/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c
b/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c
index 057a6b495a..e8b71864cf 100644
--- a/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c
+++ b/modules/rostests/apitests/gdi32/AddFontMemResourceEx.c
@@ -9,10 +9,7 @@
  *                    Captured from firefox, embedded on reactos.org
  */
 
-
-#include <apitest.h>
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 typedef struct _fnt_res
 {
diff --git a/modules/rostests/apitests/gdi32/AddFontResource.c
b/modules/rostests/apitests/gdi32/AddFontResource.c
index e020dfc4db..cee4079d97 100644
--- a/modules/rostests/apitests/gdi32/AddFontResource.c
+++ b/modules/rostests/apitests/gdi32/AddFontResource.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
-#include <apitest.h>
-#include <wingdi.h>
+#include "precomp.h"
 
 #define COUNT 26
 
diff --git a/modules/rostests/apitests/gdi32/AddFontResourceEx.c
b/modules/rostests/apitests/gdi32/AddFontResourceEx.c
index 0cae71abd1..9448a6ff1c 100644
--- a/modules/rostests/apitests/gdi32/AddFontResourceEx.c
+++ b/modules/rostests/apitests/gdi32/AddFontResourceEx.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_AddFontResourceExW()
 {
diff --git a/modules/rostests/apitests/gdi32/BeginPath.c
b/modules/rostests/apitests/gdi32/BeginPath.c
index db4761dfe2..176a0c4f17 100644
--- a/modules/rostests/apitests/gdi32/BeginPath.c
+++ b/modules/rostests/apitests/gdi32/BeginPath.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_BeginPath()
 {
diff --git a/modules/rostests/apitests/gdi32/CMakeLists.txt
b/modules/rostests/apitests/gdi32/CMakeLists.txt
index e1edb91c26..3dfe1c3474 100644
--- a/modules/rostests/apitests/gdi32/CMakeLists.txt
+++ b/modules/rostests/apitests/gdi32/CMakeLists.txt
@@ -73,10 +73,11 @@ list(APPEND SOURCE
     SetWindowExtEx.c
     SetWorldTransform.c
     init.c
-    testlist.c)
+    precomp.h)
 
-add_executable(gdi32_apitest ${SOURCE} resource.rc)
+add_executable(gdi32_apitest ${SOURCE} testlist.c resource.rc)
 target_link_libraries(gdi32_apitest ${PSEH_LIB} win32ksys)
 set_module_type(gdi32_apitest win32cui)
 add_importlibs(gdi32_apitest gdi32 user32 msvcrt kernel32 ntdll)
+add_pch(gdi32_apitest precomp.h SOURCE)
 add_rostests_file(TARGET gdi32_apitest)
diff --git a/modules/rostests/apitests/gdi32/CombineRgn.c
b/modules/rostests/apitests/gdi32/CombineRgn.c
index 3e10ec3f63..b000a49554 100644
--- a/modules/rostests/apitests/gdi32/CombineRgn.c
+++ b/modules/rostests/apitests/gdi32/CombineRgn.c
@@ -5,8 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-#include <windows.h>
+#include "precomp.h"
 
 typedef struct _RECT_TEST
 {
diff --git a/modules/rostests/apitests/gdi32/CombineTransform.c
b/modules/rostests/apitests/gdi32/CombineTransform.c
index 679d34c74b..8989133a36 100644
--- a/modules/rostests/apitests/gdi32/CombineTransform.c
+++ b/modules/rostests/apitests/gdi32/CombineTransform.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
+#include "precomp.h"
 
 typedef union
 {
diff --git a/modules/rostests/apitests/gdi32/CreateBitmap.c
b/modules/rostests/apitests/gdi32/CreateBitmap.c
index 9c8a1b0dd1..4cf719feaf 100644
--- a/modules/rostests/apitests/gdi32/CreateBitmap.c
+++ b/modules/rostests/apitests/gdi32/CreateBitmap.c
@@ -5,11 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-
-#define DEFAULT_BITMAP 21
+#include "precomp.h"
 
 void Test_CreateBitmap_Params()
 {
diff --git a/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c
b/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c
index fb448d9902..e9050f95b2 100644
--- a/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c
+++ b/modules/rostests/apitests/gdi32/CreateBitmapIndirect.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_CreateBitmapIndirect()
 {
diff --git a/modules/rostests/apitests/gdi32/CreateCompatibleDC.c
b/modules/rostests/apitests/gdi32/CreateCompatibleDC.c
index 3d7c7dc6c2..6be042aabf 100644
--- a/modules/rostests/apitests/gdi32/CreateCompatibleDC.c
+++ b/modules/rostests/apitests/gdi32/CreateCompatibleDC.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 void Test_CreateCompatibleDC()
 {
diff --git a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
index b1cf27d2f3..6ac5da0b3d 100644
--- a/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
+++ b/modules/rostests/apitests/gdi32/CreateDIBPatternBrush.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <wingdi.h>
 #include "init.h"
 
 /* New color use parameter. See support.microsoft.com/kb/kbview/108497 */
diff --git a/modules/rostests/apitests/gdi32/CreateDIBitmap.c
b/modules/rostests/apitests/gdi32/CreateDIBitmap.c
index cfc88f9755..1e302618d5 100644
--- a/modules/rostests/apitests/gdi32/CreateDIBitmap.c
+++ b/modules/rostests/apitests/gdi32/CreateDIBitmap.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 #include "init.h"
 
diff --git a/modules/rostests/apitests/gdi32/CreateFont.c
b/modules/rostests/apitests/gdi32/CreateFont.c
index e4a378de4e..cc251863f2 100644
--- a/modules/rostests/apitests/gdi32/CreateFont.c
+++ b/modules/rostests/apitests/gdi32/CreateFont.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 #define INVALIDFONT "ThisFontDoesNotExist"
 
diff --git a/modules/rostests/apitests/gdi32/CreateFontIndirect.c
b/modules/rostests/apitests/gdi32/CreateFontIndirect.c
index 477952d987..4940957887 100644
--- a/modules/rostests/apitests/gdi32/CreateFontIndirect.c
+++ b/modules/rostests/apitests/gdi32/CreateFontIndirect.c
@@ -6,8 +6,7 @@
  *                  Katayama Hirofumi MZ
  */
 
-#include <apitest.h>
-#include <wingdi.h>
+#include "precomp.h"
 
 #define trace_if(val, msg) do { if (!(val)) trace(msg); } while (0)
 
diff --git a/modules/rostests/apitests/gdi32/CreateIconIndirect.c
b/modules/rostests/apitests/gdi32/CreateIconIndirect.c
index bfd78e2add..8c1bf3639b 100644
--- a/modules/rostests/apitests/gdi32/CreateIconIndirect.c
+++ b/modules/rostests/apitests/gdi32/CreateIconIndirect.c
@@ -1,9 +1,5 @@
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
+#include "precomp.h"
 
 // FIXME user32
 
@@ -204,5 +200,3 @@ START_TEST(CreateIconIndirect)
     ok(iconinfo2.hbmColor == NULL, "\n");
 
 }
-
-
diff --git a/modules/rostests/apitests/gdi32/CreatePen.c
b/modules/rostests/apitests/gdi32/CreatePen.c
index ad03b3b804..90e6d09060 100644
--- a/modules/rostests/apitests/gdi32/CreatePen.c
+++ b/modules/rostests/apitests/gdi32/CreatePen.c
@@ -5,12 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"
 
 void Test_CreatePen()
 {
diff --git a/modules/rostests/apitests/gdi32/CreateRectRgn.c
b/modules/rostests/apitests/gdi32/CreateRectRgn.c
index e5904696f3..5c799b728f 100644
--- a/modules/rostests/apitests/gdi32/CreateRectRgn.c
+++ b/modules/rostests/apitests/gdi32/CreateRectRgn.c
@@ -5,7 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
 void Test_CreateRectRgn()
 {
@@ -16,4 +16,3 @@ START_TEST(CreateRectRgn)
 {
     Test_CreateRectRgn();
 }
-
diff --git a/modules/rostests/apitests/gdi32/DPtoLP.c
b/modules/rostests/apitests/gdi32/DPtoLP.c
index 940e7a7e5e..dd2a6f9900 100644
--- a/modules/rostests/apitests/gdi32/DPtoLP.c
+++ b/modules/rostests/apitests/gdi32/DPtoLP.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 void Test_DPtoLP_Params()
 {
diff --git a/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c
b/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c
index 94014546a1..be0f9d17e0 100644
--- a/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c
+++ b/modules/rostests/apitests/gdi32/EngAcquireSemaphore.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
+#include "precomp.h"
 
 void Test_EngAcquireSemaphore()
 {
diff --git a/modules/rostests/apitests/gdi32/EngCreateSemaphore.c
b/modules/rostests/apitests/gdi32/EngCreateSemaphore.c
index eb6ccec67a..0bd25a1d0c 100644
--- a/modules/rostests/apitests/gdi32/EngCreateSemaphore.c
+++ b/modules/rostests/apitests/gdi32/EngCreateSemaphore.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
+#include "precomp.h"
 
 void Test_EngCreateSemaphore()
 {
diff --git a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c
b/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c
index f129fb94c7..d8c1218e3e 100644
--- a/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c
+++ b/modules/rostests/apitests/gdi32/EngDeleteSemaphore.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
+#include "precomp.h"
 
 void Test_EngDeleteSemaphore()
 {
diff --git a/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c
b/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c
index c6d20bb89e..be843f5164 100644
--- a/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c
+++ b/modules/rostests/apitests/gdi32/EngReleaseSemaphore.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
+#include "precomp.h"
 
 void Test_EngReleaseSemaphore()
 {
diff --git a/modules/rostests/apitests/gdi32/EnumFontFamilies.c
b/modules/rostests/apitests/gdi32/EnumFontFamilies.c
index 51d7f86c5a..b9ae7f3c10 100644
--- a/modules/rostests/apitests/gdi32/EnumFontFamilies.c
+++ b/modules/rostests/apitests/gdi32/EnumFontFamilies.c
@@ -5,12 +5,7 @@
  * PROGRAMMERS:     Thomas Faber &lt;thomas.faber(a)reactos.org&gt;
  */
 
-#include <apitest.h>
-
-#include <winnls.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <strsafe.h>
+#include "precomp.h"
 
 static BYTE ContextContinue;
 static BYTE ContextStop;
diff --git a/modules/rostests/apitests/gdi32/ExcludeClipRect.c
b/modules/rostests/apitests/gdi32/ExcludeClipRect.c
index af27cd6b7b..ee4e74b7af 100644
--- a/modules/rostests/apitests/gdi32/ExcludeClipRect.c
+++ b/modules/rostests/apitests/gdi32/ExcludeClipRect.c
@@ -5,18 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define CLIPRGN 1
-
-#define ok_rect(_prc, _left, _top, _right, _bottom) \
-    ok_int((_prc)->left, _left); \
-    ok_int((_prc)->top, _top); \
-    ok_int((_prc)->right, _right); \
-    ok_int((_prc)->bottom, _bottom); \
+#include "precomp.h"
 
 void Test_ExcludeClipRect()
 {
diff --git a/modules/rostests/apitests/gdi32/ExtCreatePen.c
b/modules/rostests/apitests/gdi32/ExtCreatePen.c
index 5901194faa..c8370bd5cb 100644
--- a/modules/rostests/apitests/gdi32/ExtCreatePen.c
+++ b/modules/rostests/apitests/gdi32/ExtCreatePen.c
@@ -5,13 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-#include <stdio.h>
+#include "precomp.h"
 
 #define ok_lasterror(err) \
     ok(GetLastError() == err, "expected last error " #err " but got
0x%lx\n", GetLastError());
diff --git a/modules/rostests/apitests/gdi32/ExtCreateRegion.c
b/modules/rostests/apitests/gdi32/ExtCreateRegion.c
index eea2323e11..16fe55f143 100644
--- a/modules/rostests/apitests/gdi32/ExtCreateRegion.c
+++ b/modules/rostests/apitests/gdi32/ExtCreateRegion.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <windows.h>
 #include <math.h>
 
 VOID
diff --git a/modules/rostests/apitests/gdi32/FrameRgn.c
b/modules/rostests/apitests/gdi32/FrameRgn.c
index 2187acfa1a..547d4947e6 100644
--- a/modules/rostests/apitests/gdi32/FrameRgn.c
+++ b/modules/rostests/apitests/gdi32/FrameRgn.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
+#include "precomp.h"
+
 #include "init.h"
 
 #if 0
diff --git a/modules/rostests/apitests/gdi32/GdiConvertBitmap.c
b/modules/rostests/apitests/gdi32/GdiConvertBitmap.c
index 78f5899ad3..06e6e337ae 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertBitmap.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertBitmap.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);
 
diff --git a/modules/rostests/apitests/gdi32/GdiConvertBrush.c
b/modules/rostests/apitests/gdi32/GdiConvertBrush.c
index 4fb97f3e2b..d82ddd7f16 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertBrush.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertBrush.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);
 
diff --git a/modules/rostests/apitests/gdi32/GdiConvertDC.c
b/modules/rostests/apitests/gdi32/GdiConvertDC.c
index dd9f736861..29179071b4 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertDC.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertDC.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HDC WINAPI GdiConvertDC(HDC hdc);
 
diff --git a/modules/rostests/apitests/gdi32/GdiConvertFont.c
b/modules/rostests/apitests/gdi32/GdiConvertFont.c
index d8e90785b3..bfc7bb30df 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertFont.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertFont.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HFONT WINAPI GdiConvertFont(HFONT);
 
diff --git a/modules/rostests/apitests/gdi32/GdiConvertPalette.c
b/modules/rostests/apitests/gdi32/GdiConvertPalette.c
index 85dc8787b0..ffb383a0ac 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertPalette.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertPalette.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HPALETTE WINAPI GdiConvertPalette(HPALETTE);
 
diff --git a/modules/rostests/apitests/gdi32/GdiConvertRegion.c
b/modules/rostests/apitests/gdi32/GdiConvertRegion.c
index 028842c13b..0a32e4a603 100644
--- a/modules/rostests/apitests/gdi32/GdiConvertRegion.c
+++ b/modules/rostests/apitests/gdi32/GdiConvertRegion.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HRGN WINAPI GdiConvertRegion(HRGN);
 
diff --git a/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c
b/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c
index 6de9eba242..7faf690b0e 100644
--- a/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c
+++ b/modules/rostests/apitests/gdi32/GdiDeleteLocalDC.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 BOOL WINAPI GdiDeleteLocalDC(HDC);
 
diff --git a/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c
b/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c
index 2f03dfe2e7..6ac880f922 100644
--- a/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c
+++ b/modules/rostests/apitests/gdi32/GdiGetCharDimensions.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_GdiGetCharDimensions()
 {
diff --git a/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c
b/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c
index 7af9a1a89b..349f1d53c7 100644
--- a/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c
+++ b/modules/rostests/apitests/gdi32/GdiGetLocalBrush.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);
 
diff --git a/modules/rostests/apitests/gdi32/GdiGetLocalDC.c
b/modules/rostests/apitests/gdi32/GdiGetLocalDC.c
index e445da1e87..590004c013 100644
--- a/modules/rostests/apitests/gdi32/GdiGetLocalDC.c
+++ b/modules/rostests/apitests/gdi32/GdiGetLocalDC.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 HDC WINAPI GdiGetLocalDC(HDC);
 
diff --git a/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c
b/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c
index 2c9572ce9f..0966efd7e6 100644
--- a/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c
+++ b/modules/rostests/apitests/gdi32/GdiReleaseLocalDC.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 BOOL WINAPI GdiReleaseLocalDC(HDC);
 
diff --git a/modules/rostests/apitests/gdi32/GdiSetAttrs.c
b/modules/rostests/apitests/gdi32/GdiSetAttrs.c
index 537250efc7..798a52847d 100644
--- a/modules/rostests/apitests/gdi32/GdiSetAttrs.c
+++ b/modules/rostests/apitests/gdi32/GdiSetAttrs.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 BOOL WINAPI GdiSetAttrs(HDC);
 
diff --git a/modules/rostests/apitests/gdi32/GetClipBox.c
b/modules/rostests/apitests/gdi32/GetClipBox.c
index 3ee3c252e2..5df59c237b 100644
--- a/modules/rostests/apitests/gdi32/GetClipBox.c
+++ b/modules/rostests/apitests/gdi32/GetClipBox.c
@@ -5,16 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define ok_rect(_prc, _left, _top, _right, _bottom) \
-    ok_int((_prc)->left, _left); \
-    ok_int((_prc)->top, _top); \
-    ok_int((_prc)->right, _right); \
-    ok_int((_prc)->bottom, _bottom); \
+#include "precomp.h"
 
 void Test_GetClipBox()
 {
diff --git a/modules/rostests/apitests/gdi32/GetClipRgn.c
b/modules/rostests/apitests/gdi32/GetClipRgn.c
index c952d22c9e..7edb8f959a 100644
--- a/modules/rostests/apitests/gdi32/GetClipRgn.c
+++ b/modules/rostests/apitests/gdi32/GetClipRgn.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 void Test_GetClipRgn()
 {
diff --git a/modules/rostests/apitests/gdi32/GetCurrentObject.c
b/modules/rostests/apitests/gdi32/GetCurrentObject.c
index 5aea265309..a5a32f3e1b 100644
--- a/modules/rostests/apitests/gdi32/GetCurrentObject.c
+++ b/modules/rostests/apitests/gdi32/GetCurrentObject.c
@@ -5,13 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"
 
 void Test_GetCurrentObject()
 {
diff --git a/modules/rostests/apitests/gdi32/GetDIBColorTable.c
b/modules/rostests/apitests/gdi32/GetDIBColorTable.c
index ff700910c8..eb15ed4171 100644
--- a/modules/rostests/apitests/gdi32/GetDIBColorTable.c
+++ b/modules/rostests/apitests/gdi32/GetDIBColorTable.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_GetDIBColorTable()
 {
diff --git a/modules/rostests/apitests/gdi32/GetDIBits.c
b/modules/rostests/apitests/gdi32/GetDIBits.c
index cfc3618070..3b13adadbd 100644
--- a/modules/rostests/apitests/gdi32/GetDIBits.c
+++ b/modules/rostests/apitests/gdi32/GetDIBits.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 #include "init.h"
 
diff --git a/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c
b/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c
index bb4d37900c..72cb75c258 100644
--- a/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c
+++ b/modules/rostests/apitests/gdi32/GetFontResourceInfoW.c
@@ -4,11 +4,8 @@
  * PURPOSE:         Test for GetFontResourceInfoW
  * PROGRAMMERS:     Katayama Hirofumi MZ &lt;katayama.hirofumi.mz(a)gmail.com&gt;
  */
-#include <apitest.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <stdio.h>
+
+#include "precomp.h"
 
 /* GetFontResourceInfoW is undocumented */
 BOOL WINAPI GetFontResourceInfoW(LPCWSTR lpFileName, DWORD *pdwBufSize, void* lpBuffer,
DWORD dwType);
diff --git a/modules/rostests/apitests/gdi32/GetGlyphIndices.c
b/modules/rostests/apitests/gdi32/GetGlyphIndices.c
index 6e3377359c..281616b614 100644
--- a/modules/rostests/apitests/gdi32/GetGlyphIndices.c
+++ b/modules/rostests/apitests/gdi32/GetGlyphIndices.c
@@ -5,11 +5,7 @@
 * PROGRAMMERS:     Ged Murphy
 */
 
-#include <apitest.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <strsafe.h>
-
+#include "precomp.h"
 
 #define ok_lasterrornotchanged() \
     ok_err(0x12345)
diff --git a/modules/rostests/apitests/gdi32/GetObject.c
b/modules/rostests/apitests/gdi32/GetObject.c
index 0eaff6ef06..a11241ea20 100644
--- a/modules/rostests/apitests/gdi32/GetObject.c
+++ b/modules/rostests/apitests/gdi32/GetObject.c
@@ -5,13 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
+#include "precomp.h"
 
 void
 Test_General(void)
diff --git a/modules/rostests/apitests/gdi32/GetPixel.c
b/modules/rostests/apitests/gdi32/GetPixel.c
index ddd6ed791d..adf98e8514 100644
--- a/modules/rostests/apitests/gdi32/GetPixel.c
+++ b/modules/rostests/apitests/gdi32/GetPixel.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_GetPixel_1bpp()
 {
diff --git a/modules/rostests/apitests/gdi32/GetRandomRgn.c
b/modules/rostests/apitests/gdi32/GetRandomRgn.c
index 5c822793e8..63eea4420a 100644
--- a/modules/rostests/apitests/gdi32/GetRandomRgn.c
+++ b/modules/rostests/apitests/gdi32/GetRandomRgn.c
@@ -5,13 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <stdio.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-#define CLIPRGN 1
 #define METARGN 2
 #define APIRGN  3
 #define SYSRGN  4
diff --git a/modules/rostests/apitests/gdi32/GetStockObject.c
b/modules/rostests/apitests/gdi32/GetStockObject.c
index 4f7c01ec0c..4ad2e8ed3c 100644
--- a/modules/rostests/apitests/gdi32/GetStockObject.c
+++ b/modules/rostests/apitests/gdi32/GetStockObject.c
@@ -5,15 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winddi.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 void Test_GetStockObject()
 {
diff --git a/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c
b/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c
index 594838c14f..9ec44811cf 100644
--- a/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c
+++ b/modules/rostests/apitests/gdi32/GetTextExtentExPoint.c
@@ -5,14 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <stdio.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 void Test_GetTextExtentExPoint()
 {
diff --git a/modules/rostests/apitests/gdi32/GetTextFace.c
b/modules/rostests/apitests/gdi32/GetTextFace.c
index 9686d1b660..e304986d13 100644
--- a/modules/rostests/apitests/gdi32/GetTextFace.c
+++ b/modules/rostests/apitests/gdi32/GetTextFace.c
@@ -5,12 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 void Test_GetTextFace()
 {
diff --git a/modules/rostests/apitests/gdi32/MaskBlt.c
b/modules/rostests/apitests/gdi32/MaskBlt.c
index 6fe552bcfb..2ebb7c4b5c 100644
--- a/modules/rostests/apitests/gdi32/MaskBlt.c
+++ b/modules/rostests/apitests/gdi32/MaskBlt.c
@@ -5,10 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <wingdi.h>
-#include <winuser.h>
 #include "init.h"
 
 void Test_MaskBlt_1bpp()
diff --git a/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c
b/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c
index eaded16381..c9c335ba51 100644
--- a/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c
+++ b/modules/rostests/apitests/gdi32/NtGdiAddFontResource.c
@@ -5,11 +5,9 @@
  * PROGRAMMERS:     Víctor Martínez Calvo ( victor.martinez(a)reactos.org )
  */
 
-#include <apitest.h>
-#include <wingdi.h>
-#include <ndk/rtlfuncs.h>
-#include <strsafe.h>
+#include "precomp.h"
 
+#include <ndk/rtlfuncs.h>
 
 INT
 APIENTRY
diff --git a/modules/rostests/apitests/gdi32/OffsetClipRgn.c
b/modules/rostests/apitests/gdi32/OffsetClipRgn.c
index a40265bf6c..046bd06ac1 100644
--- a/modules/rostests/apitests/gdi32/OffsetClipRgn.c
+++ b/modules/rostests/apitests/gdi32/OffsetClipRgn.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-#include <wingdi.h>
-
-#define CLIPRGN 1
+#include "precomp.h"
 
 void Test_OffsetClipRgn()
 {
diff --git a/modules/rostests/apitests/gdi32/OffsetRgn.c
b/modules/rostests/apitests/gdi32/OffsetRgn.c
index 11bb882637..fcda1f3c35 100644
--- a/modules/rostests/apitests/gdi32/OffsetRgn.c
+++ b/modules/rostests/apitests/gdi32/OffsetRgn.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
-#include "init.h"
+#include "precomp.h"
 
 void Test_OffsetRgn()
 {
diff --git a/modules/rostests/apitests/gdi32/PaintRgn.c
b/modules/rostests/apitests/gdi32/PaintRgn.c
index 36fa935cb0..083dcfd457 100644
--- a/modules/rostests/apitests/gdi32/PaintRgn.c
+++ b/modules/rostests/apitests/gdi32/PaintRgn.c
@@ -5,11 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-#include <windows.h>
-#include <stdio.h>
-#include "init.h"
+#include "precomp.h"
 
+#include "init.h"
 
 void Test_PaintRgn()
 {
diff --git a/modules/rostests/apitests/gdi32/PatBlt.c
b/modules/rostests/apitests/gdi32/PatBlt.c
index a849377574..456319218e 100644
--- a/modules/rostests/apitests/gdi32/PatBlt.c
+++ b/modules/rostests/apitests/gdi32/PatBlt.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <stdio.h>
-#include <wingdi.h>
+#include "precomp.h"
 
 HBITMAP ghbmpTarget;
 PULONG gpulTargetBits;
diff --git a/modules/rostests/apitests/gdi32/RealizePalette.c
b/modules/rostests/apitests/gdi32/RealizePalette.c
index 461420af00..d3c20c0b26 100644
--- a/modules/rostests/apitests/gdi32/RealizePalette.c
+++ b/modules/rostests/apitests/gdi32/RealizePalette.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
-#include <wine/test.h>
-#include <windows.h>
+#include "precomp.h"
+
 #include "init.h"
 
 START_TEST(RealizePalette)
@@ -19,4 +18,3 @@ START_TEST(RealizePalette)
     ok_int(RealizePalette(ghdcDIB32), 0);
 
 }
-
diff --git a/modules/rostests/apitests/gdi32/Rectangle.c
b/modules/rostests/apitests/gdi32/Rectangle.c
index 308680c7ce..266664beac 100644
--- a/modules/rostests/apitests/gdi32/Rectangle.c
+++ b/modules/rostests/apitests/gdi32/Rectangle.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_Rectangle(void)
 {
diff --git a/modules/rostests/apitests/gdi32/SelectObject.c
b/modules/rostests/apitests/gdi32/SelectObject.c
index 0bae4405ef..b7ddb8f735 100644
--- a/modules/rostests/apitests/gdi32/SelectObject.c
+++ b/modules/rostests/apitests/gdi32/SelectObject.c
@@ -5,17 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <stdio.h>
-#include <wingdi.h>
-#include <winddi.h>
-#include <winuser.h>
-#include <include/ntgdityp.h>
-#include <include/ntgdihdl.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 HDC hdc1, hdc2;
 
diff --git a/modules/rostests/apitests/gdi32/SetBoundsRect.c
b/modules/rostests/apitests/gdi32/SetBoundsRect.c
index 261d99dde2..7d1359e6c9 100644
--- a/modules/rostests/apitests/gdi32/SetBoundsRect.c
+++ b/modules/rostests/apitests/gdi32/SetBoundsRect.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Thomas Faber &lt;thomas.faber(a)reactos.org
  */
 
-#include <apitest.h>
-#include <winuser.h>
-#include <wingdi.h>
+#include "precomp.h"
 
 START_TEST(SetBoundsRect)
 {
diff --git a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c
b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c
index 74acb15153..e708fef180 100644
--- a/modules/rostests/apitests/gdi32/SetBrushOrgEx.c
+++ b/modules/rostests/apitests/gdi32/SetBrushOrgEx.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD
dwErrExp)
 {
diff --git a/modules/rostests/apitests/gdi32/SetDCPenColor.c
b/modules/rostests/apitests/gdi32/SetDCPenColor.c
index 0f91656bad..397b810bf0 100644
--- a/modules/rostests/apitests/gdi32/SetDCPenColor.c
+++ b/modules/rostests/apitests/gdi32/SetDCPenColor.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 void Test_SetDCPenColor()
 {
diff --git a/modules/rostests/apitests/gdi32/SetDIBits.c
b/modules/rostests/apitests/gdi32/SetDIBits.c
index 6a00814891..1c8a1c9faa 100644
--- a/modules/rostests/apitests/gdi32/SetDIBits.c
+++ b/modules/rostests/apitests/gdi32/SetDIBits.c
@@ -5,9 +5,7 @@
  * PROGRAMMERS:     J�r�me Gardou
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
+#include "precomp.h"
 
 void Test_SetDIBits()
 {
diff --git a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
index 1a86a3646a..6e35b0d0af 100644
--- a/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
+++ b/modules/rostests/apitests/gdi32/SetDIBitsToDevice.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <wingdi.h>
 #include "init.h"
 
 static void
diff --git a/modules/rostests/apitests/gdi32/SetMapMode.c
b/modules/rostests/apitests/gdi32/SetMapMode.c
index 7c8c04857c..004bf0c8ab 100644
--- a/modules/rostests/apitests/gdi32/SetMapMode.c
+++ b/modules/rostests/apitests/gdi32/SetMapMode.c
@@ -5,13 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 void Test_SetMapMode()
 {
diff --git a/modules/rostests/apitests/gdi32/SetPixel.c
b/modules/rostests/apitests/gdi32/SetPixel.c
index 1d2758397a..14da033936 100644
--- a/modules/rostests/apitests/gdi32/SetPixel.c
+++ b/modules/rostests/apitests/gdi32/SetPixel.c
@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
+#include "precomp.h"
 
-#include <wingdi.h>
 #include <mmsystem.h>
 
 static struct
diff --git a/modules/rostests/apitests/gdi32/SetSysColors.c
b/modules/rostests/apitests/gdi32/SetSysColors.c
index d662996b87..c7584a7b80 100644
--- a/modules/rostests/apitests/gdi32/SetSysColors.c
+++ b/modules/rostests/apitests/gdi32/SetSysColors.c
@@ -5,12 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 #define NUM_SYSCOLORS 31
 
diff --git a/modules/rostests/apitests/gdi32/SetWindowExtEx.c
b/modules/rostests/apitests/gdi32/SetWindowExtEx.c
index e17af66342..b32455a2ed 100644
--- a/modules/rostests/apitests/gdi32/SetWindowExtEx.c
+++ b/modules/rostests/apitests/gdi32/SetWindowExtEx.c
@@ -5,13 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
-
-#define TEST(x) ok(x, #x"\n")
-#define RTEST(x) ok(x, #x"\n")
+#include "precomp.h"
 
 void Test_SetWindowExtEx()
 {
diff --git a/modules/rostests/apitests/gdi32/SetWorldTransform.c
b/modules/rostests/apitests/gdi32/SetWorldTransform.c
index 55e9e092a8..0b9c03cbe4 100644
--- a/modules/rostests/apitests/gdi32/SetWorldTransform.c
+++ b/modules/rostests/apitests/gdi32/SetWorldTransform.c
@@ -5,10 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <apitest.h>
-
-#include <wingdi.h>
-#include <winuser.h>
+#include "precomp.h"
 
 void Test_SetWorldTransform()
 {
diff --git a/modules/rostests/apitests/gdi32/init.c
b/modules/rostests/apitests/gdi32/init.c
index fcac6142d5..ab7d4673ea 100644
--- a/modules/rostests/apitests/gdi32/init.c
+++ b/modules/rostests/apitests/gdi32/init.c
@@ -1,7 +1,6 @@
 
-#include <stdio.h>
-#include <windef.h>
-#include <wingdi.h>
+#include "precomp.h"
+
 #include "init.h"
 
 HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32;
diff --git a/modules/rostests/apitests/gdi32/init.h
b/modules/rostests/apitests/gdi32/init.h
index 48d5ce8df7..a57e860a05 100644
--- a/modules/rostests/apitests/gdi32/init.h
+++ b/modules/rostests/apitests/gdi32/init.h
@@ -1,3 +1,4 @@
+#pragma once
 
 extern HBITMAP ghbmp1, ghbmp4, ghbmp8, ghbmp16, ghbmp24, ghbmp32;
 extern HBITMAP ghbmpDIB1, ghbmpDIB4, ghbmpDIB8, ghbmpDIB16, ghbmpDIB24, ghbmpDIB32;
diff --git a/modules/rostests/apitests/gdi32/precomp.h
b/modules/rostests/apitests/gdi32/precomp.h
new file mode 100644
index 0000000000..a0331e74a7
--- /dev/null
+++ b/modules/rostests/apitests/gdi32/precomp.h
@@ -0,0 +1,25 @@
+#ifndef _GDI32_APITEST_PRECOMP_H_
+#define _GDI32_APITEST_PRECOMP_H_
+
+#include <apitest.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winddi.h>
+#include <winnls.h>
+#include <include/ntgdityp.h>
+#include <include/ntgdihdl.h>
+#include <stdio.h>
+#include <strsafe.h>
+
+#define CLIPRGN 1
+
+#define TEST(x) ok(x, #x"\n")
+#define RTEST(x) ok(x, #x"\n")
+
+#define ok_rect(_prc, _left, _top, _right, _bottom) \
+    ok_int((_prc)->left, _left); \
+    ok_int((_prc)->top, _top); \
+    ok_int((_prc)->right, _right); \
+    ok_int((_prc)->bottom, _bottom); \
+
+#endif /* _GDI32_APITEST_PRECOMP_H_ */