diff --git a/rostests/winetests/atl/CMakeLists.txt b/rostests/winetests/atl/CMakeLists.txt
index 7671533740b..23f6e0df879 100644
--- a/rostests/winetests/atl/CMakeLists.txt
+++ b/rostests/winetests/atl/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-
 list(APPEND SOURCE
     atl_ax.c
     module.c
@@ -8,9 +6,7 @@ list(APPEND SOURCE
     testlist.c)
 
 add_executable(atl_winetest ${SOURCE})
-
 target_link_libraries(atl_winetest wine uuid)
-
 set_module_type(atl_winetest win32cui)
 add_importlibs(atl_winetest ole32 user32 atl msvcrt kernel32 ntdll advapi32)
 add_cd_file(TARGET atl_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/atl/atl_ax.c b/rostests/winetests/atl/atl_ax.c
index 4555bd6053e..0d9e2da5fa7 100644
--- a/rostests/winetests/atl/atl_ax.c
+++ b/rostests/winetests/atl/atl_ax.c
@@ -18,22 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+//#include <stdarg.h>
+//#include <stdio.h>
 
 #define COBJMACROS
 
 #include <wine/test.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winerror.h>
-#include <winnt.h>
-#include <wtypes.h>
-#include <olectl.h>
-#include <ocidl.h>
+//#include <windef.h>
+//#include <winbase.h>
+//#include <winuser.h>
+//#include <wingdi.h>
+//#include <winnls.h>
+//#include <winerror.h>
+//#include <winnt.h>
+//#include <wtypes.h>
+#include <objbase.h>
+//#include <olectl.h>
+//#include <ocidl.h>
 #include <exdisp.h>
 
 static HRESULT (WINAPI *pAtlAxAttachControl)(IUnknown *, HWND, IUnknown **);
diff --git a/rostests/winetests/atl/module.c b/rostests/winetests/atl/module.c
index 2a97ef95ad3..8078e4f4f77 100644
--- a/rostests/winetests/atl/module.c
+++ b/rostests/winetests/atl/module.c
@@ -19,22 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+//#include <stdarg.h>
+//#include <stdio.h>
 
 #define COBJMACROS
 
 #include <wine/test.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winerror.h>
-#include <winnt.h>
-#include <wtypes.h>
-#include <olectl.h>
-#include <ocidl.h>
+//#include <windef.h>
+//#include <winbase.h>
+//#include <winuser.h>
+//#include <wingdi.h>
+//#include <winnls.h>
+//#include <winerror.h>
+//#include <winnt.h>
+//#include <wtypes.h>
+#include <objbase.h>
+//#include <olectl.h>
+//#include <ocidl.h>
 
 struct _ATL_OBJMAP_ENTRYW;
 struct _AtlCreateWndData;
diff --git a/rostests/winetests/atl/registrar.c b/rostests/winetests/atl/registrar.c
index 1b1c797d42e..c4f73cf8fc9 100644
--- a/rostests/winetests/atl/registrar.c
+++ b/rostests/winetests/atl/registrar.c
@@ -18,23 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <stdio.h>
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+//#include <stdarg.h>
+//#include <stdio.h>
 
 #define COBJMACROS
 
 #include <wine/test.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
+//#include <windef.h>
+//#include <winbase.h>
+//#include <winuser.h>
+//#include <wingdi.h>
 #include <winnls.h>
-#include <winerror.h>
-#include <winnt.h>
-#include <wtypes.h>
-#include <olectl.h>
-#include <ocidl.h>
-#include <initguid.h>
+#include <winreg.h>
+//#include <winerror.h>
+//#include <winnt.h>
+//#include <wtypes.h>
+#include <objbase.h>
+//#include <olectl.h>
+//#include <ocidl.h>
+//#include <initguid.h>
 #include <atliface.h>
 
 static const char textA[] =
diff --git a/rostests/winetests/atl/testlist.c b/rostests/winetests/atl/testlist.c
index b1de793dbaf..c562fb12e2f 100644
--- a/rostests/winetests/atl/testlist.c
+++ b/rostests/winetests/atl/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_atl_ax(void);
 extern void func_module(void);