diff --git a/modules/rostests/winetests/comdlg32/filedlg.c b/modules/rostests/winetests/comdlg32/filedlg.c
index 514f2513a20..4d940555a05 100644
--- a/modules/rostests/winetests/comdlg32/filedlg.c
+++ b/modules/rostests/winetests/comdlg32/filedlg.c
@@ -19,12 +19,19 @@
  *
  */
 
-#include "precomp.h"
+#include <windows.h>
+#include <wine/test.h>
 
-#include <shlguid.h>
-#include <shobjidl.h>
-#include <ole2.h>
+#include "shlguid.h"
+#define COBJMACROS
+#include "shobjidl.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "dlgs.h"
+
+#ifdef __REACTOS__
 #include <reactos/undocuser.h>
+#endif
 
 /* ##### */
 
diff --git a/modules/rostests/winetests/comdlg32/finddlg.c b/modules/rostests/winetests/comdlg32/finddlg.c
index 99c9eb1e226..be983081c59 100644
--- a/modules/rostests/winetests/comdlg32/finddlg.c
+++ b/modules/rostests/winetests/comdlg32/finddlg.c
@@ -19,7 +19,10 @@
  *
  */
 
-#include "precomp.h"
+#include "windows.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "wine/test.h"
 
 static UINT ID_FINDMSGSTRING;
 
diff --git a/modules/rostests/winetests/comdlg32/fontdlg.c b/modules/rostests/winetests/comdlg32/fontdlg.c
index 4a17bbcb1d5..090053522dd 100644
--- a/modules/rostests/winetests/comdlg32/fontdlg.c
+++ b/modules/rostests/winetests/comdlg32/fontdlg.c
@@ -19,9 +19,19 @@
  *
  */
 
-#include "precomp.h"
+#include <stdarg.h>
 
-#include <winspool.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "winspool.h"
+#include "winuser.h"
+#include "objbase.h"
+
+#include "commdlg.h"
+
+#include "wine/test.h"
 
 static int get_dpiy(void)
 {
diff --git a/modules/rostests/winetests/comdlg32/itemdlg.c b/modules/rostests/winetests/comdlg32/itemdlg.c
index f14a298de85..d28e682b491 100644
--- a/modules/rostests/winetests/comdlg32/itemdlg.c
+++ b/modules/rostests/winetests/comdlg32/itemdlg.c
@@ -19,10 +19,11 @@
  *
  */
 
-#include "precomp.h"
+#define COBJMACROS
+#define CONST_VTABLE
 
-#include <wincon.h>
-#include <shlobj.h>
+#include "shlobj.h"
+#include "wine/test.h"
 
 #define IDT_CHANGEFILETYPE 500
 #define IDT_CLOSEDIALOG    501
diff --git a/modules/rostests/winetests/comdlg32/precomp.h b/modules/rostests/winetests/comdlg32/precomp.h
index 86ad3d3cf6f..5a2beaafa6d 100644
--- a/modules/rostests/winetests/comdlg32/precomp.h
+++ b/modules/rostests/winetests/comdlg32/precomp.h
@@ -1,12 +1,12 @@
+
 #ifndef _COMDLG32_WINETEST_PRECOMP_H_
 #define _COMDLG32_WINETEST_PRECOMP_H_
 
 #define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
 #define COBJMACROS
 #define CONST_VTABLE
 
+#include <windows.h>
 #include <wine/test.h>
 
 #include <wingdi.h>
diff --git a/modules/rostests/winetests/comdlg32/printdlg.c b/modules/rostests/winetests/comdlg32/printdlg.c
index b2c20744ee8..4c6a47355c7 100644
--- a/modules/rostests/winetests/comdlg32/printdlg.c
+++ b/modules/rostests/winetests/comdlg32/printdlg.c
@@ -20,7 +20,25 @@
  *
  */
 
-#include "precomp.h"
+#define COBJMACROS
+#define CONST_VTABLE
+
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "objbase.h"
+
+#include "cderr.h"
+#include "commdlg.h"
+#include "dlgs.h"
+#include "winspool.h"
+
+#include "wine/test.h"
 
 /* ########################### */
 
diff --git a/modules/rostests/winetests/comdlg32/rsrc.rc b/modules/rostests/winetests/comdlg32/rsrc.rc
index e1bca96aa9d..68ab468ff86 100644
--- a/modules/rostests/winetests/comdlg32/rsrc.rc
+++ b/modules/rostests/winetests/comdlg32/rsrc.rc
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
+#include "windef.h"
+#include "winuser.h"
 
 TEMPLATE1 DIALOG 5, 43, 227, 215
 STYLE WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS