* Addendum to r58214.

svn path=/trunk/; revision=58290

rostests/apitests/advapi32/CreateService.c

@@ -6,7 +6,8 @@
  */
 
 #include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winsvc.h>
 #include <strsafe.h>
 
 static int MakeService(SC_HANDLE hScm, const wchar_t *serviceName, SC_HANDLE *hService, DWORD *tag)

rostests/apitests/advapi32/LockDatabase.c

@@ -6,7 +6,7 @@
  */
 
 #include <wine/test.h>
-#include <windows.h>
+#include <winsvc.h>
 #include <strsafe.h>
 
 #define TESTING_SERVICE     L"Spooler"

rostests/apitests/advapi32/QueryServiceConfig2.c

@@ -6,7 +6,8 @@
  */
 
 #include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winsvc.h>
 #include <strsafe.h>
 
 #define TESTING_SERVICEW     L"Spooler"

rostests/apitests/advapi32/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_CreateService(void);
 extern void func_LockDatabase(void);

rostests/apitests/apitest.h

@@ -2,9 +2,11 @@
 #define _APITEST_H
 
 #include <stdlib.h>
-#include <stdarg.h>
 #include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <shellapi.h>
 
 #define APISTATUS_NORMAL 0
 #define APISTATUS_NOT_FOUND 1

rostests/apitests/crt/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 #if defined(TEST_MSVCRT)
 extern void func_mbstowcs_s(void);

rostests/apitests/dciman32/DCICreatePrimary.c

@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
 
 void Test_DCICreatePrimary()
 {

rostests/apitests/dciman32/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_DCICreatePrimary(void);
 

rostests/apitests/gdi32/AddFontResource.c

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 #define COUNT 26
 

rostests/apitests/gdi32/AddFontResourceEx.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <libs/pseh/pseh2.h>
 
 void Test_AddFontResourceExW()

rostests/apitests/gdi32/BeginPath.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_BeginPath()
 {

rostests/apitests/gdi32/CombineRgn.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_CombineRgn_Params()
 {

rostests/apitests/gdi32/CombineTransform.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 
 typedef union

rostests/apitests/gdi32/CreateBitmap.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 #define DEFAULT_BITMAP 21
 

rostests/apitests/gdi32/CreateBitmapIndirect.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_CreateBitmapIndirect()
 {

rostests/apitests/gdi32/CreateCompatibleDC.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_CreateCompatibleDC()
 {

rostests/apitests/gdi32/CreateDIBPatternBrush.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+
 #include "init.h"
 
 

rostests/apitests/gdi32/CreateDIBitmap.c

@@ -5,9 +5,11 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
+
 #include "init.h"
 
 #define CBM_CREATDIB 2

rostests/apitests/gdi32/CreateFont.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 #define INVALIDFONT "ThisFontDoesNotExist"
 

rostests/apitests/gdi32/CreateFontIndirect.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 
 void

rostests/apitests/gdi32/CreateIconIndirect.c

@@ -1,7 +1,7 @@
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 
 // FIXME user32

rostests/apitests/gdi32/CreatePen.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>

rostests/apitests/gdi32/CreateRectRgn.c

@@ -5,9 +5,7 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
 
 void Test_CreateRectRgn()
 {

rostests/apitests/gdi32/DPtoLP.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_DPtoLP_Params()
 {

rostests/apitests/gdi32/EngAcquireSemaphore.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 
 void Test_EngAcquireSemaphore()

rostests/apitests/gdi32/EngCreateSemaphore.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 
 void Test_EngCreateSemaphore()

rostests/apitests/gdi32/EngDeleteSemaphore.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 
 void Test_EngDeleteSemaphore()

rostests/apitests/gdi32/EngReleaseSemaphore.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 
 void Test_EngReleaseSemaphore()

rostests/apitests/gdi32/ExtCreatePen.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>

rostests/apitests/gdi32/GdiConvertBitmap.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HBITMAP WINAPI GdiConvertBitmap(HBITMAP hbm);
 

rostests/apitests/gdi32/GdiConvertBrush.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HBRUSH WINAPI GdiConvertBrush(HBRUSH hbr);
 

rostests/apitests/gdi32/GdiConvertDC.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HDC WINAPI GdiConvertDC(HDC hdc);
 

rostests/apitests/gdi32/GdiConvertFont.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HFONT WINAPI GdiConvertFont(HFONT);
 

rostests/apitests/gdi32/GdiConvertPalette.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HPALETTE WINAPI GdiConvertPalette(HPALETTE);
 

rostests/apitests/gdi32/GdiConvertRegion.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HRGN WINAPI GdiConvertRegion(HRGN);
 

rostests/apitests/gdi32/GdiDeleteLocalDC.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 BOOL WINAPI GdiDeleteLocalDC(HDC);
 

rostests/apitests/gdi32/GdiGetCharDimensions.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_GdiGetCharDimensions()
 {

rostests/apitests/gdi32/GdiGetLocalBrush.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HBRUSH WINAPI GdiGetLocalBrush(HBRUSH hbr);
 

rostests/apitests/gdi32/GdiGetLocalDC.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HDC WINAPI GdiGetLocalDC(HDC);
 

rostests/apitests/gdi32/GdiReleaseLocalDC.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 BOOL WINAPI GdiReleaseLocalDC(HDC);
 

rostests/apitests/gdi32/GdiSetAttrs.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 BOOL WINAPI GdiSetAttrs(HDC);
 

rostests/apitests/gdi32/GetClipRgn.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_GetClipRgn()
 {

rostests/apitests/gdi32/GetCurrentObject.c

@@ -5,10 +5,10 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
+#include <winuser.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>
 

rostests/apitests/gdi32/GetDIBColorTable.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_GetDIBColorTable()
 {

rostests/apitests/gdi32/GetDIBits.c

@@ -5,9 +5,10 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+
 #include "init.h"
 
 void

rostests/apitests/gdi32/GetObject.c

@@ -5,10 +5,11 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>
 

rostests/apitests/gdi32/GetPixel.c

@@ -5,10 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
-
 
 void Test_GetPixel_1bpp()
 {

rostests/apitests/gdi32/GetRandomRgn.c

@@ -7,7 +7,8 @@
 
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 #define CLIPRGN 1
 #define METARGN 2

rostests/apitests/gdi32/GetStockObject.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>

rostests/apitests/gdi32/GetTextExtentExPoint.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")

rostests/apitests/gdi32/GetTextFace.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")

rostests/apitests/gdi32/MaskBlt.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_MaskBlt_1bpp()
 {

rostests/apitests/gdi32/PatBlt.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 HBITMAP ghbmpTarget;
 PULONG gpulTargetBits;

rostests/apitests/gdi32/Rectangle.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 
 void Test_Rectangle(void)
 {

rostests/apitests/gdi32/SelectObject.c

@@ -7,8 +7,10 @@
 
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
 #include <winddi.h>
+#include <winuser.h>
+#include <pseh/pseh2.h>
 #include <include/ntgdityp.h>
 #include <include/ntgdihdl.h>
 

rostests/apitests/gdi32/SetBrushOrgEx.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <pseh/pseh2.h>
 
 void Test_Set(ULONG ulLine, HDC hdc, INT x, INT y, LPPOINT ppt, BOOL bExp, DWORD dwErrExp)
 {

rostests/apitests/gdi32/SetDCPenColor.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_SetDCPenColor()
 {

rostests/apitests/gdi32/SetDIBits.c

@@ -5,10 +5,8 @@
  * PROGRAMMERS:     Jérôme Gardou
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
-
 
 void Test_SetDIBits()
 {

rostests/apitests/gdi32/SetDIBitsToDevice.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+
 #include "init.h"
 
 static void

rostests/apitests/gdi32/SetMapMode.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")

rostests/apitests/gdi32/SetPixel.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <mmsystem.h>
 
 static struct
 {

rostests/apitests/gdi32/SetSysColors.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 #define TEST(x) ok(x, #x"\n")
 

rostests/apitests/gdi32/SetWindowExtEx.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 #define TEST(x) ok(x, #x"\n")
 #define RTEST(x) ok(x, #x"\n")

rostests/apitests/gdi32/SetWorldTransform.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_SetWorldTransform()
 {

rostests/apitests/gdi32/init.c

@@ -1,6 +1,7 @@
 
 #include <stdio.h>
-#include <windows.h>
+#include <windef.h>
+#include <wingdi.h>
 
 HBITMAP ghbmpDIB32;
 HDC ghdcDIB32;

rostests/apitests/gdi32/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_AddFontResource(void);
 extern void func_AddFontResourceEx(void);

rostests/apitests/kernel32/GetDriveType.c

@@ -1,6 +1,4 @@
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
 
 #define IS_DRIVE_TYPE_VALID(type) ((type) != DRIVE_UNKNOWN && (type) != DRIVE_NO_ROOT_DIR)
 

rostests/apitests/kernel32/GetModuleFileName.c

@@ -6,10 +6,13 @@
  */
 
 #define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #define UNICODE
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winreg.h>
+#include <winnls.h>
 #include <shlwapi.h>
 
 static

rostests/apitests/kernel32/MultiByteToWideChar.c

@@ -5,9 +5,8 @@
  * PROGRAMMER:      Mike "tamlin" Nordell
  */
 
-#include <windows.h>
-#include <stdio.h>
 #include <wine/test.h>
+#include <winnls.h>
 
 
 START_TEST(MultiByteToWideChar)

rostests/apitests/kernel32/lstrcpynW.c

@@ -7,7 +7,6 @@
 #define WIN32_NO_STATUS
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
 
 START_TEST(lstrcpynW)
 {

rostests/apitests/kernel32/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_GetCurrentDirectory(void);
 extern void func_GetDriveType(void);

rostests/apitests/msvcrt/CmdLineUtil/CmdLineUtil.c

@@ -7,8 +7,9 @@
 
 #define WIN32_NO_STATUS
 #include <stdio.h>
-#include <windows.h>
+#include <windef.h>
-#include <ndk/ntndk.h>
+#include <winbase.h>
+#include <ndk/rtlfuncs.h>
 
 #include "CmdLineUtil.h"
 

rostests/apitests/msvcrt/CommandLine.c

@@ -9,7 +9,7 @@
 #define UNICODE
 #include <stdio.h>
 #include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/umtypes.h>
 
 #include "./CmdLineUtil/CmdLineUtil.h"
 

rostests/apitests/msvcrt/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_CommandLine(void);
 extern void func_ieee(void);

rostests/apitests/ntdll/LdrEnumResources.c

@@ -7,7 +7,6 @@
 
 #define WIN32_NO_STATUS
 #define UNICODE
-#include <stdio.h>
 #include <wine/test.h>
 #include <pseh/pseh2.h>
 #include <ndk/ldrfuncs.h>

rostests/apitests/ntdll/NtAllocateVirtualMemory.c

@@ -6,7 +6,6 @@
  */
 
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
 #include <ndk/rtlfuncs.h>
 #include <ndk/mmfuncs.h>

rostests/apitests/ntdll/NtFreeVirtualMemory.c

@@ -1,7 +1,7 @@
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/pstypes.h>
+#include <ndk/mmfuncs.h>
 
 static void Test_NtFreeVirtualMemory(void)
 {

rostests/apitests/ntdll/NtQuerySystemEnvironmentValue.c

@@ -6,9 +6,10 @@
  */
 
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/setypes.h>
+#include <ndk/rtlfuncs.h>
+#include <ndk/exfuncs.h>
 
 // Arbitrary-defined constants
 #define MIN_BUFFER_LENGTH 4L

rostests/apitests/ntdll/RtlBitmap.c

@@ -1,6 +1,5 @@
 
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
 #include <ndk/rtlfuncs.h>
 #include <pseh/pseh2.h>

rostests/apitests/ntdll/RtlInitializeBitMap.c

@@ -6,9 +6,8 @@
  */
 
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/rtlfuncs.h>
 
 void Test_RtlInitializeBitmap()
 {

rostests/apitests/ntdll/SystemInfo.c

@@ -6,9 +6,8 @@
  */
 
 #define WIN32_NO_STATUS
-#include <stdio.h>
 #include <wine/test.h>
-#include <ndk/ntndk.h>
+#include <ndk/exfuncs.h>
 
 void
 GetPrivilege()

rostests/apitests/ntdll/ZwContinue.c

@@ -6,7 +6,6 @@
  */
 
 #include <setjmp.h>
-#include <stdio.h>
 #include <time.h>
 #include <wine/test.h>
 

rostests/apitests/ntdll/testlist.c

@@ -1,9 +1,7 @@
-#define WIN32_LEAN_AND_MEAN
 #define __ROS_LONG64__
-#include <windows.h>
 
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_LdrEnumResources(void);
 extern void func_NtAllocateVirtualMemory(void);

rostests/apitests/powrprof/power.c

@@ -8,17 +8,12 @@
  */
 
 #include <stdarg.h>
-#include "ntstatus.h"
+#include <ntstatus.h>
 #define WIN32_NO_STATUS
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
-#include "winternl.h"
+#include <winreg.h>
-#include "windef.h"
+#include <powrprof.h>
-#include "winbase.h"
-#include "winreg.h"
-#include "powrprof.h"
-#include "assert.h"
-#include "winnt.h"
 
 /*
    LONG WINAPI RegOpenCurrentUser(REGSAM a,PHKEY b)

rostests/apitests/powrprof/testlist.c

@@ -1,11 +1,11 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
 /* stdarg.h is needed for Winelib */
-#include <stdarg.h>
+//#include <stdarg.h>
-#include <stdio.h>
+//#include <stdio.h>
-#include <stdlib.h>
+//#include <stdlib.h>
-#include "windef.h"
+//#include "windef.h"
-#include "winbase.h"
+//#include "winbase.h"
 
 struct test
 {
@@ -22,4 +22,4 @@ const struct test winetest_testlist[] =
 };
 
 #define WINETEST_WANT_MAIN
-#include "wine/test.h"
+#include <wine/test.h>

rostests/apitests/user32/AttachThreadInput.c

@@ -5,11 +5,10 @@
  * PROGRAMMERS:     Giannis Adamopoulos
  */
 
-#include <windows.h>
-#include <stdio.h>
 #include <wine/test.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include "helper.h"
-#include <undocuser.h>
 
 #define DESKTOP_ALL_ACCESS 0x01ff
 

rostests/apitests/user32/CreateIconFromResourceEx.c

@@ -1,7 +1,5 @@
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
-#include "resource.h"
 
 START_TEST(CreateIconFromResourceEx)
 {

rostests/apitests/user32/DeferWindowPos.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Thomas Faber
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
 #include "helper.h"
 #include <undocuser.h>
 

rostests/apitests/user32/DestroyCursorIcon.c

@@ -1,7 +1,6 @@
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
-#include "resource.h"
+#include <winuser.h>
 
 START_TEST(DestroyCursorIcon)
 {

rostests/apitests/user32/DrawIconEx.c

@@ -1,7 +1,6 @@
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
-#include "resource.h"
+#include <winuser.h>
 
 START_TEST(DrawIconEx)
 {

rostests/apitests/user32/GetIconInfo.c

@@ -1,7 +1,7 @@
-
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 // FIXME user32

rostests/apitests/user32/GetKeyState.c

@@ -5,13 +5,11 @@
  * PROGRAMMERS:     Giannis Adamopoulos
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
 #include <assert.h>
 
 HHOOK hKbdHook, hKbdLLHook;
-	
 
 LRESULT CALLBACK KeyboardProc(int code, WPARAM wParam,  LPARAM lParam)
 {

rostests/apitests/user32/GetPeekMessage.c

@@ -5,9 +5,8 @@
  * PROGRAMMERS:     Thomas Faber
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
 
 void Test_GetMessage(HWND hWnd)
 {

rostests/apitests/user32/GetSystemMetrics.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_GetSystemMetrics()
 {

rostests/apitests/user32/InitializeLpkHooks.c

@@ -5,10 +5,8 @@
  * PROGRAMMERS:     Magnus Olsen
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
-
 
 typedef struct _LPK_LPEDITCONTROL_LIST
 {

rostests/apitests/user32/LoadImage.c

@@ -1,8 +1,7 @@
-
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
-#include "resource.h"
+#include <winuser.h>
 
 START_TEST(LoadImage)
 {

rostests/apitests/user32/RealGetWindowClass.c

@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <winuser.h>
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 

rostests/apitests/user32/ScrollDC.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_ScrollDC()
 {

rostests/apitests/user32/ScrollWindowEx.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Timo Kreuzer
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 
 void Test_ScrollWindowEx()
 {

rostests/apitests/user32/SetActiveWindow.c

@@ -5,9 +5,9 @@
  * PROGRAMMERS:     Giannis Adamopoulos
  */
 
-#include <stdio.h>
 #include <wine/test.h>
-#include <windows.h>
+#include <wingdi.h>
+#include <winuser.h>
 #include "helper.h"
 #include <undocuser.h>