Fixed header dependencies to be fully compatible with the Windows
headers (with help from Dimitrie O. Paun).
diff --git a/controls/button.c b/controls/button.c
index 7cc8bf9..1368599 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -19,11 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "controls.h"
diff --git a/controls/combo.c b/controls/combo.c
index e8619bd..6b2d6a4 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -20,10 +20,11 @@
* FIXME: roll up in Netscape 3.01.
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winuser16.h"
diff --git a/controls/desktop.c b/controls/desktop.c
index 9dd5423..8ee0acc 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -27,6 +28,7 @@
#endif
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "user.h"
#include "controls.h"
diff --git a/controls/edit.c b/controls/edit.c
index a1bc526..c6e991a 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -39,9 +39,11 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "wownt32.h"
diff --git a/controls/icontitle.c b/controls/icontitle.c
index 8c0ca32..53bd8f8 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
diff --git a/controls/listbox.c b/controls/listbox.c
index cb4e7b4..0bbaa76 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -20,8 +20,10 @@
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/winbase16.h"
diff --git a/controls/menu.c b/controls/menu.c
index bdae2a2..16af97a 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -31,6 +31,7 @@
#include <assert.h>
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
diff --git a/controls/scroll.c b/controls/scroll.c
index e5fcd0a..fc10e28 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -19,7 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "controls.h"
diff --git a/controls/static.c b/controls/static.c
index ab3f30c..43216e8 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wownt32.h"
diff --git a/controls/uitools.c b/controls/uitools.c
index 2592125..6b626a4 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -19,7 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index 9c3dd4e..7a84b52 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -29,6 +29,7 @@
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "winreg.h"
#include "winerror.h"
#include "wine/library.h"
@@ -139,7 +140,7 @@
*
* See AbortSystemShutdownA.
*/
-BOOL WINAPI AbortSystemShutdownW( LPCWSTR lpMachineName )
+BOOL WINAPI AbortSystemShutdownW( LPWSTR lpMachineName )
{
TRACE("stub %s (harmless)\n", debugstr_w(lpMachineName));
return TRUE;
diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h
index b23afb8..0a5c6ca 100644
--- a/dlls/advapi32/crypt.h
+++ b/dlls/advapi32/crypt.h
@@ -21,6 +21,10 @@
#ifndef __WINE_CRYPT_H
#define __WINE_CRYPT_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "wincrypt.h"
typedef struct tagPROVFUNCS
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 991e009..1dbe651 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -18,9 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winbase.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index d86a7a0..1a7a83b 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -27,11 +27,14 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
+#include "ntstatus.h"
#include "wine/unicode.h"
#include "heap.h"
#include "wine/server.h"
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 82439b5..a2a64c8 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -18,12 +18,16 @@
* FIXME: for all functions thunking down to Rtl* functions: implement SetLastError()
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "rpcnterr.h"
+#include "winreg.h"
#include "winternl.h"
+#include "ntstatus.h"
#include "ntsecapi.h"
#include "accctrl.h"
diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c
index bcc4542..9f5b8cf 100644
--- a/dlls/advapi32/service.c
+++ b/dlls/advapi32/service.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <time.h>
#include "windef.h"
+#include "winbase.h"
#include "winsvc.h"
#include "winerror.h"
#include "winreg.h"
diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 475a3b0..4e49cd9 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -19,7 +19,9 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c
index 4b40bfc..1868751 100644
--- a/dlls/avicap32/avicap32_main.c
+++ b/dlls/avicap32/avicap32_main.c
@@ -17,7 +17,13 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "vfw.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c
index 32cf6a2..5cff037 100644
--- a/dlls/avifil32/acmstream.c
+++ b/dlls/avifil32/acmstream.c
@@ -18,8 +18,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 382d1bf..c7a91ed 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -19,9 +19,12 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 084dadc..fa3f6b6 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -32,8 +32,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c
index 1187f80..937787f 100644
--- a/dlls/avifil32/extrachunk.c
+++ b/dlls/avifil32/extrachunk.c
@@ -21,6 +21,7 @@
#include "extrachunk.h"
#include "winbase.h"
+#include "wingdi.h"
#include "windowsx.h"
#include "vfw.h"
diff --git a/dlls/avifil32/extrachunk.h b/dlls/avifil32/extrachunk.h
index c2d810b..35f4bc0 100644
--- a/dlls/avifil32/extrachunk.h
+++ b/dlls/avifil32/extrachunk.h
@@ -19,7 +19,10 @@
#ifndef __WINE_EXTRACHUNK_H
#define __WINE_EXTRACHUNK_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "mmsystem.h"
#ifdef __cplusplus
diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c
index da96165..fe27f4f 100644
--- a/dlls/avifil32/factory.c
+++ b/dlls/avifil32/factory.c
@@ -18,8 +18,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c
index 1eb9f42..b911c35 100644
--- a/dlls/avifil32/getframe.c
+++ b/dlls/avifil32/getframe.c
@@ -18,10 +18,13 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "windowsx.h"
+#include "wingdi.h"
#include "vfw.h"
#include "avifile_private.h"
diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c
index 693756a..663c505 100644
--- a/dlls/avifil32/icmstream.c
+++ b/dlls/avifil32/icmstream.c
@@ -18,8 +18,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/avifil32/regsvr.c b/dlls/avifil32/regsvr.c
index 6aa1bf6..2d97b12 100644
--- a/dlls/avifil32/regsvr.c
+++ b/dlls/avifil32/regsvr.c
@@ -19,10 +19,12 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/avifil32/rsrc.rc b/dlls/avifil32/rsrc.rc
index f973c46..f3f8243 100644
--- a/dlls/avifil32/rsrc.rc
+++ b/dlls/avifil32/rsrc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winver.h"
#include "avifile_private.h"
diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c
index 7b08506..57fcf44 100644
--- a/dlls/avifil32/tmpfile.c
+++ b/dlls/avifil32/tmpfile.c
@@ -18,8 +18,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c
index 3ba7de1..214fc63 100644
--- a/dlls/avifil32/wavfile.c
+++ b/dlls/avifil32/wavfile.c
@@ -18,8 +18,11 @@
#define COM_NO_WINDOWS_H
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/cabinet/cabextract.c b/dlls/cabinet/cabextract.c
index bb192be..4a028aa 100644
--- a/dlls/cabinet/cabextract.c
+++ b/dlls/cabinet/cabextract.c
@@ -28,6 +28,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
diff --git a/dlls/cabinet/cabinet.h b/dlls/cabinet/cabinet.h
index 87d1c09..083f636 100644
--- a/dlls/cabinet/cabinet.h
+++ b/dlls/cabinet/cabinet.h
@@ -20,6 +20,10 @@
#ifndef __WINE_CABINET_H
#define __WINE_CABINET_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
#include "fdi.h"
#include "fci.h"
diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index 6a4a5ae..a9e86c0 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -17,21 +17,20 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
+
#include "config.h"
+#include <assert.h>
+#include <stdarg.h>
+#include <string.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-
-#include <assert.h>
-
#define NO_SHLWAPI_REG
#include "shlwapi.h"
#undef NO_SHLWAPI_REG
-#include <string.h>
-
#include "cabinet.h"
#include "wine/debug.h"
diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c
index 1a64c44..e588ba1 100644
--- a/dlls/cabinet/fci.c
+++ b/dlls/cabinet/fci.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 23295d0..2b91516 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -60,6 +60,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h
index 4b66aed..5ca861d 100644
--- a/dlls/comcat/comcat_private.h
+++ b/dlls/comcat/comcat_private.h
@@ -19,6 +19,8 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/comcat/regsvr.c b/dlls/comcat/regsvr.c
index e2f1b20..114aaca 100644
--- a/dlls/comcat/regsvr.c
+++ b/dlls/comcat/regsvr.c
@@ -20,6 +20,7 @@
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
index 066dfc7..94c1ca4 100644
--- a/dlls/comctl32/animate.c
+++ b/dlls/comctl32/animate.c
@@ -29,8 +29,13 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "vfw.h"
#include "mmsystem.h"
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c
index 235a839..c0099e8 100644
--- a/dlls/comctl32/comboex.c
+++ b/dlls/comctl32/comboex.c
@@ -30,8 +30,13 @@
*
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
#include "wine/unicode.h"
diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
index 62ebe3f..a9ad8e0 100644
--- a/dlls/comctl32/comctl32.h
+++ b/dlls/comctl32/comctl32.h
@@ -24,6 +24,15 @@
#ifndef __WINE_COMCTL32_H
#define __WINE_COMCTL32_H
+#ifndef RC_INVOKED
+#include <stdarg.h>
+#endif
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
extern HMODULE COMCTL32_hModule;
diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c
index 6d48aad..b203fa4 100644
--- a/dlls/comctl32/comctl32undoc.c
+++ b/dlls/comctl32/comctl32undoc.c
@@ -32,6 +32,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h> /* atoi */
#include <ctype.h>
@@ -39,11 +40,15 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "winreg.h"
#include "commctrl.h"
#include "objbase.h"
-#include "winbase.h"
#include "winerror.h"
-#include "winreg.h"
#include "wine/unicode.h"
#include "comctl32.h"
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 153745f..5f1beadf 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -54,10 +54,15 @@
* -- ICC_WIN95_CLASSES
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "winerror.h"
#include "winreg.h"
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 5d33c3a..9f32f59 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -27,10 +27,14 @@
#include <math.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/draglist.c b/dlls/comctl32/draglist.c
index 90005d3..cb896f4 100644
--- a/dlls/comctl32/draglist.c
+++ b/dlls/comctl32/draglist.c
@@ -26,6 +26,13 @@
* - Everything.
*/
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c
index a348a06..0a1ecb5 100644
--- a/dlls/comctl32/flatsb.c
+++ b/dlls/comctl32/flatsb.c
@@ -29,9 +29,14 @@
*
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c
index 3c20b60..0d47f13 100644
--- a/dlls/comctl32/header.c
+++ b/dlls/comctl32/header.c
@@ -32,10 +32,15 @@
* - Little flaw when drawing a bitmap on the right side of the text.
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "comctl32.h"
#include "imagelist.h"
diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c
index 5eb288c..fdbc16f 100644
--- a/dlls/comctl32/hotkey.c
+++ b/dlls/comctl32/hotkey.c
@@ -22,8 +22,13 @@
* - What are we meant to do with the WM_CHAR message?
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "comctl32.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 4bd9084..3088349 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -41,11 +41,15 @@
* offset of the mouse messages sent to the application...
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commctrl.h"
#include "imagelist.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/imagelist.h b/dlls/comctl32/imagelist.h
index c6cf577..5c5ab69 100644
--- a/dlls/comctl32/imagelist.h
+++ b/dlls/comctl32/imagelist.h
@@ -21,7 +21,10 @@
#ifndef __WINE_IMAGELIST_H
#define __WINE_IMAGELIST_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "pshpack1.h"
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index a03bea0..289ab47 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -34,10 +34,15 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 2d52a75..0371e3f 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -152,10 +152,15 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "comctl32.h"
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index 755c949..9d05f02 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -31,12 +31,13 @@
*/
#include <math.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c
index c95620b..aba0527 100644
--- a/dlls/comctl32/nativefont.c
+++ b/dlls/comctl32/nativefont.c
@@ -27,8 +27,13 @@
* - All notifications.
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index f52a1f4..7417349 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -28,8 +28,13 @@
* Implement drag and drop style.
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index a95136a..0a10b92 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -32,8 +32,13 @@
*
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index a3d7be9..4da54f9 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -23,14 +23,18 @@
* - Unicode property sheets
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "prsht.h"
-#include "winnls.h"
#include "comctl32.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index bb21f5c..eedd289 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -139,12 +139,16 @@
* RB_CHEVRONPUSHED, RBN_MINMAX
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/unicode.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/rsrc.rc b/dlls/comctl32/rsrc.rc
index 4bf70d4..03b0fcf 100644
--- a/dlls/comctl32/rsrc.rc
+++ b/dlls/comctl32/rsrc.rc
@@ -20,6 +20,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "comctl32.h"
diff --git a/dlls/comctl32/smoothscroll.c b/dlls/comctl32/smoothscroll.c
index 0a0c481..1eb5039 100644
--- a/dlls/comctl32/smoothscroll.c
+++ b/dlls/comctl32/smoothscroll.c
@@ -21,9 +21,15 @@
* - actually add smooth scrolling
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c
index 6d4e07b..ad376ce 100644
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -40,10 +40,15 @@
* -- CCS_VERT (defaults to RIGHT)
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c
index 3b0fcf2..3f493c6 100644
--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -27,9 +27,14 @@
* UpDown control not displayed until after a tab is clicked on
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "comctl32.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index 6b3ff2c..a1642eb 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -18,7 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/test.h"
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index b8b92e0..4ce4075 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -58,13 +58,15 @@
* - Charles Petzold's 'Programming Windows': gadgets.exe
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/unicode.h"
+#include "winnls.h"
#include "commctrl.h"
#include "imagelist.h"
#include "comctl32.h"
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index cb5ad96..0f112d1 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -71,10 +71,15 @@
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c
index 87356a8..c7db527 100644
--- a/dlls/comctl32/trackbar.c
+++ b/dlls/comctl32/trackbar.c
@@ -30,11 +30,16 @@
*
*/
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 989629a..c43f45c 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -43,14 +43,18 @@
#include <assert.h>
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
#include <limits.h>
#include <stdlib.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "comctl32.h"
#include "wine/debug.h"
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c
index 98fdbd7..6bb622d 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -30,14 +30,15 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "commctrl.h"
#include "winnls.h"
+#include "commctrl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/cdlg.h b/dlls/commdlg/cdlg.h
index b1d61cb..acf06d7 100644
--- a/dlls/commdlg/cdlg.h
+++ b/dlls/commdlg/cdlg.h
@@ -146,6 +146,11 @@
#define IDS_COLOR_AQUA 1054
#define IDS_COLOR_WHITE 1055
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "shlobj.h"
#include "shellapi.h"
diff --git a/dlls/commdlg/cdlg32.c b/dlls/commdlg/cdlg32.c
index 7cee9f3..90f15de 100644
--- a/dlls/commdlg/cdlg32.c
+++ b/dlls/commdlg/cdlg32.c
@@ -19,7 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "cderr.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/commdlg/cdlg_xx.rc
index faa1a05..9c2ea60 100644
--- a/dlls/commdlg/cdlg_xx.rc
+++ b/dlls/commdlg/cdlg_xx.rc
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
+#include "winbase.h"
#include "winver.h"
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c
index 03d81de..f18b706 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -25,6 +25,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
@@ -32,6 +33,7 @@
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "winuser.h"
#include "commdlg.h"
#include "dlgs.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/colordlg.h b/dlls/commdlg/colordlg.h
index 9602b7c..cddf509 100644
--- a/dlls/commdlg/colordlg.h
+++ b/dlls/commdlg/colordlg.h
@@ -27,6 +27,7 @@
#define _WINE_COLORDLG_H
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -35,6 +36,7 @@
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "winuser.h"
#include "commdlg.h"
#include "dlgs.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/colordlg16.c b/dlls/commdlg/colordlg16.c
index c3198db..08b864c 100644
--- a/dlls/commdlg/colordlg16.c
+++ b/dlls/commdlg/colordlg16.c
@@ -25,6 +25,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
@@ -32,6 +33,7 @@
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "winuser.h"
#include "commdlg.h"
#include "dlgs.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 13f4bad..d3fc4bb 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -20,6 +20,7 @@
*/
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
@@ -29,9 +30,11 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
+#include "winuser.h"
#include "commdlg.h"
#include "wine/debug.h"
#include "cderr.h"
+#include "winreg.h"
#include "winternl.h"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
diff --git a/dlls/commdlg/filedlg16.c b/dlls/commdlg/filedlg16.c
index dfeded9..4f798b0 100644
--- a/dlls/commdlg/filedlg16.c
+++ b/dlls/commdlg/filedlg16.c
@@ -20,6 +20,7 @@
*/
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
@@ -29,9 +30,11 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
+#include "winuser.h"
#include "commdlg.h"
#include "wine/debug.h"
#include "cderr.h"
+#include "winreg.h"
#include "winternl.h"
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index 4f0099c..b06ab8f 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -56,15 +56,20 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winnls.h"
#include "wine/unicode.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "dlgs.h"
#include "cdlg.h"
diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index 28c2101..db1ade8 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/commdlg/filedlgbrowser.h b/dlls/commdlg/filedlgbrowser.h
index 5e61151..a70f39e 100644
--- a/dlls/commdlg/filedlgbrowser.h
+++ b/dlls/commdlg/filedlgbrowser.h
@@ -22,9 +22,15 @@
#ifndef SHBROWSER_H
#define SHBROWSER_H
+#ifndef RC_INVOKED
+#include <stdarg.h>
+#endif
+
#define COM_NO_WINDOWS_H
-#include "shlobj.h"
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
+#include "shlobj.h"
#include "objbase.h"
#include "commdlg.h"
diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c
index b543cd7..dc76925 100644
--- a/dlls/commdlg/filetitle.c
+++ b/dlls/commdlg/filetitle.c
@@ -19,11 +19,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "cdlg.h"
#include "wine/unicode.h"
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index 8466e84..111c7ed 100644
--- a/dlls/commdlg/finddlg.c
+++ b/dlls/commdlg/finddlg.c
@@ -20,11 +20,15 @@
*/
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "wine/debug.h"
#include "cderr.h"
diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c
index 259fe1f..b772273 100644
--- a/dlls/commdlg/finddlg32.c
+++ b/dlls/commdlg/finddlg32.c
@@ -19,9 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "winnls.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c
index 58868be..074669a 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -21,12 +21,14 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "wingdi.h"
+#include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "heap.h"
diff --git a/dlls/commdlg/fontdlg.h b/dlls/commdlg/fontdlg.h
index 7a0d25a..2f2ef6e 100644
--- a/dlls/commdlg/fontdlg.h
+++ b/dlls/commdlg/fontdlg.h
@@ -27,6 +27,12 @@
#ifndef _WINE_FONTDLG_H
#define _WINE_FONTDLG_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
typedef struct
diff --git a/dlls/commdlg/fontdlg16.c b/dlls/commdlg/fontdlg16.c
index 49a1291..66c4464 100644
--- a/dlls/commdlg/fontdlg16.c
+++ b/dlls/commdlg/fontdlg16.c
@@ -21,11 +21,13 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
+#include "winuser.h"
#include "winnls.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
diff --git a/dlls/commdlg/generic.c b/dlls/commdlg/generic.c
index 9c0f250..f201bb5 100644
--- a/dlls/commdlg/generic.c
+++ b/dlls/commdlg/generic.c
@@ -21,7 +21,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "wine/debug.h"
diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index 287ddb4..8467349 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -22,6 +22,7 @@
*/
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/commdlg/printdlg16.c b/dlls/commdlg/printdlg16.c
index 5cbf394..2b9d8e4 100644
--- a/dlls/commdlg/printdlg16.c
+++ b/dlls/commdlg/printdlg16.c
@@ -23,6 +23,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/commdlg/rsrc.rc b/dlls/commdlg/rsrc.rc
index 49892cd..dc3558d 100644
--- a/dlls/commdlg/rsrc.rc
+++ b/dlls/commdlg/rsrc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "cdlg.h"
diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c
index 2b7cd58..8e5f628 100644
--- a/dlls/crypt32/main.c
+++ b/dlls/crypt32/main.c
@@ -17,6 +17,9 @@
*/
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wincrypt.h"
#include "mssip.h"
diff --git a/dlls/ctl3d/ctl3d32.c b/dlls/ctl3d/ctl3d32.c
index f9e646b..e9035cf 100644
--- a/dlls/ctl3d/ctl3d32.c
+++ b/dlls/ctl3d/ctl3d32.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c
index c1f0e53..642be18 100644
--- a/dlls/d3d8/basetexture.c
+++ b/dlls/d3d8/basetexture.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c
index c44889c..7480a12 100644
--- a/dlls/d3d8/cubetexture.c
+++ b/dlls/d3d8/cubetexture.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c
index af7fab4..c73b838 100644
--- a/dlls/d3d8/d3d8_main.c
+++ b/dlls/d3d8/d3d8_main.c
@@ -18,6 +18,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 2b06208..14a9796 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -58,6 +58,10 @@
#define LEAVE_GL() wine_tsx11_unlock_ptr()
#endif
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "d3d8.h"
/* Device caps */
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index bec7a83..47d2fa0 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <math.h>
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 59cd9bb..a230335 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d8/drawprim.c b/dlls/d3d8/drawprim.c
index acd81c9..31f9f53 100644
--- a/dlls/d3d8/drawprim.c
+++ b/dlls/d3d8/drawprim.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <math.h>
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c
index d3cc6d3..7b75164 100644
--- a/dlls/d3d8/indexbuffer.c
+++ b/dlls/d3d8/indexbuffer.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/resource.c b/dlls/d3d8/resource.c
index ee804a9..95da66d 100644
--- a/dlls/d3d8/resource.c
+++ b/dlls/d3d8/resource.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c
index 873bc05..deb0742 100644
--- a/dlls/d3d8/shader.c
+++ b/dlls/d3d8/shader.c
@@ -20,14 +20,15 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c
index 263a53d..ce66495 100644
--- a/dlls/d3d8/stateblock.c
+++ b/dlls/d3d8/stateblock.c
@@ -20,14 +20,15 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c
index 4096cdd..cb7e38a 100644
--- a/dlls/d3d8/surface.c
+++ b/dlls/d3d8/surface.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <stdarg.h>
+#include <stdio.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
@@ -28,7 +31,6 @@
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <stdio.h>
#include "d3d8_private.h"
diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c
index 01184b9..5f85311 100644
--- a/dlls/d3d8/swapchain.c
+++ b/dlls/d3d8/swapchain.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index 65e5c5a..0d94794 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/utils.c b/dlls/d3d8/utils.c
index 4727233..723aac9 100644
--- a/dlls/d3d8/utils.c
+++ b/dlls/d3d8/utils.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <math.h>
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c
index 1d85b56..d04fc3c 100644
--- a/dlls/d3d8/vertexbuffer.c
+++ b/dlls/d3d8/vertexbuffer.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index f98db6e..307a934 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c
index d09b8c0..b2ac97d 100644
--- a/dlls/d3d8/volumetexture.c
+++ b/dlls/d3d8/volumetexture.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d8/vshaderdeclaration.c b/dlls/d3d8/vshaderdeclaration.c
index f39e156..c15cd9fe 100644
--- a/dlls/d3d8/vshaderdeclaration.c
+++ b/dlls/d3d8/vshaderdeclaration.c
@@ -20,14 +20,15 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d8_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c
index 6b738e0..970bc97 100644
--- a/dlls/d3d9/basetexture.c
+++ b/dlls/d3d9/basetexture.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c
index 6cc3a5b..9d02eda 100644
--- a/dlls/d3d9/cubetexture.c
+++ b/dlls/d3d9/cubetexture.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index 4b7b4f0..a99160a 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
@@ -22,6 +22,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 79f958a..aa90e6a 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -55,6 +55,10 @@
#define ENTER_GL() wine_tsx11_lock_ptr()
#define LEAVE_GL() wine_tsx11_unlock_ptr()
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "d3d9.h"
/* Device caps */
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 0303843..9cb750b 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <math.h>
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c
index b8aa95f..24193b4 100644
--- a/dlls/d3d9/directx.c
+++ b/dlls/d3d9/directx.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c
index 2ced1ee..ad0327c 100644
--- a/dlls/d3d9/indexbuffer.c
+++ b/dlls/d3d9/indexbuffer.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c
index 1b0a98e..2a0318b 100644
--- a/dlls/d3d9/pixelshader.c
+++ b/dlls/d3d9/pixelshader.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index 5ebf44c..5b8c640 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
@@ -29,8 +32,6 @@
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c
index 8996212..29a6892 100644
--- a/dlls/d3d9/resource.c
+++ b/dlls/d3d9/resource.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c
index a82221c..b738800 100644
--- a/dlls/d3d9/stateblock.c
+++ b/dlls/d3d9/stateblock.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
@@ -29,8 +32,6 @@
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index edfa664..05cb296 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <stdarg.h>
+#include <stdio.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
@@ -28,7 +31,6 @@
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <stdio.h>
#include "d3d9_private.h"
diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c
index f042fcf..fd85cdb 100644
--- a/dlls/d3d9/swapchain.c
+++ b/dlls/d3d9/swapchain.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index c15e2ce..f15bdb5 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -23,6 +23,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c
index 8496906..d2ccee0 100644
--- a/dlls/d3d9/vertexbuffer.c
+++ b/dlls/d3d9/vertexbuffer.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c
index 24679f0..350e007 100644
--- a/dlls/d3d9/vertexdeclaration.c
+++ b/dlls/d3d9/vertexdeclaration.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
@@ -29,8 +32,6 @@
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c
index 38bedef..f0e2a52 100644
--- a/dlls/d3d9/vertexshader.c
+++ b/dlls/d3d9/vertexshader.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index 677a227..6a3a41b 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -23,6 +23,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c
index c0e2e64..0356f74 100644
--- a/dlls/d3d9/volumetexture.c
+++ b/dlls/d3d9/volumetexture.c
@@ -23,6 +23,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/d3d9/vshaderdeclaration.c b/dlls/d3d9/vshaderdeclaration.c
index 3413936..abb0e7e 100644
--- a/dlls/d3d9/vshaderdeclaration.c
+++ b/dlls/d3d9/vshaderdeclaration.c
@@ -20,14 +20,15 @@
#include "config.h"
+#include <math.h>
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/debug.h"
-#include <math.h>
-
#include "d3d9_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
index 98b35c7..2dc6da7 100644
--- a/dlls/d3dx8/d3dx8_main.c
+++ b/dlls/d3dx8/d3dx8_main.c
@@ -22,6 +22,8 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8core_private.h
index b7132d8..54aba71 100644
--- a/dlls/d3dx8/d3dx8core_private.h
+++ b/dlls/d3dx8/d3dx8core_private.h
@@ -21,6 +21,10 @@
#ifndef __WINE_D3DX8CORE_PRIVATE_H
#define __WINE_D3DX8CORE_PRIVATE_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "d3dx8core.h"
/* Interfaces */
diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c
index ad2e50a..dcb973d 100644
--- a/dlls/d3dx8/d3dxbuffer.c
+++ b/dlls/d3dx8/d3dxbuffer.c
@@ -21,6 +21,8 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dciman32/dciman_main.c b/dlls/dciman32/dciman_main.c
index af8cfa1..8c38e2e 100644
--- a/dlls/dciman32/dciman_main.c
+++ b/dlls/dciman32/dciman_main.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3d_private.h b/dlls/ddraw/d3d_private.h
index d82b1ca..cc8b8df 100644
--- a/dlls/ddraw/d3d_private.h
+++ b/dlls/ddraw/d3d_private.h
@@ -24,6 +24,11 @@
/* THIS FILE MUST NOT CONTAIN X11 or MESA DEFINES */
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "d3d.h"
#define MAX_TEXTURES 8
diff --git a/dlls/ddraw/d3dcommon.c b/dlls/ddraw/d3dcommon.c
index a2bd04c..9fe7540 100644
--- a/dlls/ddraw/d3dcommon.c
+++ b/dlls/ddraw/d3dcommon.c
@@ -19,10 +19,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index 3b882e0..36a8c34 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -20,11 +20,14 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index eed6139..4b0309a 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -22,14 +22,17 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <math.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index c910f1c..65d3365 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -20,13 +20,16 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/d3dlight.c
index d8057c1..35aeafe 100644
--- a/dlls/ddraw/d3dlight.c
+++ b/dlls/ddraw/d3dlight.c
@@ -18,12 +18,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "config.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
index 30785f6..ab9eaa1 100644
--- a/dlls/ddraw/d3dmaterial.c
+++ b/dlls/ddraw/d3dmaterial.c
@@ -18,12 +18,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "config.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index b2c583b..1e9b9a9 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -20,13 +20,16 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c
index d51004b..4c37b63 100644
--- a/dlls/ddraw/d3dvertexbuffer.c
+++ b/dlls/ddraw/d3dvertexbuffer.c
@@ -19,9 +19,13 @@
*/
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/d3dviewport.c
index 6262a6b..b0d3242 100644
--- a/dlls/ddraw/d3dviewport.c
+++ b/dlls/ddraw/d3dviewport.c
@@ -18,12 +18,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "config.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/dclipper/main.c
index ae9c83e..ed7cfec 100644
--- a/dlls/ddraw/dclipper/main.c
+++ b/dlls/ddraw/dclipper/main.c
@@ -20,9 +20,13 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "winerror.h"
diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c
index 144b2ba..ac5bec6 100644
--- a/dlls/ddraw/ddraw/hal.c
+++ b/dlls/ddraw/ddraw/hal.c
@@ -19,14 +19,18 @@
#include "config.h"
+#include <assert.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "ddrawi.h"
#include "d3dhal.h"
-#include <assert.h>
-#include <stdlib.h>
-
#include "ddraw_private.h"
#include "ddraw/main.h"
#include "ddraw/user.h"
diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index dd672d1..36c57fa 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -29,11 +29,15 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/ddraw/thunks.c b/dlls/ddraw/ddraw/thunks.c
index 80e3161..d7e012d 100644
--- a/dlls/ddraw/ddraw/thunks.c
+++ b/dlls/ddraw/ddraw/thunks.c
@@ -15,6 +15,11 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "ddraw_private.h"
#include "ddcomimpl.h"
diff --git a/dlls/ddraw/ddraw/user.c b/dlls/ddraw/ddraw/user.c
index 7371008..1863329 100644
--- a/dlls/ddraw/ddraw/user.c
+++ b/dlls/ddraw/ddraw/user.c
@@ -20,10 +20,14 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "ddraw_private.h"
#include "ddraw/main.h"
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index 813ab5c..0b6f081 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -21,8 +21,10 @@
/* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wtypes.h"
#include "wingdi.h"
diff --git a/dlls/ddraw/direct3d/main.c b/dlls/ddraw/direct3d/main.c
index ed3dedf..2d68bfa 100644
--- a/dlls/ddraw/direct3d/main.c
+++ b/dlls/ddraw/direct3d/main.c
@@ -23,10 +23,14 @@
# include <unistd.h>
#endif
#include <fcntl.h>
+#include <stdarg.h>
#include <string.h>
#include <stdio.h>
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d/mesa.c
index d6eb9e8..77ef7fb 100644
--- a/dlls/ddraw/direct3d/mesa.c
+++ b/dlls/ddraw/direct3d/mesa.c
@@ -25,10 +25,14 @@
#endif
#include <fcntl.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "d3d.h"
#include "ddraw.h"
#include "winerror.h"
diff --git a/dlls/ddraw/dsurface/fakezbuffer.c b/dlls/ddraw/dsurface/fakezbuffer.c
index d101acc..cf858c8 100644
--- a/dlls/ddraw/dsurface/fakezbuffer.c
+++ b/dlls/ddraw/dsurface/fakezbuffer.c
@@ -24,11 +24,15 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <assert.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/dlls/ddraw/dsurface/main.h b/dlls/ddraw/dsurface/main.h
index 5615095..959b2fc 100644
--- a/dlls/ddraw/dsurface/main.h
+++ b/dlls/ddraw/dsurface/main.h
@@ -19,6 +19,10 @@
#ifndef DDRAW_DSURFACE_MAIN_H_INCLUDED
#define DDRAW_DSURFACE_MAIN_H_INCLUDED
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "ddraw_private.h"
/* Support for IDirectDrawSurface7::Set/Get/FreePrivateData. I don't think
diff --git a/dlls/ddraw/dsurface/thunks.c b/dlls/ddraw/dsurface/thunks.c
index 5d3db84..3c8ad06 100644
--- a/dlls/ddraw/dsurface/thunks.c
+++ b/dlls/ddraw/dsurface/thunks.c
@@ -17,6 +17,11 @@
*/
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "winerror.h"
diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c
index 5eac767..52fb146 100644
--- a/dlls/ddraw/helper.c
+++ b/dlls/ddraw/helper.c
@@ -24,10 +24,14 @@
#include "wine/port.h"
#include <stddef.h>
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "d3d.h"
#include "ddraw.h"
#include "winerror.h"
diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c
index 18c07c8..7bdcb14 100644
--- a/dlls/ddraw/main.c
+++ b/dlls/ddraw/main.c
@@ -27,12 +27,15 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c
index e144e92..dfb1f12 100644
--- a/dlls/ddraw/mesa.c
+++ b/dlls/ddraw/mesa.c
@@ -20,10 +20,14 @@
#include "config.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "d3d.h"
#include "wine/debug.h"
diff --git a/dlls/ddraw/regsvr.c b/dlls/ddraw/regsvr.c
index 552e144..7df583b 100644
--- a/dlls/ddraw/regsvr.c
+++ b/dlls/ddraw/regsvr.c
@@ -18,12 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
-#include "winuser.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "winerror.h"
#include "ddraw.h"
diff --git a/dlls/ddraw/struct_convert.c b/dlls/ddraw/struct_convert.c
index 2d0950c..020993f 100644
--- a/dlls/ddraw/struct_convert.c
+++ b/dlls/ddraw/struct_convert.c
@@ -17,8 +17,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddraw.h"
#include "ddraw_private.h"
diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc
index ec90de4..58639c5 100644
--- a/dlls/devenum/devenum.rc
+++ b/dlls/devenum/devenum.rc
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h
index 19077b7..bd13ce4 100644
--- a/dlls/devenum/devenum_private.h
+++ b/dlls/devenum/devenum_private.h
@@ -22,6 +22,8 @@
* - Private file where devenum globals are declared
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 56e490f..fe2550e 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -26,12 +26,13 @@
*/
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include "wine/debug.h"
#include "wine/unicode.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "dinput.h"
#include "device_private.h"
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index e143808..ebe5034 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -20,6 +20,9 @@
#ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
#define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "dinput.h"
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index a8ba4e4..24ef4d5 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -31,14 +31,15 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include "wine/debug.h"
#include "wine/unicode.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
-#include "windef.h"
#include "dinput_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h
index 55201c7..6aa73c3 100644
--- a/dlls/dinput/dinput_private.h
+++ b/dlls/dinput/dinput_private.h
@@ -19,6 +19,9 @@
#ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
#define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "dinput.h"
diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c
index 86e77eb..bc1b35a 100644
--- a/dlls/dinput/joystick/linux.c
+++ b/dlls/dinput/joystick/linux.c
@@ -24,6 +24,7 @@
#ifdef HAVE_LINUX_22_JOYSTICK_API
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
@@ -48,9 +49,9 @@
#include "wine/debug.h"
#include "wine/unicode.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "dinput.h"
#include "dinput_private.h"
diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c
index bed576e..6f4be76 100644
--- a/dlls/dinput/joystick/linuxinput.c
+++ b/dlls/dinput/joystick/linuxinput.c
@@ -25,6 +25,7 @@
#ifdef HAVE_LINUX_INPUT_H
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
@@ -54,9 +55,9 @@
#include "wine/debug.h"
#include "wine/unicode.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "dinput.h"
#include "dinput_private.h"
diff --git a/dlls/dinput/keyboard/main.c b/dlls/dinput/keyboard/main.c
index 71a5630..d01bd00 100644
--- a/dlls/dinput/keyboard/main.c
+++ b/dlls/dinput/keyboard/main.c
@@ -22,7 +22,9 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c
index b12a5ee..c3827a0 100644
--- a/dlls/dinput/mouse/main.c
+++ b/dlls/dinput/mouse/main.c
@@ -22,8 +22,10 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/dinput8/dinput8_main.c b/dlls/dinput8/dinput8_main.c
index a63be97..7de9b95 100644
--- a/dlls/dinput8/dinput8_main.c
+++ b/dlls/dinput8/dinput8_main.c
@@ -19,12 +19,13 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include "wine/debug.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "dinput.h"
WINE_DEFAULT_DEBUG_CHANNEL(dinput);
diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index e7da0b3..6dd620e 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index d2fd318..83db7ea 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index f37fd00..eee8bd3 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMBAND_PRIVATE_H
#define __WINE_DMBAND_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmband/regsvr.c b/dlls/dmband/regsvr.c
index 274cfa1..277e178 100644
--- a/dlls/dmband/regsvr.c
+++ b/dlls/dmband/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c
index 47e7970..66c0d6d 100644
--- a/dlls/dmcompos/chordmap.c
+++ b/dlls/dmcompos/chordmap.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c
index 5fc1c66..8a95ce4 100644
--- a/dlls/dmcompos/chordmaptrack.c
+++ b/dlls/dmcompos/chordmaptrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c
index f60a557..8c50d7b 100644
--- a/dlls/dmcompos/composer.c
+++ b/dlls/dmcompos/composer.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h
index e2c7e73..86ab6ca 100644
--- a/dlls/dmcompos/dmcompos_private.h
+++ b/dlls/dmcompos/dmcompos_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMCOMPOS_PRIVATE_H
#define __WINE_DMCOMPOS_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmcompos/regsvr.c b/dlls/dmcompos/regsvr.c
index 8611c9e..76cc768 100644
--- a/dlls/dmcompos/regsvr.c
+++ b/dlls/dmcompos/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c
index ae015d4..d508cf2 100644
--- a/dlls/dmcompos/signposttrack.c
+++ b/dlls/dmcompos/signposttrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c
index c7356b3..e6f1dec 100644
--- a/dlls/dmime/audiopath.c
+++ b/dlls/dmime/audiopath.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h
index c852738..b68343f 100644
--- a/dlls/dmime/dmime_private.h
+++ b/dlls/dmime/dmime_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMIME_PRIVATE_H
#define __WINE_DMIME_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c
index 4179650..4842999 100644
--- a/dlls/dmime/graph.c
+++ b/dlls/dmime/graph.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c
index 3a86912..11caeb2 100644
--- a/dlls/dmime/lyricstrack.c
+++ b/dlls/dmime/lyricstrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c
index a46426d..7985f13 100644
--- a/dlls/dmime/markertrack.c
+++ b/dlls/dmime/markertrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c
index 0068fac..ad00600 100644
--- a/dlls/dmime/paramcontroltrack.c
+++ b/dlls/dmime/paramcontroltrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/patterntrack.c b/dlls/dmime/patterntrack.c
index a2b0da0..03fc1b4 100644
--- a/dlls/dmime/patterntrack.c
+++ b/dlls/dmime/patterntrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c
index dfae2af..913c9bc 100644
--- a/dlls/dmime/performance.c
+++ b/dlls/dmime/performance.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/regsvr.c b/dlls/dmime/regsvr.c
index e87cd6f..e5e8061 100644
--- a/dlls/dmime/regsvr.c
+++ b/dlls/dmime/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 7e8be4e..39d6326 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c
index cd69dd1..acf6711 100644
--- a/dlls/dmime/segmentstate.c
+++ b/dlls/dmime/segmentstate.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c
index 771e88b..9a25746 100644
--- a/dlls/dmime/segtriggertrack.c
+++ b/dlls/dmime/segtriggertrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c
index c78e433..3a4d3d7 100644
--- a/dlls/dmime/seqtrack.c
+++ b/dlls/dmime/seqtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/song.c b/dlls/dmime/song.c
index 7235337..dbcb17d 100644
--- a/dlls/dmime/song.c
+++ b/dlls/dmime/song.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c
index d4202b6..ecdf12d 100644
--- a/dlls/dmime/sysextrack.c
+++ b/dlls/dmime/sysextrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c
index 09e7083..e357a7a 100644
--- a/dlls/dmime/tempotrack.c
+++ b/dlls/dmime/tempotrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c
index 9011013..d3b1678 100644
--- a/dlls/dmime/timesigtrack.c
+++ b/dlls/dmime/timesigtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/tool.c b/dlls/dmime/tool.c
index 99bb1ef..e97ca98 100644
--- a/dlls/dmime/tool.c
+++ b/dlls/dmime/tool.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 50ec4b5..59a352e 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index b221bce..dbdaa0e 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h
index 8c264a3..ec6f339 100644
--- a/dlls/dmloader/dmloader_private.h
+++ b/dlls/dmloader/dmloader_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMLOADER_PRIVATE_H
#define __WINE_DMLOADER_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 1c5a60e..3e4030b 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index 10eec79..1d390af 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -19,6 +19,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmloader/regsvr.c b/dlls/dmloader/regsvr.c
index 57d1e0d..698542b 100644
--- a/dlls/dmloader/regsvr.c
+++ b/dlls/dmloader/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 1964289..7d0466a 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMSCRIPT_PRIVATE_H
#define __WINE_DMSCRIPT_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmscript/regsvr.c b/dlls/dmscript/regsvr.c
index 0a011b7..2b6f994 100644
--- a/dlls/dmscript/regsvr.c
+++ b/dlls/dmscript/regsvr.c
@@ -18,8 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+#include <string.h>
+
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
@@ -28,8 +32,6 @@
#include "dmusici.h"
#include "dmplugin.h"
-#include <string.h>
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index d07607b..70d395a 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c
index 79efea6..12ce7d4 100644
--- a/dlls/dmscript/scripttrack.c
+++ b/dlls/dmscript/scripttrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c
index c674f035..ac25cf2 100644
--- a/dlls/dmstyle/auditiontrack.c
+++ b/dlls/dmstyle/auditiontrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index 34277b5..7c2c3c0 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c
index 4214f7d..ad3fd91 100644
--- a/dlls/dmstyle/commandtrack.c
+++ b/dlls/dmstyle/commandtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h
index 0b6a680..c664947 100644
--- a/dlls/dmstyle/dmstyle_private.h
+++ b/dlls/dmstyle/dmstyle_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMSTYLE_PRIVATE_H
#define __WINE_DMSTYLE_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmstyle/melodyformulationtrack.c b/dlls/dmstyle/melodyformulationtrack.c
index ab0152c..8326cea 100644
--- a/dlls/dmstyle/melodyformulationtrack.c
+++ b/dlls/dmstyle/melodyformulationtrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c
index a9deee3..e87522a 100644
--- a/dlls/dmstyle/motiftrack.c
+++ b/dlls/dmstyle/motiftrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c
index 280dd1f..c580fe0 100644
--- a/dlls/dmstyle/mutetrack.c
+++ b/dlls/dmstyle/mutetrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/regsvr.c b/dlls/dmstyle/regsvr.c
index f165b72..1b98a7e 100644
--- a/dlls/dmstyle/regsvr.c
+++ b/dlls/dmstyle/regsvr.c
@@ -18,8 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+#include <string.h>
+
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
@@ -28,8 +32,6 @@
#include "dmusici.h"
#include "dmplugin.h"
-#include <string.h>
-
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 8503781..7b64912 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index d0b1289..8838a15 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h
index a255837..262ab57 100644
--- a/dlls/dmsynth/dmsynth_private.h
+++ b/dlls/dmsynth/dmsynth_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMSYNTH_PRIVATE_H
#define __WINE_DMSYNTH_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmsynth/regsvr.c b/dlls/dmsynth/regsvr.c
index eb9c5a7..8e8b96e 100644
--- a/dlls/dmsynth/regsvr.c
+++ b/dlls/dmsynth/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index 6e2ad14..5b89e66 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index 683ddd8..fad7de4 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c
index f1fc223..8dd73eb 100644
--- a/dlls/dmusic/buffer.c
+++ b/dlls/dmusic/buffer.c
@@ -19,6 +19,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c
index 6f89f93..01914b6 100644
--- a/dlls/dmusic/clock.c
+++ b/dlls/dmusic/clock.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 1c8da31..903a3bb 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 21e3414..e279d5c 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index 71fd310..0d796d0 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -20,10 +20,13 @@
#ifndef __WINE_DMUSIC_PRIVATE_H
#define __WINE_DMUSIC_PRIVATE_H
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
#include "winnt.h"
+#include "wingdi.h"
#include "dmusicc.h"
#include "dmusici.h"
#include "dmusics.h"
diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c
index 816622c..8c334b4 100644
--- a/dlls/dmusic/download.c
+++ b/dlls/dmusic/download.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/dmusic/downloadedinstrument.c b/dlls/dmusic/downloadedinstrument.c
index 212bf62..aeb1bcb 100644
--- a/dlls/dmusic/downloadedinstrument.c
+++ b/dlls/dmusic/downloadedinstrument.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/helper.c b/dlls/dmusic/helper.c
index f47b1a5..ef2f90f 100644
--- a/dlls/dmusic/helper.c
+++ b/dlls/dmusic/helper.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#if 0
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c
index 667f54e..2b91872 100644
--- a/dlls/dmusic/instrument.c
+++ b/dlls/dmusic/instrument.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index f18dd03..e609533 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/portdownload.c b/dlls/dmusic/portdownload.c
index c839dcd..d683d57 100644
--- a/dlls/dmusic/portdownload.c
+++ b/dlls/dmusic/portdownload.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic/regsvr.c b/dlls/dmusic/regsvr.c
index d84ca94..91470d2 100644
--- a/dlls/dmusic/regsvr.c
+++ b/dlls/dmusic/regsvr.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/dmusic/thru.c b/dlls/dmusic/thru.c
index 169679f..62d6ed8 100644
--- a/dlls/dmusic/thru.c
+++ b/dlls/dmusic/thru.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/dmusic32/dmusic32_main.c b/dlls/dmusic32/dmusic32_main.c
index cc10d11..1cf8675 100644
--- a/dlls/dmusic32/dmusic32_main.c
+++ b/dlls/dmusic32/dmusic32_main.c
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/debug.h"
#include "winbase.h"
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index 0eb7668..7eb68cd 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -16,8 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h
index c84a4cc..df72877 100644
--- a/dlls/dplayx/dpinit.h
+++ b/dlls/dplayx/dpinit.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DPINIT_H
#define __WINE_DPINIT_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "wtypes.h"
#include "dplay_global.h"
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index fde36e3..4245978 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -22,6 +22,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h
index 0917e58..3f4b36f 100644
--- a/dlls/dplayx/dplay_global.h
+++ b/dlls/dplayx/dplay_global.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DPLAY_GLOBAL_INCLUDED
#define __WINE_DPLAY_GLOBAL_INCLUDED
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dplaysp.h"
#include "lobbysp.h"
#include "dplayx_queue.h"
diff --git a/dlls/dplayx/dplaysp.h b/dlls/dplayx/dplaysp.h
index 2995b60..43c0dbb 100644
--- a/dlls/dplayx/dplaysp.h
+++ b/dlls/dplayx/dplaysp.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DIRECT_PLAY_SP_H
#define __WINE_DIRECT_PLAY_SP_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dplay.h"
#include "dplobby.h"
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index 96c717d..d344285 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -23,11 +23,13 @@
* dplayx.dll data which is accessible from all processes.
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "wine/debug.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
diff --git a/dlls/dplayx/dplayx_global.h b/dlls/dplayx/dplayx_global.h
index b40669b..8844355 100644
--- a/dlls/dplayx/dplayx_global.h
+++ b/dlls/dplayx/dplayx_global.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DPLAYX_GLOBAL
#define __WINE_DPLAYX_GLOBAL
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dplay.h"
BOOL DPLAYX_ConstructData(void);
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c
index 650fdc8..84d5903 100644
--- a/dlls/dplayx/dplayx_main.c
+++ b/dlls/dplayx/dplayx_main.c
@@ -19,7 +19,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
#include "dplayx_global.h"
diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c
index f1684c7..6d5d442 100644
--- a/dlls/dplayx/dplayx_messages.c
+++ b/dlls/dplayx/dplayx_messages.c
@@ -19,18 +19,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
-#include "wine/debug.h"
-
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
+#include "ntstatus.h"
#include "dplayx_messages.h"
#include "dplay_global.h"
#include "dplayx_global.h"
#include "name_server.h"
+#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(dplay);
diff --git a/dlls/dplayx/dplayx_messages.h b/dlls/dplayx/dplayx_messages.h
index 015f1c0..9f1732c 100644
--- a/dlls/dplayx/dplayx_messages.h
+++ b/dlls/dplayx/dplayx_messages.h
@@ -19,7 +19,10 @@
#ifndef __WINE_DPLAYX_MESSAGES__
#define __WINE_DPLAYX_MESSAGES__
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "dplay.h"
#include "rpc.h" /* For GUID */
diff --git a/dlls/dplayx/dplayx_queue.h b/dlls/dplayx/dplayx_queue.h
index 7e5cbf3..9ca3abd 100644
--- a/dlls/dplayx/dplayx_queue.h
+++ b/dlls/dplayx/dplayx_queue.h
@@ -20,6 +20,9 @@
#ifndef __WINE_DPLAYX_QUEUE_H
#define __WINE_DPLAYX_QUEUE_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c)
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index de606af..318d238 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -18,11 +18,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "winnls.h"
diff --git a/dlls/dplayx/lobbysp.h b/dlls/dplayx/lobbysp.h
index 74fbd23..20d96bb 100644
--- a/dlls/dplayx/lobbysp.h
+++ b/dlls/dplayx/lobbysp.h
@@ -19,6 +19,10 @@
#ifndef __WINE_LOBBY_SP_H
#define __WINE_LOBBY_SP_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dplobby.h"
/* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index f7511b1..d8cd90f 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -21,10 +21,12 @@
/* NOTE: Methods with the NS_ prefix are name server methods */
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "wine/unicode.h"
diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h
index ed0c1e7..fc3f0eb 100644
--- a/dlls/dplayx/name_server.h
+++ b/dlls/dplayx/name_server.h
@@ -19,6 +19,10 @@
#ifndef __WINE_DPLAYX_NAMESERVER
#define __WINE_DPLAYX_NAMESERVER
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dplay.h"
#include "dplaysp.h"
#include "dplayx_messages.h"
diff --git a/dlls/dplayx/regsvr.c b/dlls/dplayx/regsvr.c
index 54c9241..4e63472 100644
--- a/dlls/dplayx/regsvr.c
+++ b/dlls/dplayx/regsvr.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c
index 7b03e9b..2d8f536 100644
--- a/dlls/dpnhpast/main.c
+++ b/dlls/dpnhpast/main.c
@@ -18,6 +18,8 @@
*/
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c
index 138d711..486bd0f 100644
--- a/dlls/dsound/buffer.c
+++ b/dlls/dsound/buffer.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -39,6 +40,7 @@
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "winreg.h"
#include "winternl.h"
#include "mmddk.h"
#include "wine/windef16.h"
@@ -1127,17 +1129,17 @@
if (dsb->dsbd.dwFlags & DSBCAPS_CTRL3D) {
dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
- dsb->ds3db_ds3db.vPosition.u1.x = 0.0;
- dsb->ds3db_ds3db.vPosition.u2.y = 0.0;
- dsb->ds3db_ds3db.vPosition.u3.z = 0.0;
- dsb->ds3db_ds3db.vVelocity.u1.x = 0.0;
- dsb->ds3db_ds3db.vVelocity.u2.y = 0.0;
- dsb->ds3db_ds3db.vVelocity.u3.z = 0.0;
+ dsb->ds3db_ds3db.vPosition.x = 0.0;
+ dsb->ds3db_ds3db.vPosition.y = 0.0;
+ dsb->ds3db_ds3db.vPosition.z = 0.0;
+ dsb->ds3db_ds3db.vVelocity.x = 0.0;
+ dsb->ds3db_ds3db.vVelocity.y = 0.0;
+ dsb->ds3db_ds3db.vVelocity.z = 0.0;
dsb->ds3db_ds3db.dwInsideConeAngle = DS3D_DEFAULTCONEANGLE;
dsb->ds3db_ds3db.dwOutsideConeAngle = DS3D_DEFAULTCONEANGLE;
- dsb->ds3db_ds3db.vConeOrientation.u1.x = 0.0;
- dsb->ds3db_ds3db.vConeOrientation.u2.y = 0.0;
- dsb->ds3db_ds3db.vConeOrientation.u3.z = 0.0;
+ dsb->ds3db_ds3db.vConeOrientation.x = 0.0;
+ dsb->ds3db_ds3db.vConeOrientation.y = 0.0;
+ dsb->ds3db_ds3db.vConeOrientation.z = 0.0;
dsb->ds3db_ds3db.lConeOutsideVolume = DS3D_DEFAULTCONEOUTSIDEVOLUME;
dsb->ds3db_ds3db.flMinDistance = DS3D_DEFAULTMINDISTANCE;
dsb->ds3db_ds3db.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c
index 6b5707a..e13b388 100644
--- a/dlls/dsound/capture.c
+++ b/dlls/dsound/capture.c
@@ -26,6 +26,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -42,6 +43,7 @@
#include "winerror.h"
#include "mmsystem.h"
#include "mmddk.h"
+#include "winreg.h"
#include "winternl.h"
#include "winnls.h"
#include "wine/debug.h"
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 4068fb3..1445572 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -40,6 +40,7 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -1000,18 +1001,18 @@
/* 3D listener initial parameters */
(*ippDS)->listener = NULL;
(*ippDS)->ds3dl.dwSize = sizeof(DS3DLISTENER);
- (*ippDS)->ds3dl.vPosition.u1.x = 0.0;
- (*ippDS)->ds3dl.vPosition.u2.y = 0.0;
- (*ippDS)->ds3dl.vPosition.u3.z = 0.0;
- (*ippDS)->ds3dl.vVelocity.u1.x = 0.0;
- (*ippDS)->ds3dl.vVelocity.u2.y = 0.0;
- (*ippDS)->ds3dl.vVelocity.u3.z = 0.0;
- (*ippDS)->ds3dl.vOrientFront.u1.x = 0.0;
- (*ippDS)->ds3dl.vOrientFront.u2.y = 0.0;
- (*ippDS)->ds3dl.vOrientFront.u3.z = 1.0;
- (*ippDS)->ds3dl.vOrientTop.u1.x = 0.0;
- (*ippDS)->ds3dl.vOrientTop.u2.y = 1.0;
- (*ippDS)->ds3dl.vOrientTop.u3.z = 0.0;
+ (*ippDS)->ds3dl.vPosition.x = 0.0;
+ (*ippDS)->ds3dl.vPosition.y = 0.0;
+ (*ippDS)->ds3dl.vPosition.z = 0.0;
+ (*ippDS)->ds3dl.vVelocity.x = 0.0;
+ (*ippDS)->ds3dl.vVelocity.y = 0.0;
+ (*ippDS)->ds3dl.vVelocity.z = 0.0;
+ (*ippDS)->ds3dl.vOrientFront.x = 0.0;
+ (*ippDS)->ds3dl.vOrientFront.y = 0.0;
+ (*ippDS)->ds3dl.vOrientFront.z = 1.0;
+ (*ippDS)->ds3dl.vOrientTop.x = 0.0;
+ (*ippDS)->ds3dl.vOrientTop.y = 1.0;
+ (*ippDS)->ds3dl.vOrientTop.z = 0.0;
(*ippDS)->ds3dl.flDistanceFactor = DS3D_DEFAULTDISTANCEFACTOR;
(*ippDS)->ds3dl.flRolloffFactor = DS3D_DEFAULTROLLOFFFACTOR;
(*ippDS)->ds3dl.flDopplerFactor = DS3D_DEFAULTDOPPLERFACTOR;
diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
index 64191c3..e282a61 100644
--- a/dlls/dsound/mixer.c
+++ b/dlls/dsound/mixer.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -37,6 +38,7 @@
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "winreg.h"
#include "winternl.h"
#include "mmddk.h"
#include "wine/windef16.h"
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 4abf248..b58615b 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -37,6 +38,7 @@
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "winreg.h"
#include "winternl.h"
#include "mmddk.h"
#include "wine/windef16.h"
diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 708807b..6d72cc2 100644
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -39,6 +40,7 @@
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "winreg.h"
#include "winternl.h"
#include "winnls.h"
#include "mmddk.h"
diff --git a/dlls/dsound/regsvr.c b/dlls/dsound/regsvr.c
index a49f4b9..109ca74 100644
--- a/dlls/dsound/regsvr.c
+++ b/dlls/dsound/regsvr.c
@@ -18,14 +18,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
#include "winerror.h"
+#include "mmsystem.h"
#include "dsound.h"
#include "wine/debug.h"
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c
index cc2bdeb..84607e7 100644
--- a/dlls/dsound/sound3d.c
+++ b/dlls/dsound/sound3d.c
@@ -39,6 +39,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/fcntl.h>
@@ -57,6 +58,7 @@
#include "winuser.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "winreg.h"
#include "winternl.h"
#include "mmddk.h"
#include "wine/windef16.h"
@@ -80,9 +82,9 @@
static inline D3DVALUE ScalarProduct (LPD3DVECTOR a, LPD3DVECTOR b)
{
D3DVALUE c;
- c = (a->u1.x*b->u1.x) + (a->u2.y*b->u2.y) + (a->u3.z*b->u3.z);
- TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->u1.x, a->u2.y, a->u3.z, b->u1.x, b->u2.y, \
- b->u3.z, c);
+ c = (a->x*b->x) + (a->y*b->y) + (a->z*b->z);
+ TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->x, a->y, a->z, b->x, b->y, \
+ b->z, c);
return c;
}
@@ -90,11 +92,11 @@
static inline D3DVECTOR VectorProduct (LPD3DVECTOR a, LPD3DVECTOR b)
{
D3DVECTOR c;
- c.u1.x = (a->u2.y*b->u3.z) - (a->u3.z*b->u2.y);
- c.u2.y = (a->u3.z*b->u1.x) - (a->u1.x*b->u3.z);
- c.u3.z = (a->u1.x*b->u2.y) - (a->u2.y*b->u1.x);
- TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->u1.x, a->u2.y, a->u3.z, b->u1.x, b->u2.y, \
- b->u3.z, c.u1.x, c.u2.y, c.u3.z);
+ c.x = (a->y*b->z) - (a->z*b->y);
+ c.y = (a->z*b->x) - (a->x*b->z);
+ c.z = (a->x*b->y) - (a->y*b->x);
+ TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y, \
+ b->z, c.x, c.y, c.z);
return c;
}
@@ -103,7 +105,7 @@
{
D3DVALUE l;
l = sqrt (ScalarProduct (a, a));
- TRACE("|(%f,%f,%f)| = %f\n", a->u1.x, a->u2.y, a->u3.z, l);
+ TRACE("|(%f,%f,%f)| = %f\n", a->x, a->y, a->z, l);
return l;
}
@@ -137,8 +139,8 @@
angle = acos(cos);
/* we now have angle in radians */
angle = RadToDeg(angle);
- TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f degrees\n", a->u1.x, a->u2.y, a->u3.z, b->u1.x,
- b->u2.y, b->u3.z, angle);
+ TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f degrees\n", a->x, a->y, a->z, b->x,
+ b->y, b->z, angle);
return angle;
}
@@ -152,8 +154,8 @@
lb = VectorMagnitude (b);
cos = product/(la*lb);
angle = acos(cos);
- TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians\n", a->u1.x, a->u2.y, a->u3.z, b->u1.x,
- b->u2.y, b->u3.z, angle);
+ TRACE("angle between (%f,%f,%f) and (%f,%f,%f) = %f radians\n", a->x, a->y, a->z, b->x,
+ b->y, b->z, angle);
return angle;
}
@@ -161,11 +163,11 @@
static inline D3DVECTOR VectorBetweenTwoPoints (LPD3DVECTOR a, LPD3DVECTOR b)
{
D3DVECTOR c;
- c.u1.x = b->u1.x - a->u1.x;
- c.u2.y = b->u2.y - a->u2.y;
- c.u3.z = b->u3.z - a->u3.z;
- TRACE("A (%f,%f,%f), B (%f,%f,%f), AB = (%f,%f,%f)\n", a->u1.x, a->u2.y, a->u3.z, b->u1.x, b->u2.y,
- b->u3.z, c.u1.x, c.u2.y, c.u3.z);
+ c.x = b->x - a->x;
+ c.y = b->y - a->y;
+ c.z = b->z - a->z;
+ TRACE("A (%f,%f,%f), B (%f,%f,%f), AB = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y,
+ b->z, c.x, c.y, c.z);
return c;
}
@@ -175,8 +177,8 @@
D3DVALUE prod, result;
prod = ScalarProduct(a, p);
result = prod/VectorMagnitude(p);
- TRACE("length projection of (%f,%f,%f) on (%f,%f,%f) = %f\n", a->u1.x, a->u2.y, a->u3.z, p->u1.x,
- p->u2.y, p->u3.z, result);
+ TRACE("length projection of (%f,%f,%f) on (%f,%f,%f) = %f\n", a->x, a->y, a->z, p->x,
+ p->y, p->z, result);
return result;
}
@@ -259,7 +261,7 @@
/* conning */
/* sometimes it happens that vConeOrientation vector = (0,0,0); in this case angle is "nan" and it's useless*/
- if (dsb->ds3db_ds3db.vConeOrientation.u1.x == 0 && dsb->ds3db_ds3db.vConeOrientation.u2.y == 0 && dsb->ds3db_ds3db.vConeOrientation.u3.z == 0)
+ if (dsb->ds3db_ds3db.vConeOrientation.x == 0 && dsb->ds3db_ds3db.vConeOrientation.y == 0 && dsb->ds3db_ds3db.vConeOrientation.z == 0)
{
TRACE("conning: cones not set\n");
}
@@ -288,9 +290,9 @@
dsb->volpan.lVolume = lVolume;
/* panning */
- if (dsb->dsound->ds3dl.vPosition.u1.x == dsb->ds3db_ds3db.vPosition.u1.x &&
- dsb->dsound->ds3dl.vPosition.u2.y == dsb->ds3db_ds3db.vPosition.u2.y &&
- dsb->dsound->ds3dl.vPosition.u3.z == dsb->ds3db_ds3db.vPosition.u3.z) {
+ if (dsb->dsound->ds3dl.vPosition.x == dsb->ds3db_ds3db.vPosition.x &&
+ dsb->dsound->ds3dl.vPosition.y == dsb->ds3db_ds3db.vPosition.y &&
+ dsb->dsound->ds3dl.vPosition.z == dsb->ds3db_ds3db.vPosition.z) {
dsb->volpan.lPan = 0;
flAngle = 0.0;
}
@@ -446,9 +448,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("returning: Cone Orientation vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vConeOrientation.u1.x,
- This->dsb->ds3db_ds3db.vConeOrientation.u2.y,
- This->dsb->ds3db_ds3db.vConeOrientation.u3.z);
+ This->dsb->ds3db_ds3db.vConeOrientation.x,
+ This->dsb->ds3db_ds3db.vConeOrientation.y,
+ This->dsb->ds3db_ds3db.vConeOrientation.z);
*lpvConeOrientation = This->dsb->ds3db_ds3db.vConeOrientation;
return DS_OK;
}
@@ -499,9 +501,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("returning: Position vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vPosition.u1.x,
- This->dsb->ds3db_ds3db.vPosition.u2.y,
- This->dsb->ds3db_ds3db.vPosition.u3.z);
+ This->dsb->ds3db_ds3db.vPosition.x,
+ This->dsb->ds3db_ds3db.vPosition.y,
+ This->dsb->ds3db_ds3db.vPosition.z);
*lpvPosition = This->dsb->ds3db_ds3db.vPosition;
return DS_OK;
}
@@ -512,9 +514,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("returning: Velocity vector = (%f,%f,%f)\n",
- This->dsb->ds3db_ds3db.vVelocity.u1.x,
- This->dsb->ds3db_ds3db.vVelocity.u2.y,
- This->dsb->ds3db_ds3db.vVelocity.u3.z);
+ This->dsb->ds3db_ds3db.vVelocity.x,
+ This->dsb->ds3db_ds3db.vVelocity.y,
+ This->dsb->ds3db_ds3db.vVelocity.z);
*lpvVelocity = This->dsb->ds3db_ds3db.vVelocity;
return DS_OK;
}
@@ -578,9 +580,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("setting: Cone Orientation vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vConeOrientation.u1.x = x;
- This->dsb->ds3db_ds3db.vConeOrientation.u2.y = y;
- This->dsb->ds3db_ds3db.vConeOrientation.u3.z = z;
+ This->dsb->ds3db_ds3db.vConeOrientation.x = x;
+ This->dsb->ds3db_ds3db.vConeOrientation.y = y;
+ This->dsb->ds3db_ds3db.vConeOrientation.z = z;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsb->ds3db_need_recalc = FALSE;
@@ -665,9 +667,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vPosition.u1.x = x;
- This->dsb->ds3db_ds3db.vPosition.u2.y = y;
- This->dsb->ds3db_ds3db.vPosition.u3.z = z;
+ This->dsb->ds3db_ds3db.vPosition.x = x;
+ This->dsb->ds3db_ds3db.vPosition.y = y;
+ This->dsb->ds3db_ds3db.vPosition.z = z;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsb->ds3db_need_recalc = FALSE;
@@ -684,9 +686,9 @@
{
ICOM_THIS(IDirectSound3DBufferImpl,iface);
TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
- This->dsb->ds3db_ds3db.vVelocity.u1.x = x;
- This->dsb->ds3db_ds3db.vVelocity.u2.y = y;
- This->dsb->ds3db_ds3db.vVelocity.u3.z = z;
+ This->dsb->ds3db_ds3db.vVelocity.x = x;
+ This->dsb->ds3db_ds3db.vVelocity.y = y;
+ This->dsb->ds3db_ds3db.vVelocity.z = z;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsb->ds3db_need_recalc = FALSE;
@@ -744,17 +746,17 @@
ds3db->lpVtbl = &ds3dbvt;
ds3db->dsb->ds3db_ds3db.dwSize = sizeof(DS3DBUFFER);
- ds3db->dsb->ds3db_ds3db.vPosition.u1.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vPosition.u2.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vPosition.u3.z = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.u1.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.u2.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vVelocity.u3.z = 0.0;
+ ds3db->dsb->ds3db_ds3db.vPosition.x = 0.0;
+ ds3db->dsb->ds3db_ds3db.vPosition.y = 0.0;
+ ds3db->dsb->ds3db_ds3db.vPosition.z = 0.0;
+ ds3db->dsb->ds3db_ds3db.vVelocity.x = 0.0;
+ ds3db->dsb->ds3db_ds3db.vVelocity.y = 0.0;
+ ds3db->dsb->ds3db_ds3db.vVelocity.z = 0.0;
ds3db->dsb->ds3db_ds3db.dwInsideConeAngle = DS3D_DEFAULTCONEANGLE;
ds3db->dsb->ds3db_ds3db.dwOutsideConeAngle = DS3D_DEFAULTCONEANGLE;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.u1.x = 0.0;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.u2.y = 0.0;
- ds3db->dsb->ds3db_ds3db.vConeOrientation.u3.z = 0.0;
+ ds3db->dsb->ds3db_ds3db.vConeOrientation.x = 0.0;
+ ds3db->dsb->ds3db_ds3db.vConeOrientation.y = 0.0;
+ ds3db->dsb->ds3db_ds3db.vConeOrientation.z = 0.0;
ds3db->dsb->ds3db_ds3db.lConeOutsideVolume = DS3D_DEFAULTCONEOUTSIDEVOLUME;
ds3db->dsb->ds3db_ds3db.flMinDistance = DS3D_DEFAULTMINDISTANCE;
ds3db->dsb->ds3db_ds3db.flMaxDistance = DS3D_DEFAULTMAXDISTANCE;
@@ -891,9 +893,9 @@
LPD3DVECTOR lpvOrientTop)
{
ICOM_THIS(IDirectSound3DListenerImpl,iface);
- TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->dsound->ds3dl.vOrientFront.u1.x, \
- This->dsound->ds3dl.vOrientFront.u2.y, This->dsound->ds3dl.vOrientFront.u3.z, This->dsound->ds3dl.vOrientTop.u1.x, This->dsound->ds3dl.vOrientTop.u2.y, \
- This->dsound->ds3dl.vOrientTop.u3.z);
+ TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->dsound->ds3dl.vOrientFront.x, \
+ This->dsound->ds3dl.vOrientFront.y, This->dsound->ds3dl.vOrientFront.z, This->dsound->ds3dl.vOrientTop.x, This->dsound->ds3dl.vOrientTop.y, \
+ This->dsound->ds3dl.vOrientTop.z);
*lpvOrientFront = This->dsound->ds3dl.vOrientFront;
*lpvOrientTop = This->dsound->ds3dl.vOrientTop;
return DS_OK;
@@ -904,7 +906,7 @@
LPD3DVECTOR lpvPosition)
{
ICOM_THIS(IDirectSound3DListenerImpl,iface);
- TRACE("returning: Position vector = (%f,%f,%f)\n", This->dsound->ds3dl.vPosition.u1.x, This->dsound->ds3dl.vPosition.u2.y, This->dsound->ds3dl.vPosition.u3.z);
+ TRACE("returning: Position vector = (%f,%f,%f)\n", This->dsound->ds3dl.vPosition.x, This->dsound->ds3dl.vPosition.y, This->dsound->ds3dl.vPosition.z);
*lpvPosition = This->dsound->ds3dl.vPosition;
return DS_OK;
}
@@ -924,7 +926,7 @@
LPD3DVECTOR lpvVelocity)
{
ICOM_THIS(IDirectSound3DListenerImpl,iface);
- TRACE("returning: Velocity vector = (%f,%f,%f)\n", This->dsound->ds3dl.vVelocity.u1.x, This->dsound->ds3dl.vVelocity.u2.y, This->dsound->ds3dl.vVelocity.u3.z);
+ TRACE("returning: Velocity vector = (%f,%f,%f)\n", This->dsound->ds3dl.vVelocity.x, This->dsound->ds3dl.vVelocity.y, This->dsound->ds3dl.vVelocity.z);
*lpvVelocity = This->dsound->ds3dl.vVelocity;
return DS_OK;
}
@@ -989,12 +991,12 @@
ICOM_THIS(IDirectSound3DListenerImpl,iface);
TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %ld\n", \
xFront, yFront, zFront, xTop, yTop, zTop, dwApply);
- This->dsound->ds3dl.vOrientFront.u1.x = xFront;
- This->dsound->ds3dl.vOrientFront.u2.y = yFront;
- This->dsound->ds3dl.vOrientFront.u3.z = zFront;
- This->dsound->ds3dl.vOrientTop.u1.x = xTop;
- This->dsound->ds3dl.vOrientTop.u2.y = yTop;
- This->dsound->ds3dl.vOrientTop.u3.z = zTop;
+ This->dsound->ds3dl.vOrientFront.x = xFront;
+ This->dsound->ds3dl.vOrientFront.y = yFront;
+ This->dsound->ds3dl.vOrientFront.z = zFront;
+ This->dsound->ds3dl.vOrientTop.x = xTop;
+ This->dsound->ds3dl.vOrientTop.y = yTop;
+ This->dsound->ds3dl.vOrientTop.z = zTop;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsound->ds3dl_need_recalc = FALSE;
@@ -1011,9 +1013,9 @@
{
ICOM_THIS(IDirectSound3DListenerImpl,iface);
TRACE("setting: Position vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
- This->dsound->ds3dl.vPosition.u1.x = x;
- This->dsound->ds3dl.vPosition.u2.y = y;
- This->dsound->ds3dl.vPosition.u3.z = z;
+ This->dsound->ds3dl.vPosition.x = x;
+ This->dsound->ds3dl.vPosition.y = y;
+ This->dsound->ds3dl.vPosition.z = z;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsound->ds3dl_need_recalc = FALSE;
@@ -1047,9 +1049,9 @@
{
ICOM_THIS(IDirectSound3DListenerImpl,iface);
TRACE("setting: Velocity vector = (%f,%f,%f); dwApply = %ld\n", x, y, z, dwApply);
- This->dsound->ds3dl.vVelocity.u1.x = x;
- This->dsound->ds3dl.vVelocity.u2.y = y;
- This->dsound->ds3dl.vVelocity.u3.z = z;
+ This->dsound->ds3dl.vVelocity.x = x;
+ This->dsound->ds3dl.vVelocity.y = y;
+ This->dsound->ds3dl.vVelocity.z = z;
if (dwApply == DS3D_IMMEDIATE)
{
This->dsound->ds3dl_need_recalc = FALSE;
@@ -1114,18 +1116,18 @@
dsl->dsound = This->dsound;
dsl->dsound->ds3dl.dwSize = sizeof(DS3DLISTENER);
- dsl->dsound->ds3dl.vPosition.u1.x = 0.0;
- dsl->dsound->ds3dl.vPosition.u2.y = 0.0;
- dsl->dsound->ds3dl.vPosition.u3.z = 0.0;
- dsl->dsound->ds3dl.vVelocity.u1.x = 0.0;
- dsl->dsound->ds3dl.vVelocity.u2.y = 0.0;
- dsl->dsound->ds3dl.vVelocity.u3.z = 0.0;
- dsl->dsound->ds3dl.vOrientFront.u1.x = 0.0;
- dsl->dsound->ds3dl.vOrientFront.u2.y = 0.0;
- dsl->dsound->ds3dl.vOrientFront.u3.z = 1.0;
- dsl->dsound->ds3dl.vOrientTop.u1.x = 0.0;
- dsl->dsound->ds3dl.vOrientTop.u2.y = 1.0;
- dsl->dsound->ds3dl.vOrientTop.u3.z = 0.0;
+ dsl->dsound->ds3dl.vPosition.x = 0.0;
+ dsl->dsound->ds3dl.vPosition.y = 0.0;
+ dsl->dsound->ds3dl.vPosition.z = 0.0;
+ dsl->dsound->ds3dl.vVelocity.x = 0.0;
+ dsl->dsound->ds3dl.vVelocity.y = 0.0;
+ dsl->dsound->ds3dl.vVelocity.z = 0.0;
+ dsl->dsound->ds3dl.vOrientFront.x = 0.0;
+ dsl->dsound->ds3dl.vOrientFront.y = 0.0;
+ dsl->dsound->ds3dl.vOrientFront.z = 1.0;
+ dsl->dsound->ds3dl.vOrientTop.x = 0.0;
+ dsl->dsound->ds3dl.vOrientTop.y = 1.0;
+ dsl->dsound->ds3dl.vOrientTop.z = 0.0;
dsl->dsound->ds3dl.flDistanceFactor = DS3D_DEFAULTDISTANCEFACTOR;
dsl->dsound->ds3dl.flRolloffFactor = DS3D_DEFAULTROLLOFFFACTOR;
dsl->dsound->ds3dl.flDopplerFactor = DS3D_DEFAULTDOPPLERFACTOR;
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 56a3432..3f4599a 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -26,6 +26,8 @@
#include <stdlib.h>
#include "wine/test.h"
+#include "windef.h"
+#include "wingdi.h"
#include "dsound.h"
#ifndef DSBCAPS_CTRLDEFAULT
@@ -455,35 +457,35 @@
rc=IDirectSound3DListener_GetAllParameters(listener,&listener_param);
ok(rc==DS_OK,"IDirectSound3dListener_GetAllParameters failed 0x%lx\n",rc);
if (move_listener)
- listener_param.vPosition.u1.x = -5.0;
+ listener_param.vPosition.x = -5.0;
else
- listener_param.vPosition.u1.x = 0.0;
- listener_param.vPosition.u2.y = 0.0;
- listener_param.vPosition.u3.z = 0.0;
- rc=IDirectSound3DListener_SetPosition(listener,listener_param.vPosition.u1.x,listener_param.vPosition.u2.y,listener_param.vPosition.u3.z,DS3D_IMMEDIATE);
+ listener_param.vPosition.x = 0.0;
+ listener_param.vPosition.y = 0.0;
+ listener_param.vPosition.z = 0.0;
+ rc=IDirectSound3DListener_SetPosition(listener,listener_param.vPosition.x,listener_param.vPosition.y,listener_param.vPosition.z,DS3D_IMMEDIATE);
ok(rc==DS_OK,"IDirectSound3dListener_SetPosition failed 0x%lx\n",rc);
}
if (buffer3d) {
if (move_sound)
- buffer_param.vPosition.u1.x = 5.0;
+ buffer_param.vPosition.x = 5.0;
else
- buffer_param.vPosition.u1.x = 0.0;
- buffer_param.vPosition.u2.y = 0.0;
- buffer_param.vPosition.u3.z = 0.0;
- rc=IDirectSound3DBuffer_SetPosition(buffer,buffer_param.vPosition.u1.x,buffer_param.vPosition.u2.y,buffer_param.vPosition.u3.z,DS3D_IMMEDIATE);
+ buffer_param.vPosition.x = 0.0;
+ buffer_param.vPosition.y = 0.0;
+ buffer_param.vPosition.z = 0.0;
+ rc=IDirectSound3DBuffer_SetPosition(buffer,buffer_param.vPosition.x,buffer_param.vPosition.y,buffer_param.vPosition.z,DS3D_IMMEDIATE);
ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition failed 0x%lx\n",rc);
}
while (buffer_service(&state)) {
WaitForSingleObject(GetCurrentProcess(),TIME_SLICE/2);
if (listener&&move_listener) {
- listener_param.vPosition.u1.x += 0.5;
- rc=IDirectSound3DListener_SetPosition(listener,listener_param.vPosition.u1.x,listener_param.vPosition.u2.y,listener_param.vPosition.u3.z,DS3D_IMMEDIATE);
+ listener_param.vPosition.x += 0.5;
+ rc=IDirectSound3DListener_SetPosition(listener,listener_param.vPosition.x,listener_param.vPosition.y,listener_param.vPosition.z,DS3D_IMMEDIATE);
ok(rc==DS_OK,"IDirectSound3dListener_SetPosition failed 0x%lx\n",rc);
}
if (buffer3d&&move_sound) {
- buffer_param.vPosition.u1.x -= 0.5;
- rc=IDirectSound3DBuffer_SetPosition(buffer,buffer_param.vPosition.u1.x,buffer_param.vPosition.u2.y,buffer_param.vPosition.u3.z,DS3D_IMMEDIATE);
+ buffer_param.vPosition.x -= 0.5;
+ rc=IDirectSound3DBuffer_SetPosition(buffer,buffer_param.vPosition.x,buffer_param.vPosition.y,buffer_param.vPosition.z,DS3D_IMMEDIATE);
ok(rc==DS_OK,"IDirectSound3dBuffer_SetPosition failed 0x%lx\n",rc);
}
}
diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c
index 3bb1692..a213267 100644
--- a/dlls/dsound/tests/propset.c
+++ b/dlls/dsound/tests/propset.c
@@ -26,6 +26,8 @@
#include <stdlib.h>
#include "wine/test.h"
+#include "windef.h"
+#include "wingdi.h"
#include "dsound.h"
#include "dsconf.h"
diff --git a/dlls/gdi/bidi.c b/dlls/gdi/bidi.c
index d3fe31b..13e2d59 100644
--- a/dlls/gdi/bidi.c
+++ b/dlls/gdi/bidi.c
@@ -21,10 +21,12 @@
#include "config.h"
+#include <stdarg.h>
#ifdef HAVE_UNICODE_UBIDI_H
#include <unicode/ubidi.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/debug.h"
diff --git a/dlls/gdi/bidi16.c b/dlls/gdi/bidi16.c
index bc33299..4928c5f 100644
--- a/dlls/gdi/bidi16.c
+++ b/dlls/gdi/bidi16.c
@@ -19,7 +19,10 @@
* NOTE: Right now, most of these functions do nothing.
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/wingdi16.h"
#include "wine/debug.h"
diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c
index 6b20e21..08404cf 100644
--- a/dlls/gdi/driver.c
+++ b/dlls/gdi/driver.c
@@ -21,7 +21,9 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/gdi/enhmfdrv/bitblt.c b/dlls/gdi/enhmfdrv/bitblt.c
index 92910ff..a0ed92d 100644
--- a/dlls/gdi/enhmfdrv/bitblt.c
+++ b/dlls/gdi/enhmfdrv/bitblt.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
#include "enhmetafiledrv.h"
diff --git a/dlls/gdi/enhmfdrv/enhmetafiledrv.h b/dlls/gdi/enhmfdrv/enhmetafiledrv.h
index b12fab0..9df1fc3 100644
--- a/dlls/gdi/enhmfdrv/enhmetafiledrv.h
+++ b/dlls/gdi/enhmfdrv/enhmetafiledrv.h
@@ -21,7 +21,10 @@
#ifndef __WINE_ENHMETAFILEDRV_H
#define __WINE_ENHMETAFILEDRV_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
diff --git a/dlls/gdi/enhmfdrv/init.c b/dlls/gdi/enhmfdrv/init.c
index 507c3d9..3ea16c9 100644
--- a/dlls/gdi/enhmfdrv/init.c
+++ b/dlls/gdi/enhmfdrv/init.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
#include "enhmfdrv/enhmetafiledrv.h"
diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index 6e3b52b..d4d3812 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -23,7 +23,16 @@
#include "config.h"
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <assert.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "wingdi.h"
@@ -32,13 +41,6 @@
#include "wine/debug.h"
#include "gdi.h"
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <dirent.h>
-#include <stdio.h>
-#include <assert.h>
-
WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE
diff --git a/dlls/gdi/gdi16.c b/dlls/gdi/gdi16.c
index d52298c..aa3084f 100644
--- a/dlls/gdi/gdi16.c
+++ b/dlls/gdi/gdi16.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
diff --git a/dlls/gdi/gdi_main.c b/dlls/gdi/gdi_main.c
index 99c49c4..eff53e8 100644
--- a/dlls/gdi/gdi_main.c
+++ b/dlls/gdi/gdi_main.c
@@ -18,13 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "gdi.h"
-#include "winbase.h"
/***********************************************************************
* GDI initialisation routine
diff --git a/dlls/gdi/mfdrv/init.c b/dlls/gdi/mfdrv/init.c
index cf3eb68..d5d077c 100644
--- a/dlls/gdi/mfdrv/init.c
+++ b/dlls/gdi/mfdrv/init.c
@@ -18,7 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+#include <string.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "gdi.h"
#include "wownt32.h"
@@ -27,8 +31,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(metafile);
-#include <string.h>
-
static const DC_FUNCTIONS MFDRV_Funcs =
{
NULL, /* pAbortDoc */
diff --git a/dlls/gdi/mfdrv/metafiledrv.h b/dlls/gdi/mfdrv/metafiledrv.h
index 5396089..28f61df 100644
--- a/dlls/gdi/mfdrv/metafiledrv.h
+++ b/dlls/gdi/mfdrv/metafiledrv.h
@@ -21,7 +21,10 @@
#ifndef __WINE_METAFILEDRV_H
#define __WINE_METAFILEDRV_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
diff --git a/dlls/gdi/mfdrv/text.c b/dlls/gdi/mfdrv/text.c
index 0b290fb..c8cdc44 100644
--- a/dlls/gdi/mfdrv/text.c
+++ b/dlls/gdi/mfdrv/text.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "mfdrv/metafiledrv.h"
#include "wine/debug.h"
diff --git a/dlls/gdi/printdrv.c b/dlls/gdi/printdrv.c
index 3d98344..fdd054e 100644
--- a/dlls/gdi/printdrv.c
+++ b/dlls/gdi/printdrv.c
@@ -24,6 +24,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <stdlib.h>
@@ -37,6 +38,7 @@
# include <unistd.h>
#endif
#include <fcntl.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wine/winbase16.h"
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index df400ba..2c36438 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -16,6 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
/***********************************************************************
diff --git a/dlls/icmp/icmp_main.c b/dlls/icmp/icmp_main.c
index e77d554..51c134c 100644
--- a/dlls/icmp/icmp_main.c
+++ b/dlls/icmp/icmp_main.c
@@ -52,6 +52,7 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
+#include <stdarg.h>
#include <string.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c
index d8cba65..558788b 100644
--- a/dlls/imagehlp/access.c
+++ b/dlls/imagehlp/access.c
@@ -18,11 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
#include "imagehlp.h"
diff --git a/dlls/imagehlp/debug.c b/dlls/imagehlp/debug.c
index c1c98c2..6b94cfd 100644
--- a/dlls/imagehlp/debug.c
+++ b/dlls/imagehlp/debug.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "winerror.h"
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wine/debug.h"
#include "imagehlp.h"
diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c
index fa6b882..150ca01 100644
--- a/dlls/imagehlp/imagehlp_main.c
+++ b/dlls/imagehlp/imagehlp_main.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "imagehlp.h"
#include "winerror.h"
-#include "winbase.h"
-#include "windef.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c
index 3031d7d..8a30ffa 100644
--- a/dlls/imagehlp/integrity.c
+++ b/dlls/imagehlp/integrity.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/imagehlp/internal.c b/dlls/imagehlp/internal.c
index 488a246..2da3cd2 100644
--- a/dlls/imagehlp/internal.c
+++ b/dlls/imagehlp/internal.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
#include "imagehlp.h"
diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c
index 54dd3a0..d4f2370 100644
--- a/dlls/imagehlp/modify.c
+++ b/dlls/imagehlp/modify.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
#include "imagehlp.h"
diff --git a/dlls/imagehlp/symbol.c b/dlls/imagehlp/symbol.c
index c1cddf2..d71a843 100644
--- a/dlls/imagehlp/symbol.c
+++ b/dlls/imagehlp/symbol.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
#include "imagehlp.h"
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index 266add3..ff220c8 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winbase.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c
index 8505081..be88f5a 100644
--- a/dlls/iphlpapi/ifenum.c
+++ b/dlls/iphlpapi/ifenum.c
@@ -60,6 +60,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -114,6 +115,7 @@
#include <net/if_types.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "iprtrmib.h"
#include "ifenum.h"
diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h
index f06e33a..14fd659 100644
--- a/dlls/iphlpapi/ifenum.h
+++ b/dlls/iphlpapi/ifenum.h
@@ -38,7 +38,10 @@
#ifndef WINE_IFENUM_H_
#define WINE_IFENUM_H_
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "iprtrmib.h"
#define MAX_INTERFACE_PHYSADDR 8
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 07a52ee..411ceac 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
#ifdef HAVE_NETINET_IN_H
@@ -32,6 +33,7 @@
# include <resolv.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "iphlpapi.h"
#include "ifenum.h"
diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c
index c61b23c..6fec73c 100644
--- a/dlls/iphlpapi/ipstats.c
+++ b/dlls/iphlpapi/ipstats.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -46,6 +47,7 @@
#include <netinet/tcp_fsm.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "iprtrmib.h"
#include "ifenum.h"
diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h
index de9fbce..2444021 100644
--- a/dlls/iphlpapi/ipstats.h
+++ b/dlls/iphlpapi/ipstats.h
@@ -22,7 +22,10 @@
#ifndef WINE_IPSTATS_H_
#define WINE_IPSTATS_H_
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "iprtrmib.h"
/* Fills in entry's interface stats, using name to find them.
diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c
index 6aa1240..618c059 100644
--- a/dlls/kernel/atom.c
+++ b/dlls/kernel/atom.c
@@ -29,6 +29,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c
index 3cb2291..8a740a0 100644
--- a/dlls/kernel/change.c
+++ b/dlls/kernel/change.c
@@ -20,9 +20,11 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/windef16.h"
diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c
index ec9aed2..db31aba 100644
--- a/dlls/kernel/comm.c
+++ b/dlls/kernel/comm.c
@@ -53,6 +53,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
@@ -86,6 +87,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/computername.c b/dlls/kernel/computername.c
index c9d6509..55c61cc 100644
--- a/dlls/kernel/computername.c
+++ b/dlls/kernel/computername.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -32,9 +33,12 @@
#include <netdb.h>
#endif
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/exception.h"
diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c
index 7300837..ef5d799 100644
--- a/dlls/kernel/console.c
+++ b/dlls/kernel/console.c
@@ -31,6 +31,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -38,6 +39,7 @@
#endif
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
diff --git a/dlls/kernel/debugger.c b/dlls/kernel/debugger.c
index b00af11..94c0fc1 100644
--- a/dlls/kernel/debugger.c
+++ b/dlls/kernel/debugger.c
@@ -24,6 +24,7 @@
#include "winerror.h"
#include "wine/winbase16.h"
#include "wine/server.h"
+#include "ntstatus.h"
#include "stackframe.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/editline.c b/dlls/kernel/editline.c
index 48998cd..0dada92 100644
--- a/dlls/kernel/editline.c
+++ b/dlls/kernel/editline.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/kernel/error16.c b/dlls/kernel/error16.c
index 768e533..64aab0c 100644
--- a/dlls/kernel/error16.c
+++ b/dlls/kernel/error16.c
@@ -19,11 +19,12 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "stackframe.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c
index 2d9b7d0..deae039 100644
--- a/dlls/kernel/file.c
+++ b/dlls/kernel/file.c
@@ -26,11 +26,15 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wincon.h"
#include "kernel_private.h"
diff --git a/dlls/kernel/file16.c b/dlls/kernel/file16.c
index d74a127..103fd65 100644
--- a/dlls/kernel/file16.c
+++ b/dlls/kernel/file16.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
@@ -34,6 +35,7 @@
#include "winerror.h"
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
#include "wine/server.h"
diff --git a/dlls/kernel/flatthunk.h b/dlls/kernel/flatthunk.h
index e72e5d2..7db8d0d 100644
--- a/dlls/kernel/flatthunk.h
+++ b/dlls/kernel/flatthunk.h
@@ -21,7 +21,10 @@
#ifndef __WINE_FLATTHUNK_H
#define __WINE_FLATTHUNK_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
struct ThunkDataCommon
{
diff --git a/dlls/kernel/format_msg.c b/dlls/kernel/format_msg.c
index 560ee37..36b50d5 100644
--- a/dlls/kernel/format_msg.c
+++ b/dlls/kernel/format_msg.c
@@ -20,12 +20,15 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/kernel/kernel_main.c b/dlls/kernel/kernel_main.c
index 34dd9b1..7e632b6 100644
--- a/dlls/kernel/kernel_main.c
+++ b/dlls/kernel/kernel_main.c
@@ -23,12 +23,15 @@
#include <assert.h>
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
#include <sys/stat.h>
#include <signal.h>
+#include "windef.h"
#include "winbase.h"
#include "wincon.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
diff --git a/dlls/kernel/lcformat.c b/dlls/kernel/lcformat.c
index bad52ce..eb9084b 100644
--- a/dlls/kernel/lcformat.c
+++ b/dlls/kernel/lcformat.c
@@ -24,6 +24,7 @@
#include "wine/port.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/dlls/kernel/locale.c b/dlls/kernel/locale.c
index 0e9d82d..d83a7da 100644
--- a/dlls/kernel/locale.c
+++ b/dlls/kernel/locale.c
@@ -25,13 +25,16 @@
#include "wine/port.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winuser.h" /* for RT_STRINGW */
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "winnls.h"
diff --git a/dlls/kernel/locale_rc.rc b/dlls/kernel/locale_rc.rc
index f57def9..d7dc830 100644
--- a/dlls/kernel/locale_rc.rc
+++ b/dlls/kernel/locale_rc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winnls.h"
#define LGRPID_RES_BASE 0x2000
diff --git a/dlls/kernel/ne_module.c b/dlls/kernel/ne_module.c
index d965687..cbf92ed 100644
--- a/dlls/kernel/ne_module.c
+++ b/dlls/kernel/ne_module.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +32,8 @@
#endif
#include <ctype.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "winerror.h"
diff --git a/dlls/kernel/powermgnt.c b/dlls/kernel/powermgnt.c
index d1f3847..05f7566 100644
--- a/dlls/kernel/powermgnt.c
+++ b/dlls/kernel/powermgnt.c
@@ -17,6 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index b393cfa..2dcd5c2 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -23,6 +23,7 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "ntstatus.h"
#include "thread.h"
#include "wine/server.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c
index 7863f61..d2bcca8 100644
--- a/dlls/kernel/profile.c
+++ b/dlls/kernel/profile.c
@@ -26,6 +26,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
@@ -37,6 +38,7 @@
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
#include "drive.h"
diff --git a/dlls/kernel/pthread.c b/dlls/kernel/pthread.c
index 0e8b2aa..1560f4b 100644
--- a/dlls/kernel/pthread.c
+++ b/dlls/kernel/pthread.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <errno.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <setjmp.h>
#ifdef HAVE_UNISTD_H
@@ -40,6 +41,7 @@
#include <sys/mman.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "thread.h"
#include "winternl.h"
diff --git a/dlls/kernel/registry16.c b/dlls/kernel/registry16.c
index c5ba287..43ce4d5 100644
--- a/dlls/kernel/registry16.c
+++ b/dlls/kernel/registry16.c
@@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/relay16.c b/dlls/kernel/relay16.c
index 9eb1020..5bc972b 100644
--- a/dlls/kernel/relay16.c
+++ b/dlls/kernel/relay16.c
@@ -23,9 +23,11 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "module.h"
#include "stackframe.h"
diff --git a/dlls/kernel/resource.c b/dlls/kernel/resource.c
index 5389581..695c8ed 100644
--- a/dlls/kernel/resource.c
+++ b/dlls/kernel/resource.c
@@ -22,11 +22,15 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "windef.h"
-#include "winternl.h"
#include "winbase.h"
+#include "winreg.h"
+#include "winternl.h"
#include "wownt32.h"
#include "wine/winbase16.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/resource16.c b/dlls/kernel/resource16.c
index 31af22f..8cfbe60 100644
--- a/dlls/kernel/resource16.c
+++ b/dlls/kernel/resource16.c
@@ -24,11 +24,13 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include "windef.h"
+#include "winbase.h"
#include "wownt32.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
diff --git a/dlls/kernel/snoop16.c b/dlls/kernel/snoop16.c
index 9d9dbf2..adcdc5b 100644
--- a/dlls/kernel/snoop16.c
+++ b/dlls/kernel/snoop16.c
@@ -23,9 +23,10 @@
#include <assert.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
#include "wine/winbase16.h"
#include "wine/library.h"
diff --git a/dlls/kernel/stress.c b/dlls/kernel/stress.c
index cd59178..970f5ef 100644
--- a/dlls/kernel/stress.c
+++ b/dlls/kernel/stress.c
@@ -16,7 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c
index 61367ef..8ba55dd 100644
--- a/dlls/kernel/string.c
+++ b/dlls/kernel/string.c
@@ -19,8 +19,10 @@
*/
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c
index 439083f..98c7045 100644
--- a/dlls/kernel/sync.c
+++ b/dlls/kernel/sync.c
@@ -32,8 +32,11 @@
#ifdef HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/kernel/system.c b/dlls/kernel/system.c
index 55f017d..634f104 100644
--- a/dlls/kernel/system.c
+++ b/dlls/kernel/system.c
@@ -20,7 +20,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
diff --git a/dlls/kernel/tape.c b/dlls/kernel/tape.c
index 17650d7..cbf9c19 100644
--- a/dlls/kernel/tape.c
+++ b/dlls/kernel/tape.c
@@ -22,6 +22,9 @@
* Everything, all functions are stubs.
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/task.c b/dlls/kernel/task.c
index 2441dc4..16d3595 100644
--- a/dlls/kernel/task.c
+++ b/dlls/kernel/task.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
@@ -28,6 +29,7 @@
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winnt.h"
diff --git a/dlls/kernel/tests/alloc.c b/dlls/kernel/tests/alloc.c
index 1de850e..4a58eb5 100644
--- a/dlls/kernel/tests/alloc.c
+++ b/dlls/kernel/tests/alloc.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/atom.c b/dlls/kernel/tests/atom.c
index c66ddbe..f00faf6 100644
--- a/dlls/kernel/tests/atom.c
+++ b/dlls/kernel/tests/atom.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/codepage.c b/dlls/kernel/tests/codepage.c
index 9f5e1a1..3940a74 100644
--- a/dlls/kernel/tests/codepage.c
+++ b/dlls/kernel/tests/codepage.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
diff --git a/dlls/kernel/tests/directory.c b/dlls/kernel/tests/directory.c
index ae75264..b0c0ea6 100644
--- a/dlls/kernel/tests/directory.c
+++ b/dlls/kernel/tests/directory.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/drive.c b/dlls/kernel/tests/drive.c
index 45f23d4..192f14e 100644
--- a/dlls/kernel/tests/drive.c
+++ b/dlls/kernel/tests/drive.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/environ.c b/dlls/kernel/tests/environ.c
index 3d26952..f511b44 100644
--- a/dlls/kernel/tests/environ.c
+++ b/dlls/kernel/tests/environ.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c
index ba39378..d1fb8eb 100644
--- a/dlls/kernel/tests/file.c
+++ b/dlls/kernel/tests/file.c
@@ -19,10 +19,12 @@
*
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <time.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/format_msg.c b/dlls/kernel/tests/format_msg.c
index f211fa4..3851d21 100644
--- a/dlls/kernel/tests/format_msg.c
+++ b/dlls/kernel/tests/format_msg.c
@@ -17,7 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
/* #define ok(cond,failstr) if(!(cond)) {printf("line %d : %s\n",__LINE__,failstr);exit(1);} */
diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c
index 8b66019..51dc920 100644
--- a/dlls/kernel/tests/locale.c
+++ b/dlls/kernel/tests/locale.c
@@ -20,7 +20,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c
index c025738..a5e511e 100644
--- a/dlls/kernel/tests/path.c
+++ b/dlls/kernel/tests/path.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/kernel/tests/pipe.c b/dlls/kernel/tests/pipe.c
index deb8e6d..5aabf53 100644
--- a/dlls/kernel/tests/pipe.c
+++ b/dlls/kernel/tests/pipe.c
@@ -18,12 +18,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <winsock.h>
-
+#include <assert.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
-#include <assert.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winsock.h>
#ifndef STANDALONE
#include "wine/test.h"
@@ -43,8 +46,6 @@
#endif
#include <wtypes.h>
-#include <windef.h>
-#include <winbase.h>
#include <winerror.h>
#define PIPENAME "\\\\.\\PiPe\\tests_" __FILE__
diff --git a/dlls/kernel/tests/process.c b/dlls/kernel/tests/process.c
index 0abc693..b5c9db5 100644
--- a/dlls/kernel/tests/process.c
+++ b/dlls/kernel/tests/process.c
@@ -19,10 +19,13 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "wine/test.h"
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wincon.h"
diff --git a/dlls/kernel/tests/profile.c b/dlls/kernel/tests/profile.c
index aae8d43..3853c1a 100644
--- a/dlls/kernel/tests/profile.c
+++ b/dlls/kernel/tests/profile.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "windows.h"
diff --git a/dlls/kernel/tests/thread.c b/dlls/kernel/tests/thread.c
index ee9d44f..86cf182 100644
--- a/dlls/kernel/tests/thread.c
+++ b/dlls/kernel/tests/thread.c
@@ -21,7 +21,11 @@
/* Define _WIN32_WINNT to get SetThreadIdealProcessor on Windows */
#define _WIN32_WINNT 0x0500
+#include <stdarg.h>
+
#include "wine/test.h"
+#include <ntstatus.h>
+#include <windef.h>
#include <winbase.h>
#include <winnt.h>
#include <winerror.h>
diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c
index d9cafd9..9b77366 100644
--- a/dlls/kernel/thread.c
+++ b/dlls/kernel/thread.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <sys/types.h>
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
@@ -31,6 +32,8 @@
# include <unistd.h>
#endif
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 47b923d..a4ebdba 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -24,6 +24,7 @@
#include <string.h>
#include <sys/types.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -32,6 +33,7 @@
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wownt32.h"
#include "wine/winbase16.h"
diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c
index 7ba73e0..0822018 100644
--- a/dlls/kernel/time.c
+++ b/dlls/kernel/time.c
@@ -34,6 +34,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "file.h"
#include "winternl.h"
#include "winerror.h"
diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index 74cea4e..5ebe626 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -27,6 +28,7 @@
#endif
#include <ctype.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "winerror.h"
diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index 50f0d29..d542fc8 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -18,7 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/winbase16.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wownt32.h"
#include "module.h"
diff --git a/dlls/kernel/windebug.c b/dlls/kernel/windebug.c
index a9cccba..5a0521c 100644
--- a/dlls/kernel/windebug.c
+++ b/dlls/kernel/windebug.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "miscemu.h"
#include "wine/debug.h"
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index a281efc..9a204bf 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -22,12 +22,15 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include "wine/winbase16.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wownt32.h"
#include "excpt.h"
+#include "winreg.h"
#include "winternl.h"
#include "syslevel.h"
#include "file.h"
diff --git a/dlls/lzexpand/lzexpand16.c b/dlls/lzexpand/lzexpand16.c
index 791a7b1..11a2fc8 100644
--- a/dlls/lzexpand/lzexpand16.c
+++ b/dlls/lzexpand/lzexpand16.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "lzexpand.h"
diff --git a/dlls/lzexpand/lzexpand_main.c b/dlls/lzexpand/lzexpand_main.c
index d124935..19764ac 100644
--- a/dlls/lzexpand/lzexpand_main.c
+++ b/dlls/lzexpand/lzexpand_main.c
@@ -26,11 +26,13 @@
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "lzexpand.h"
diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c
index 6342875..f2c7387 100644
--- a/dlls/mapi32/mapi32_main.c
+++ b/dlls/mapi32/mapi32_main.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "mapi.h"
#include "mapicode.h"
diff --git a/dlls/mpr/auth.c b/dlls/mpr/auth.c
index 53a3544..531ca8a 100644
--- a/dlls/mpr/auth.c
+++ b/dlls/mpr/auth.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c
index 9f81675..8f5f11d 100644
--- a/dlls/mpr/mpr_main.c
+++ b/dlls/mpr/mpr_main.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
diff --git a/dlls/mpr/multinet.c b/dlls/mpr/multinet.c
index 9b79449..aa8cfb8 100644
--- a/dlls/mpr/multinet.c
+++ b/dlls/mpr/multinet.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c
index ad7bf37..aa9519b 100644
--- a/dlls/mpr/nps.c
+++ b/dlls/mpr/nps.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "netspi.h"
diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c
index 6a43305..9d5c6bc 100644
--- a/dlls/mpr/pwcache.c
+++ b/dlls/mpr/pwcache.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "winreg.h"
diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c
index 2c68bcf..935fbb8 100644
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -21,12 +21,14 @@
#include "config.h"
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winnetwk.h"
diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c
index b4b3f9c..b473f9c 100644
--- a/dlls/msacm/driver.c
+++ b/dlls/msacm/driver.c
@@ -24,19 +24,21 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
+#include "winreg.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
-#include "winreg.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msacm);
diff --git a/dlls/msacm/filter.c b/dlls/msacm/filter.c
index 6389125..3bce5c2 100644
--- a/dlls/msacm/filter.c
+++ b/dlls/msacm/filter.c
@@ -20,11 +20,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/format.c b/dlls/msacm/format.c
index 097b36f..7b06dfc 100644
--- a/dlls/msacm/format.c
+++ b/dlls/msacm/format.c
@@ -21,16 +21,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
-#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/imaadp32/imaadp32.c b/dlls/msacm/imaadp32/imaadp32.c
index bcc4453..37e6143 100644
--- a/dlls/msacm/imaadp32/imaadp32.c
+++ b/dlls/msacm/imaadp32/imaadp32.c
@@ -20,13 +20,16 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "msacm.h"
+#include "mmsystem.h"
#include "mmreg.h"
+#include "msacm.h"
#include "../msacmdrv.h"
#include "wine/debug.h"
diff --git a/dlls/msacm/internal.c b/dlls/msacm/internal.c
index 8e30f9b..d54c764 100644
--- a/dlls/msacm/internal.c
+++ b/dlls/msacm/internal.c
@@ -21,15 +21,17 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "winreg.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/msacm.rc b/dlls/msacm/msacm.rc
index 1c34bfa..7f94324 100644
--- a/dlls/msacm/msacm.rc
+++ b/dlls/msacm/msacm.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "wineacm.h"
diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c
index 71a94f3..6ca97e9 100644
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -21,10 +21,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
+#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index 1d1d017..01bfa75 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -18,9 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/msacmdrv.h b/dlls/msacm/msacmdrv.h
index cb8688f..91942e3 100644
--- a/dlls/msacm/msacmdrv.h
+++ b/dlls/msacm/msacmdrv.h
@@ -21,8 +21,13 @@
#ifndef __WINE_MSACMDRV_H
#define __WINE_MSACMDRV_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
+#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
/***********************************************************************
diff --git a/dlls/msacm/msadp32/msadp32.c b/dlls/msacm/msadp32/msadp32.c
index 66b6c07..f901bd2 100644
--- a/dlls/msacm/msadp32/msadp32.c
+++ b/dlls/msacm/msadp32/msadp32.c
@@ -20,13 +20,16 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "msacm.h"
+#include "mmsystem.h"
#include "mmreg.h"
+#include "msacm.h"
#include "../msacmdrv.h"
#include "wine/debug.h"
diff --git a/dlls/msacm/msg711/msg711.c b/dlls/msacm/msg711/msg711.c
index e162d05..d173917 100644
--- a/dlls/msacm/msg711/msg711.c
+++ b/dlls/msacm/msg711/msg711.c
@@ -20,13 +20,16 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "msacm.h"
+#include "mmsystem.h"
#include "mmreg.h"
+#include "msacm.h"
#include "../msacmdrv.h"
#include "wine/debug.h"
diff --git a/dlls/msacm/pcmconverter.c b/dlls/msacm/pcmconverter.c
index aedd8ad..87d1f62 100644
--- a/dlls/msacm/pcmconverter.c
+++ b/dlls/msacm/pcmconverter.c
@@ -32,10 +32,14 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
-#include "msacm.h"
+#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
+#include "mmreg.h"
+#include "msacm.h"
#include "wingdi.h"
#include "winnls.h"
#include "winuser.h"
diff --git a/dlls/msacm/stream.c b/dlls/msacm/stream.c
index c9bac47..24060e2 100644
--- a/dlls/msacm/stream.c
+++ b/dlls/msacm/stream.c
@@ -28,12 +28,14 @@
* + properly close ACM streams
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
-#include "windef.h"
#include "wine/debug.h"
#include "mmsystem.h"
+#include "mmreg.h"
#include "msacm.h"
#include "msacmdrv.h"
#include "wineacm.h"
diff --git a/dlls/msacm/winemp3/mpegl3.c b/dlls/msacm/winemp3/mpegl3.c
index c0e6ab9..2d89117 100644
--- a/dlls/msacm/winemp3/mpegl3.c
+++ b/dlls/msacm/winemp3/mpegl3.c
@@ -20,13 +20,16 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "msacm.h"
+#include "mmsystem.h"
#include "mmreg.h"
+#include "msacm.h"
#include "../msacmdrv.h"
#include "mpg123.h"
#include "mpglib.h"
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c
index 094e8b0..085943b 100644
--- a/dlls/msdmo/dmoreg.c
+++ b/dlls/msdmo/dmoreg.c
@@ -17,6 +17,9 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "mediaobj.h"
diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c
index 827c5d0..6172f65 100644
--- a/dlls/msdmo/dmort.c
+++ b/dlls/msdmo/dmort.c
@@ -17,6 +17,9 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "mediaobj.h"
diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c
index aaa1409..e91dd72 100644
--- a/dlls/msi/distinct.c
+++ b/dlls/msi/distinct.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msi/handle.c b/dlls/msi/handle.c
index ee73b11..50073f2 100644
--- a/dlls/msi/handle.c
+++ b/dlls/msi/handle.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index dc5d0cd..8d7c6cb 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -20,6 +20,8 @@
#define NONAMELESSUNION
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index e1e2eb3..728ee22 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -21,6 +21,10 @@
#ifndef __WINE_MSI_PRIVATE__
#define __WINE_MSI_PRIVATE__
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "msi.h"
#include "msiquery.h"
#include "objidl.h"
diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c
index ac4b3a9..a5d971a 100644
--- a/dlls/msi/msiquery.c
+++ b/dlls/msi/msiquery.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msi/order.c b/dlls/msi/order.c
index ba90047..e3d6f4b 100644
--- a/dlls/msi/order.c
+++ b/dlls/msi/order.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msi/query.h b/dlls/msi/query.h
index 663a673..584feb0 100644
--- a/dlls/msi/query.h
+++ b/dlls/msi/query.h
@@ -21,6 +21,9 @@
#ifndef __WINE_MSI_QUERY_H
#define __WINE_MSI_QUERY_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "objidl.h"
#include "msi.h"
diff --git a/dlls/msi/record.c b/dlls/msi/record.c
index 4bce8d3..9074f90 100644
--- a/dlls/msi/record.c
+++ b/dlls/msi/record.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/msi/select.c b/dlls/msi/select.c
index 5877075..a1eb95c 100644
--- a/dlls/msi/select.c
+++ b/dlls/msi/select.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 94409a3..e67b532 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -22,9 +22,13 @@
#include "config.h"
-#include "winbase.h"
+
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "query.h"
#include "wine/debug.h"
#include "wine/unicode.h"
diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index 3e54818..4a9792f 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -20,6 +20,8 @@
#define NONAMELESSUNION
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index f0f7cbb..c56330f 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c
index 3816e51..85d5416 100644
--- a/dlls/msi/tokenize.c
+++ b/dlls/msi/tokenize.c
@@ -16,9 +16,12 @@
** parser for analysis.
*/
-#include "winbase.h"
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "wine/debug.h"
#include "winnls.h"
#include "query.h"
diff --git a/dlls/msi/where.c b/dlls/msi/where.c
index 520293f..d90ddc2 100644
--- a/dlls/msi/where.c
+++ b/dlls/msi/where.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/msimg32/msimg32_main.c b/dlls/msimg32/msimg32_main.c
index 9823431..1fdf3a6 100644
--- a/dlls/msimg32/msimg32_main.c
+++ b/dlls/msimg32/msimg32_main.c
@@ -16,6 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
diff --git a/dlls/msisys/msisys.c b/dlls/msisys/msisys.c
index 85e2755..bc4ef07 100644
--- a/dlls/msisys/msisys.c
+++ b/dlls/msisys/msisys.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c
index 0d399a2..1e1928f 100644
--- a/dlls/msvcrt/cpp.c
+++ b/dlls/msvcrt/cpp.c
@@ -22,6 +22,11 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/exception.h"
#include "excpt.h"
diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
index 36fdc24..cfbb7cd 100644
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -26,6 +26,11 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "msvcrt.h"
#include "wine/exception.h"
diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c
index 22dfba6..aa2138e 100644
--- a/dlls/msvcrt/dir.c
+++ b/dlls/msvcrt/dir.c
@@ -24,7 +24,12 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <time.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "msvcrt.h"
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index 1d7c089..045af5e 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -28,6 +28,11 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/exception.h"
#include "msvcrt.h"
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 47c2f8f..a49f693 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -25,11 +25,15 @@
#include "wine/port.h"
#include <time.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "msvcrt.h"
#include "msvcrt/errno.h"
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index b1eb357..09156a2 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -22,8 +22,10 @@
#include "wine/port.h"
#include <locale.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c
index 1053ff5..e9c5dfb 100644
--- a/dlls/msvcrt/lock.c
+++ b/dlls/msvcrt/lock.c
@@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "mtdll.h"
#include "wine/debug.h"
+#include "windef.h"
#include "winbase.h"
WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c
index 05ba195..58cd6bc 100644
--- a/dlls/msvcrt/scanf.c
+++ b/dlls/msvcrt/scanf.c
@@ -23,7 +23,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "msvcrt.h"
#include "msvcrt/conio.h"
diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c
index 481ef82..4852892 100644
--- a/dlls/msvcrt/tests/file.c
+++ b/dlls/msvcrt/tests/file.c
@@ -19,13 +19,15 @@
*/
#include "wine/test.h"
-#include <winbase.h>
-#include <winnls.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <io.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winnls.h>
static void test_fdopen( void )
{
diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c
index cd30f0c..18693a6 100644
--- a/dlls/msvcrt20/msvcrt20.c
+++ b/dlls/msvcrt20/msvcrt20.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
extern void __getmainargs(int *argc, char** *argv, char** *envp,
int expand_wildcards, int *new_mode);
diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c
index c3606ee..6684ca2 100644
--- a/dlls/msvideo/mciwnd.c
+++ b/dlls/msvideo/mciwnd.c
@@ -18,11 +18,12 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "winnls.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/msvideo/msrle32/msrle_private.h b/dlls/msvideo/msrle32/msrle_private.h
index 9856273..8b4cdf3 100644
--- a/dlls/msvideo/msrle32/msrle_private.h
+++ b/dlls/msvideo/msrle32/msrle_private.h
@@ -19,9 +19,15 @@
#ifndef __MSRLE32_PRIVATE_H
#define __MSRLE32_PRIVATE_H
+#ifndef RC_INVOKED
+#include <stdarg.h>
+#endif
+
#define COM_NO_WINDOWS_H
+#include "windef.h"
#include "winbase.h"
#include "mmsystem.h"
+#include "wingdi.h"
#include "vfw.h"
#define IDS_NAME 100
diff --git a/dlls/msvideo/msrle32/rsrc.rc b/dlls/msvideo/msrle32/rsrc.rc
index fde40a7..62e9bd1 100644
--- a/dlls/msvideo/msrle32/rsrc.rc
+++ b/dlls/msvideo/msrle32/rsrc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "msrle_private.h"
diff --git a/dlls/msvideo/msvideo_private.h b/dlls/msvideo/msvideo_private.h
index fe16375..bf0544f 100644
--- a/dlls/msvideo/msvideo_private.h
+++ b/dlls/msvideo/msvideo_private.h
@@ -20,8 +20,11 @@
#define __WINE_MSVIDEO_PRIVATE_H
#define COM_NO_WINDOWS_H
-#include "winbase.h"
+#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "vfw.h"
diff --git a/dlls/msvideo/vfw16.h b/dlls/msvideo/vfw16.h
index 410aa1a..3257ed0 100644
--- a/dlls/msvideo/vfw16.h
+++ b/dlls/msvideo/vfw16.h
@@ -19,6 +19,11 @@
#ifndef __WINE_VFW16_H
#define __WINE_VFW16_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "vfw.h"
#include "wownt32.h"
#include "wine/windef16.h"
diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c
index 224272e..48ce2c1 100644
--- a/dlls/mswsock/mswsock.c
+++ b/dlls/mswsock/mswsock.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winsock2.h"
diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c
index afb7732..5e5a585 100644
--- a/dlls/netapi32/access.c
+++ b/dlls/netapi32/access.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "lmcons.h"
diff --git a/dlls/netapi32/apibuf.c b/dlls/netapi32/apibuf.c
index 8e9e1ee..86c4315 100644
--- a/dlls/netapi32/apibuf.c
+++ b/dlls/netapi32/apibuf.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "lmcons.h"
#include "lmapibuf.h"
diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c
index f8dcdff..205af40 100644
--- a/dlls/netapi32/browsr.c
+++ b/dlls/netapi32/browsr.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "lmcons.h"
diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c
index 55edfcb..748d497 100644
--- a/dlls/netapi32/netapi32.c
+++ b/dlls/netapi32/netapi32.c
@@ -19,12 +19,14 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "wingdi.h"
diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c
index 23c9927..a9ceac5 100644
--- a/dlls/netapi32/tests/access.c
+++ b/dlls/netapi32/tests/access.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include <wine/test.h>
+#include <windef.h>
#include <winbase.h>
#include <winerror.h>
#include <lmaccess.h>
diff --git a/dlls/netapi32/tests/apibuf.c b/dlls/netapi32/tests/apibuf.c
index 2eecec8..6768a2b 100644
--- a/dlls/netapi32/tests/apibuf.c
+++ b/dlls/netapi32/tests/apibuf.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include <windef.h>
#include <winbase.h>
#include <winerror.h>
#include <lmcons.h>
diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c
index 614f4f4..7833c39 100644
--- a/dlls/netapi32/tests/wksta.c
+++ b/dlls/netapi32/tests/wksta.c
@@ -18,8 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
+#include "winnls.h"
+#include "ntstatus.h"
#include "winresrc.h" /* Ensure we use Unicode defns with native headers */
#include "nb30.h"
#include "lmcons.h"
diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c
index 0c61e00..06149fe 100644
--- a/dlls/netapi32/wksta.c
+++ b/dlls/netapi32/wksta.c
@@ -18,7 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "nb30.h"
#include "lmcons.h"
@@ -27,6 +29,8 @@
#include "lmwksta.h"
#include "iphlpapi.h"
#include "winerror.h"
+#include "ntstatus.h"
+#include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index cd64bc9..22c2b1e 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_IO_H
# include <io.h>
@@ -66,6 +67,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winioctl.h"
#include "ntddstor.h"
diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c
index 3fd54dd..a635e2f 100644
--- a/dlls/ntdll/critsection.c
+++ b/dlls/ntdll/critsection.c
@@ -22,9 +22,13 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
#include "ntdll_misc.h"
diff --git a/dlls/ntdll/debugtools.c b/dlls/ntdll/debugtools.c
index 17f73b1..dcae37f 100644
--- a/dlls/ntdll/debugtools.c
+++ b/dlls/ntdll/debugtools.c
@@ -37,6 +37,7 @@
#include "wine/exception.h"
#include "wine/library.h"
#include "wine/unicode.h"
+#include "ntstatus.h"
#include "thread.h"
#include "winbase.h"
#include "winnt.h"
diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c
index c1d8a4b..6486440 100644
--- a/dlls/ntdll/env.c
+++ b/dlls/ntdll/env.c
@@ -21,7 +21,11 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index dd23c24..a5db01b 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -20,6 +20,12 @@
*/
#include "config.h"
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 289bbe3..fab08ab 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -24,8 +24,11 @@
#include <assert.h>
#include <signal.h>
+#include <stdarg.h>
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "thread.h"
#include "winternl.h"
#include "wine/exception.h"
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index c377819..58e888a 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_VALGRIND_MEMCHECK_H
@@ -31,9 +32,12 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
-#include "winbase.h"
#include "winerror.h"
#include "winnt.h"
#include "thread.h"
diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c
index cbd4d77..1f52211 100644
--- a/dlls/ntdll/large_int.c
+++ b/dlls/ntdll/large_int.c
@@ -19,7 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
/*
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index ed35fd6..baab03d 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -20,9 +20,12 @@
*/
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
#include "module.h"
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index fc88ac6..3fc3b0d 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -21,12 +21,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 2d6a9cd..0a0f2f3 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -19,7 +19,13 @@
#ifndef __WINE_NTDLL_MISC_H
#define __WINE_NTDLL_MISC_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
+#include "ntstatus.h"
#include "winternl.h"
#include "module.h"
#include "thread.h"
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 7aef800..32db0d3 100644
--- a/dlls/ntdll/om.c
+++ b/dlls/ntdll/om.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_IO_H
@@ -30,6 +31,9 @@
#endif
#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c
index 6b1e863..3a98581 100644
--- a/dlls/ntdll/path.c
+++ b/dlls/ntdll/path.c
@@ -21,6 +21,11 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 914f3e7..2e111ce 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -28,6 +28,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -35,6 +36,9 @@
#include "wine/unicode.h"
#include "wine/library.h"
#include "wine/server.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c
index 047e217..1df8787 100644
--- a/dlls/ntdll/resource.c
+++ b/dlls/ntdll/resource.c
@@ -27,15 +27,18 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "thread.h"
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 37b4d1a..545616f 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -27,12 +27,14 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
-#include "winternl.h"
#include "winreg.h"
+#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "ntdll_misc.h"
diff --git a/dlls/ntdll/rtlbitmap.c b/dlls/ntdll/rtlbitmap.c
index dee1537..21abaf9 100644
--- a/dlls/ntdll/rtlbitmap.c
+++ b/dlls/ntdll/rtlbitmap.c
@@ -28,9 +28,13 @@
* Note that to avoid unexpected behaviour, the size of a bitmap should be set
* to a multiple of 32.
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 71a6be7..f207952 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -23,10 +23,14 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 7fb4b65..85e7172 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -38,8 +39,8 @@
#include "wine/debug.h"
#include "winerror.h"
-#include "winternl.h"
#include "winreg.h"
+#include "winternl.h"
#include "ntdll_misc.h"
#include "excpt.h"
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 1821c06..57de180 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -26,6 +26,7 @@
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -51,6 +52,8 @@
#endif
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/library.h"
#include "ntdll_misc.h"
diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c
index ad2bb21..bb895d7 100644
--- a/dlls/ntdll/signal_powerpc.c
+++ b/dlls/ntdll/signal_powerpc.c
@@ -25,6 +25,7 @@
#include <signal.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -50,6 +51,8 @@
#endif
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/library.h"
#include "wine/exception.h"
diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c
index 0c226b4..9241be7 100644
--- a/dlls/ntdll/signal_sparc.c
+++ b/dlls/ntdll/signal_sparc.c
@@ -27,11 +27,14 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <sys/ucontext.h>
-#include "winternl.h"
+#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
+#include "winternl.h"
#include "winnt.h"
#include "wine/exception.h"
diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c
index ade983a..1ff6b6e 100644
--- a/dlls/ntdll/string.c
+++ b/dlls/ntdll/string.c
@@ -23,9 +23,13 @@
#include "config.h"
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 2f19024..5a0383d 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -36,6 +36,7 @@
# include <unistd.h>
#endif
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@@ -43,6 +44,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "async.h"
#include "thread.h"
diff --git a/dlls/ntdll/sysdeps.c b/dlls/ntdll/sysdeps.c
index d0ed6da..8632ee3 100644
--- a/dlls/ntdll/sysdeps.c
+++ b/dlls/ntdll/sysdeps.c
@@ -45,6 +45,7 @@
#include <sched.h>
#endif
+#include "ntstatus.h"
#include "thread.h"
#include "wine/pthread.h"
#include "wine/server.h"
diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c
index ff70b0f..b32a2e1 100644
--- a/dlls/ntdll/tests/env.c
+++ b/dlls/ntdll/tests/env.c
@@ -18,9 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c
index 9913db3..cb81807 100644
--- a/dlls/ntdll/tests/error.c
+++ b/dlls/ntdll/tests/error.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include "ntstatus.h"
@@ -25,8 +26,10 @@
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "rpcnterr.h"
+#include "winreg.h"
#include "winternl.h"
#include "ntsecapi.h"
diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c
index f31103d..c38aa38 100644
--- a/dlls/ntdll/tests/generated.c
+++ b/dlls/ntdll/tests/generated.c
@@ -11,6 +11,7 @@
#define WINE_NOWINSOCK
+#include "ntstatus.h"
#include "windows.h"
#include "wine/test.h"
diff --git a/dlls/ntdll/tests/large_int.c b/dlls/ntdll/tests/large_int.c
index 16c1847..2320d57 100644
--- a/dlls/ntdll/tests/large_int.c
+++ b/dlls/ntdll/tests/large_int.c
@@ -21,12 +21,16 @@
* windows.
*/
+#include <stdarg.h>
#include <stdlib.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c
index 383b8f5..de913f0 100644
--- a/dlls/ntdll/tests/path.c
+++ b/dlls/ntdll/tests/path.c
@@ -18,8 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
static NTSTATUS (WINAPI *pRtlMultiByteToUnicodeN)( LPWSTR dst, DWORD dstlen, LPDWORD reslen,
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index ecd95b6..986495a 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -21,12 +21,16 @@
* windows.
*/
+#include <stdarg.h>
#include <stdlib.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
diff --git a/dlls/ntdll/tests/rtlbitmap.c b/dlls/ntdll/tests/rtlbitmap.c
index 38ad2a1..059e77a 100644
--- a/dlls/ntdll/tests/rtlbitmap.c
+++ b/dlls/ntdll/tests/rtlbitmap.c
@@ -20,9 +20,14 @@
* We use function pointers here as some of the bitmap functions exist only
* in later versions of ntdll.
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ordinal calls */
diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c
index d9a9b7c..ee4d6ca 100644
--- a/dlls/ntdll/tests/rtlstr.c
+++ b/dlls/ntdll/tests/rtlstr.c
@@ -22,12 +22,16 @@
* windows.
*/
+#include <stdarg.h>
#include <stdlib.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c
index ac5595f..55e48fb 100644
--- a/dlls/ntdll/tests/string.c
+++ b/dlls/ntdll/tests/string.c
@@ -21,12 +21,16 @@
* windows.
*/
+#include <stdarg.h>
#include <stdlib.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/test.h"
#include "winnt.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
/* Function ptrs for ntdll calls */
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index deb909c..67868a4 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "ntstatus.h"
#include "thread.h"
#include "winternl.h"
#include "wine/server.h"
diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c
index db96ec6..c79bcf7 100644
--- a/dlls/ntdll/time.c
+++ b/dlls/ntdll/time.c
@@ -25,6 +25,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
@@ -37,6 +38,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 0520b7d..2626994 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -40,6 +40,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "thread.h"
#include "winternl.h"
#include "global.h"
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index 7dc7eb1..c631822 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -26,8 +26,13 @@
#include <limits.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index f1d0cb2..682d950 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -25,11 +25,13 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
#include "wine/library.h"
diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c
index ce5ec09..fda4091 100644
--- a/dlls/ole32/antimoniker.c
+++ b/dlls/ole32/antimoniker.c
@@ -19,10 +19,12 @@
***************************************************************************************/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index 7ce20a5..bed44a5 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************************/
+#include <stdarg.h>
#include <string.h>
#include <assert.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
#include "objbase.h"
diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index 7d43d3b..541a48f 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -59,6 +59,7 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index 55cb700..cfcc6fe 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -25,12 +25,14 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "objbase.h"
diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h
index 0d1b71d..9ff9258 100644
--- a/dlls/ole32/compobj_private.h
+++ b/dlls/ole32/compobj_private.h
@@ -26,8 +26,13 @@
/* All private prototype functions used by OLE will be added to this header file */
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "wtypes.h"
#include "dcom.h"
+#include "winreg.h"
#include "winternl.h"
/* exported interface */
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index 9436a20..91080c0 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -19,10 +19,12 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c
index 8ae1dca..65feca5 100644
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -44,6 +44,7 @@
* was stored and the aspect, but that's about it.
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c
index ed9eeb1..820b381 100644
--- a/dlls/ole32/defaulthandler.c
+++ b/dlls/ole32/defaulthandler.c
@@ -46,8 +46,10 @@
* in place but no notifications are sent to the sinks yet.
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 9625472..cf700ce 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -23,6 +23,7 @@
* TEB at offset 0xf80
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 67ff53d..93c7a58 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -19,10 +19,12 @@
***************************************************************************************/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c
index 87df552..2a2757f 100644
--- a/dlls/ole32/ftmarshal.c
+++ b/dlls/ole32/ftmarshal.c
@@ -21,10 +21,12 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c
index 1b09b7c..17edb60 100644
--- a/dlls/ole32/git.c
+++ b/dlls/ole32/git.c
@@ -30,14 +30,16 @@
#define NONAMELESSSTRUCT
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
-#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "compobj_private.h"
diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c
index 75930f4..617af6a 100644
--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
@@ -25,16 +25,18 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
-#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c
index 42c1831..5eb5d80 100644
--- a/dlls/ole32/ifs.c
+++ b/dlls/ole32/ifs.c
@@ -21,13 +21,14 @@
#include "config.h"
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include "ole2.h"
#include "windef.h"
#include "winbase.h"
+#include "ole2.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/ifs.h b/dlls/ole32/ifs.h
index 8faf2a5..72a1b71 100644
--- a/dlls/ole32/ifs.h
+++ b/dlls/ole32/ifs.h
@@ -19,6 +19,10 @@
#ifndef __WINE_OLE_IFS_H
#define __WINE_OLE_IFS_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
/***********************************************************************
diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c
index f9c10a4..34d4f2d 100644
--- a/dlls/ole32/itemmoniker.c
+++ b/dlls/ole32/itemmoniker.c
@@ -19,11 +19,13 @@
***************************************************************************************/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c
index b6d4ca7..5af93f2 100644
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -21,11 +21,13 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
#include "ole2ver.h"
diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c
index 9dad217..6c1feae 100644
--- a/dlls/ole32/memlockbytes.c
+++ b/dlls/ole32/memlockbytes.c
@@ -22,15 +22,16 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "objbase.h"
#include "ole2.h"
-#include "winbase.h"
#include "winerror.h"
#include "ifs.h"
diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c
index f0154c5..f1eb748 100644
--- a/dlls/ole32/memlockbytes16.c
+++ b/dlls/ole32/memlockbytes16.c
@@ -21,15 +21,16 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "objbase.h"
#include "ole2.h"
-#include "winbase.h"
#include "winerror.h"
#include "ifs.h"
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index 87c309f..5163321 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -20,9 +20,11 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wtypes.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c
index 0369e8b..5dcbb5e 100644
--- a/dlls/ole32/ole16.c
+++ b/dlls/ole32/ole16.c
@@ -25,11 +25,13 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
#include "ole2ver.h"
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index 5140274..743f14c 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -25,19 +25,22 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "commctrl.h"
-#include "ole2.h"
-#include "ole2ver.h"
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "wingdi.h"
#include "winuser.h"
+#include "winnls.h"
#include "winreg.h"
+#include "commctrl.h"
+#include "ole2.h"
+#include "ole2ver.h"
#include "wownt32.h"
#include "wine/winbase16.h"
diff --git a/dlls/ole32/ole2_16.c b/dlls/ole32/ole2_16.c
index e6878bb..67cbd97 100644
--- a/dlls/ole32/ole2_16.c
+++ b/dlls/ole32/ole2_16.c
@@ -25,19 +25,21 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "ole2.h"
#include "ole2ver.h"
-#include "windef.h"
-#include "winbase.h"
#include "winerror.h"
-#include "winuser.h"
-#include "winreg.h"
#include "wownt32.h"
#include "wine/winbase16.h"
diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c
index ba51ea6..89a7e5e 100644
--- a/dlls/ole32/ole2impl.c
+++ b/dlls/ole32/ole2impl.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index 27602d9..82dff4b 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -23,6 +23,7 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c
index 0bd6685..6fb1e59 100644
--- a/dlls/ole32/ole2stubs.c
+++ b/dlls/ole32/ole2stubs.c
@@ -21,6 +21,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/ole32/ole32_main.c b/dlls/ole32/ole32_main.c
index f5f7905..397f589 100644
--- a/dlls/ole32/ole32_main.c
+++ b/dlls/ole32/ole32_main.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winerror.h"
#include "winbase.h"
diff --git a/dlls/ole32/ole32_main.h b/dlls/ole32/ole32_main.h
index c897c81..a6b7598 100644
--- a/dlls/ole32/ole32_main.h
+++ b/dlls/ole32/ole32_main.h
@@ -19,7 +19,10 @@
#ifndef __WINE_OLE32_MAIN_H
#define __WINE_OLE32_MAIN_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
extern HINSTANCE OLE32_hInstance;
diff --git a/dlls/ole32/ole32res.rc b/dlls/ole32/ole32res.rc
index 31578a5..2d74d82 100644
--- a/dlls/ole32/ole32res.rc
+++ b/dlls/ole32/ole32res.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 8a0fccf..8a9d276 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -20,7 +20,9 @@
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c
index 63cee18..02198bd 100644
--- a/dlls/ole32/oleproxy.c
+++ b/dlls/ole32/oleproxy.c
@@ -34,12 +34,14 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
#include "rpc.h"
diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c
index d99171c..dd25e90 100644
--- a/dlls/ole32/regsvr.c
+++ b/dlls/ole32/regsvr.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c
index 21663ab..aa476c9 100644
--- a/dlls/ole32/rpc.c
+++ b/dlls/ole32/rpc.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
@@ -28,6 +29,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "ole2.h"
#include "ole2ver.h"
diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index a696f05..22e5d7b 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -33,12 +33,14 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <limits.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "objbase.h"
diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c
index a82d4b9..2a5c9d1 100644
--- a/dlls/ole32/stg_stream.c
+++ b/dlls/ole32/stg_stream.c
@@ -25,13 +25,16 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c
index 086d6b0..3edad0e 100644
--- a/dlls/ole32/storage.c
+++ b/dlls/ole32/storage.c
@@ -25,6 +25,7 @@
#include <assert.h>
#include <time.h>
+#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -34,6 +35,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wine/winbase16.h"
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index a925b95..1134a1ed 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -25,13 +25,15 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winbase.h" /* for lstrlenW() and the likes */
+#include "windef.h"
+#include "winbase.h"
#include "winnls.h"
#include "winuser.h"
#include "wine/unicode.h"
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 5c26d29..f9b0fb2 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -29,6 +29,10 @@
#ifndef __STORAGE32_H__
#define __STORAGE32_H__
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "winnt.h"
#include "objbase.h"
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index e9415a7..ff778f4 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -23,8 +23,10 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index 73b34dc..5273a46 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -24,14 +24,16 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "oleauto.h"
#include "winerror.h"
-#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
+#include "winreg.h"
#include "winnls.h" /* for PRIMARYLANGID */
#include "wine/debug.h"
diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c
index af115be..612505c 100644
--- a/dlls/oleaut32/hash.c
+++ b/dlls/oleaut32/hash.c
@@ -20,6 +20,8 @@
*
* FIXME: Not all locales are supported yet.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/oleaut32/oaidl_p.c b/dlls/oleaut32/oaidl_p.c
index 0e9ed95..bc724b7 100644
--- a/dlls/oleaut32/oaidl_p.c
+++ b/dlls/oleaut32/oaidl_p.c
@@ -17,6 +17,10 @@
#endif
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "rpcproxy.h"
#ifndef __RPCPROXY_H_VERSION__
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index ed49c9f..692c6d7 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -20,13 +20,14 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include "wine/windef16.h"
-#include "ole2.h"
-#include "oleauto.h"
#include "windef.h"
#include "winbase.h"
+#include "ole2.h"
+#include "oleauto.h"
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/oleaut32/ole2disp.h b/dlls/oleaut32/ole2disp.h
index 8e12317..1c2dda9 100644
--- a/dlls/oleaut32/ole2disp.h
+++ b/dlls/oleaut32/ole2disp.h
@@ -19,6 +19,10 @@
#ifndef __WINE_OLEAUT32_OLE2DISP_H
#define __WINE_OLEAUT32_OLE2DISP_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "wtypes.h"
#include "wine/windef16.h"
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index ec319ab..5434027 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index 34465ed..9c09d3c 100644
--- a/dlls/oleaut32/olefont.c
+++ b/dlls/oleaut32/olefont.c
@@ -21,11 +21,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 1981493..5f174fa 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -40,6 +40,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -53,6 +54,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/oleaut32/parsedt.h b/dlls/oleaut32/parsedt.h
index 01b614a..8c8c7bc 100644
--- a/dlls/oleaut32/parsedt.h
+++ b/dlls/oleaut32/parsedt.h
@@ -44,8 +44,10 @@
have its own.
*/
+#include <stdarg.h>
#include <stdlib.h>
-#include "windef.h" /* DateToTm use */
+#include "windef.h"
+#include "winbase.h"
/* ----------------------------------------------------------------
* Section 1: bool, true, false, TRUE, FALSE
diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c
index 3c61151..01a8c1a 100644
--- a/dlls/oleaut32/regsvr.c
+++ b/dlls/oleaut32/regsvr.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index ec4bef2..0a06dbb 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -30,6 +30,7 @@
* 0x10: SAFEARRAYBOUNDS[0...]
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
index 4486971..e1f8b70 100644
--- a/dlls/oleaut32/stubs.c
+++ b/dlls/oleaut32/stubs.c
@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c
index d01b517..06cd2a3 100644
--- a/dlls/oleaut32/tests/olefont.c
+++ b/dlls/oleaut32/tests/olefont.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -26,6 +27,7 @@
#include <time.h>
#include <wine/test.h>
+#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <wingdi.h>
diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c
index 6892609..4c57e09 100644
--- a/dlls/oleaut32/tests/safearray.c
+++ b/dlls/oleaut32/tests/safearray.c
@@ -19,8 +19,7 @@
*
*/
-#include <winsock.h>
-
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
@@ -28,10 +27,12 @@
#include <time.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "winnls.h"
+#include "winsock.h"
#include "winerror.h"
#include "winnt.h"
diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c
index 85b95a0..f522f5d 100644
--- a/dlls/oleaut32/tests/vartest.c
+++ b/dlls/oleaut32/tests/vartest.c
@@ -55,17 +55,17 @@
*
*/
-
-#include <winsock.h>
-
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <float.h>
#include <time.h>
-#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
+#include "winsock.h"
+#include "wine/test.h"
#include "winuser.h"
#include "wingdi.h"
#include "winnls.h"
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index b18433d..ae1d2d3 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -23,12 +23,14 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index cb30cae..d43bd83 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -57,12 +57,14 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index ffd1b8f..640c86d 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -21,6 +21,10 @@
#ifndef _WINE_TYPELIB_H
#define _WINE_TYPELIB_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "oleauto.h"
#include "wine/windef16.h"
diff --git a/dlls/oleaut32/typelib16.c b/dlls/oleaut32/typelib16.c
index 739d725..3f79153 100644
--- a/dlls/oleaut32/typelib16.c
+++ b/dlls/oleaut32/typelib16.c
@@ -26,10 +26,12 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index eb8e792..472feea 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 4b22ee5..fcd6628 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -38,6 +38,7 @@
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <math.h>
#include <time.h>
@@ -49,7 +50,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "oleauto.h"
+#include "winreg.h"
#include "heap.h"
#include "wine/debug.h"
#include "winerror.h"
diff --git a/dlls/olecli/olecli16.c b/dlls/olecli/olecli16.c
index 3338e37..3738e5d 100644
--- a/dlls/olecli/olecli16.c
+++ b/dlls/olecli/olecli16.c
@@ -23,6 +23,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/windef16.h"
#include "winbase.h"
diff --git a/dlls/olecli/olecli_main.c b/dlls/olecli/olecli_main.c
index ba86805..2a77303 100644
--- a/dlls/olecli/olecli_main.c
+++ b/dlls/olecli/olecli_main.c
@@ -23,6 +23,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "wine/windef16.h"
#include "winbase.h"
diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c
index 66525be..4a96dab 100644
--- a/dlls/oledlg/oledlg_main.c
+++ b/dlls/oledlg/oledlg_main.c
@@ -19,9 +19,13 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "oledlg.h"
#include "wine/debug.h"
#include "ole2.h"
diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c
index 5a6430a..8bd2689 100644
--- a/dlls/olepro32/olepro32stubs.c
+++ b/dlls/olepro32/olepro32stubs.c
@@ -21,10 +21,12 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
#include "wine/debug.h"
+#include "windef.h"
#include "winbase.h"
#include "ole2.h"
-#include "windef.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/olesvr/olesvr_main.c b/dlls/olesvr/olesvr_main.c
index efde24e..156351b 100644
--- a/dlls/olesvr/olesvr_main.c
+++ b/dlls/olesvr/olesvr_main.c
@@ -23,7 +23,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
#include "objbase.h"
#include "wine/debug.h"
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 6a2f9c7..5de9621 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index 0f301e6..cd4e961 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winbase.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "wine/server.h"
#include "wine/debug.h"
diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c
index fc135a3..4c91767 100644
--- a/dlls/quartz/enummoniker.c
+++ b/dlls/quartz/enummoniker.c
@@ -22,6 +22,10 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "ole2.h"
#include "strmif.h"
diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 3ff1704..41ab69f 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -27,6 +27,7 @@
#include "vfwmsgs.h"
#include "winbase.h"
#include "winreg.h"
+#include "ntstatus.h"
#include <assert.h>
WINE_DEFAULT_DEBUG_CHANNEL(quartz);
diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index 5c05680..4ea45e9 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -21,6 +21,10 @@
*/
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dshow.h"
#include "wine/debug.h"
#include "strmif.h"
diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c
index 65a9bc1..0fb959c 100644
--- a/dlls/quartz/filtermapper.c
+++ b/dlls/quartz/filtermapper.c
@@ -20,6 +20,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h
index f760842..52f78b0 100644
--- a/dlls/quartz/quartz_private.h
+++ b/dlls/quartz/quartz_private.h
@@ -23,6 +23,9 @@
#ifndef __QUARTZ_PRIVATE_INCLUDED__
#define __QUARTZ_PRIVATE_INCLUDED__
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wtypes.h"
#include "wingdi.h"
diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c
index 71ad435..cd18391 100644
--- a/dlls/quartz/regsvr.c
+++ b/dlls/quartz/regsvr.c
@@ -19,6 +19,7 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c
index 532e91c..a42c7b6 100644
--- a/dlls/rasapi32/rasapi.c
+++ b/dlls/rasapi32/rasapi.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "ras.h"
#include "wine/debug.h"
diff --git a/dlls/richedit/charlist.c b/dlls/richedit/charlist.c
index 26d1e99..e8524ae 100644
--- a/dlls/richedit/charlist.c
+++ b/dlls/richedit/charlist.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stddef.h>
diff --git a/dlls/richedit/riched32.h b/dlls/richedit/riched32.h
index 9753fc0..a4ff9f5 100644
--- a/dlls/richedit/riched32.h
+++ b/dlls/richedit/riched32.h
@@ -22,7 +22,10 @@
#ifndef __WINE_RICHED32_H
#define __WINE_RICHED32_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "richedit.h"
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index e3525d1..9744f4d 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/richedit/rtf.h b/dlls/richedit/rtf.h
index cece77b..208fbcd 100644
--- a/dlls/richedit/rtf.h
+++ b/dlls/richedit/rtf.h
@@ -1,6 +1,7 @@
#ifndef _RTF
#define _RTF
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c
index 82916a6..c888b0b 100644
--- a/dlls/rpcrt4/cproxy.c
+++ b/dlls/rpcrt4/cproxy.c
@@ -21,6 +21,8 @@
* Get rid of #if 0'ed code.
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c
index adc0d50..8df3957 100644
--- a/dlls/rpcrt4/cpsf.c
+++ b/dlls/rpcrt4/cpsf.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
index 9e70b07..bc215da 100644
--- a/dlls/rpcrt4/cstub.c
+++ b/dlls/rpcrt4/cstub.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index c95e0f9..d6b0ca2 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -22,6 +22,7 @@
* - check for errors and throw exceptions
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dlls/rpcrt4/ndr_midl.c b/dlls/rpcrt4/ndr_midl.c
index 09b236f..1797f9b 100644
--- a/dlls/rpcrt4/ndr_midl.c
+++ b/dlls/rpcrt4/ndr_midl.c
@@ -22,6 +22,7 @@
* - check for errors and throw exceptions
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h
index 931a01c..b246b44 100644
--- a/dlls/rpcrt4/ndr_misc.h
+++ b/dlls/rpcrt4/ndr_misc.h
@@ -23,6 +23,9 @@
#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "rpc.h"
#include "rpcndr.h"
struct IPSFactoryBuffer;
diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c
index b4b5441..4b2b35d 100644
--- a/dlls/rpcrt4/ndr_ole.c
+++ b/dlls/rpcrt4/ndr_ole.c
@@ -24,6 +24,7 @@
* - finish RpcStream_Vtbl
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 45e52be..a2d4a51 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -23,6 +23,7 @@
* - Who knows
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index 4e473eb..b667b48 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -21,6 +21,7 @@
* - a whole lot
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c
index eeff42b..c560495 100644
--- a/dlls/rpcrt4/rpc_epmap.c
+++ b/dlls/rpcrt4/rpc_epmap.c
@@ -22,6 +22,7 @@
* - actually do things right
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c
index d2e7e1d..ac232a5 100644
--- a/dlls/rpcrt4/rpc_message.c
+++ b/dlls/rpcrt4/rpc_message.c
@@ -23,6 +23,7 @@
* - decide if OVERLAPPED_WORKS
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c
index c27053d..2ab7f5f 100644
--- a/dlls/rpcrt4/rpc_server.c
+++ b/dlls/rpcrt4/rpc_server.c
@@ -21,6 +21,7 @@
* - a whole lot
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
@@ -29,6 +30,7 @@
#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
+#include "ntstatus.h"
#include "rpc.h"
#include "excpt.h"
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index b10e1fd..07b79fe 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -95,6 +95,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/rpcrt4/rpcss_np_client.c b/dlls/rpcrt4/rpcss_np_client.c
index b1c5fac..567277e 100644
--- a/dlls/rpcrt4/rpcss_np_client.c
+++ b/dlls/rpcrt4/rpcss_np_client.c
@@ -19,8 +19,11 @@
*/
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
+#include "ntstatus.h"
#include "wine/rpcss_shared.h"
#include "wine/debug.h"
diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c
index 8b050b6..27913d2 100644
--- a/dlls/rpcrt4/tests/rpc.c
+++ b/dlls/rpcrt4/tests/rpc.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include <windef.h>
#include <winbase.h>
#include <winnt.h>
#include <winerror.h>
diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c
index a4e241e..d4435ff 100644
--- a/dlls/serialui/confdlg.c
+++ b/dlls/serialui/confdlg.c
@@ -32,8 +32,10 @@
#include "wine/port.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "wingdi.h"
diff --git a/dlls/serialui/serialui_rc.rc b/dlls/serialui/serialui_rc.rc
index f5d350f..44bbd7c 100644
--- a/dlls/serialui/serialui_rc.rc
+++ b/dlls/serialui/serialui_rc.rc
@@ -17,6 +17,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "serialui.h"
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 2304112..924b1ef 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -18,9 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
diff --git a/dlls/setupapi/devinst16.c b/dlls/setupapi/devinst16.c
index 147bb3f..84484fa 100644
--- a/dlls/setupapi/devinst16.c
+++ b/dlls/setupapi/devinst16.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "setupx16.h"
diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c
index 336812e..7728f89 100644
--- a/dlls/setupapi/dirid.c
+++ b/dlls/setupapi/dirid.c
@@ -18,10 +18,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "wine/unicode.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 66d6b3c..dd3abfa 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -25,11 +25,16 @@
* (IpSaveRestorePosition, IpFindNextMatchLine, ...).
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "setupx16.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index f6cf600..b7374b2 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -18,10 +18,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "wine/unicode.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c
index 22397ad..1437af8 100644
--- a/dlls/setupapi/parser.c
+++ b/dlls/setupapi/parser.c
@@ -23,14 +23,19 @@
#include <assert.h>
#include <limits.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
-#include "winternl.h"
#include "winbase.h"
+#include "winreg.h"
+#include "winternl.h"
#include "winerror.h"
#include "wine/unicode.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "setupx16.h"
#include "wine/debug.h"
diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c
index df85f51..5106b42 100644
--- a/dlls/setupapi/queue.c
+++ b/dlls/setupapi/queue.c
@@ -18,10 +18,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "wine/unicode.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/setupapi.rc b/dlls/setupapi/setupapi.rc
index a3a94cf..d03ca3d 100644
--- a/dlls/setupapi/setupapi.rc
+++ b/dlls/setupapi/setupapi.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index f49e594..e967ee7 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -23,8 +23,14 @@
*
*/
+#include <stdarg.h>
#include "string.h"
#include "stdlib.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "setupapi_private.h"
#include "fdi.h"
diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c
index 4daa621..fdbf666 100644
--- a/dlls/setupapi/setupx_main.c
+++ b/dlls/setupapi/setupx_main.c
@@ -56,12 +56,18 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
#include "wine/winuser16.h"
#include "wownt32.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
#include "setupx16.h"
#include "setupapi_private.h"
diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c
index f7b7b06..625788b 100644
--- a/dlls/setupapi/stubs.c
+++ b/dlls/setupapi/stubs.c
@@ -18,8 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/debug.h"
#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "setupapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index 3a31e44..5bb4e97 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -21,11 +21,15 @@
* This is bad ! We ought to have 16bit resource handling working.
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
#include "wownt32.h"
+#include "wingdi.h"
+#include "winnls.h"
#include "setupapi.h"
#include "setupx16.h"
#include "setupapi_private.h"
diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c
index 6070b74..54e627b 100644
--- a/dlls/shdocvw/classinfo.c
+++ b/dlls/shdocvw/classinfo.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "shdocvw.h"
#include "wine/debug.h"
diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c
index a54f632..2ca24db 100644
--- a/dlls/shdocvw/regsvr.c
+++ b/dlls/shdocvw/regsvr.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index c20df24..6c5d07d 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -23,8 +23,11 @@
#define COM_NO_WINDOWS_H
/* FIXME: Is there a better way to deal with all these includes? */
-#include "wingdi.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "ole2.h"
diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c
index a3dddc7..4c81be1 100644
--- a/dlls/shdocvw/shdocvw_main.c
+++ b/dlls/shdocvw/shdocvw_main.c
@@ -19,7 +19,10 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "initguid.h"
#include "ole2.h"
diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c
index 4c5f20f..faf6a26 100644
--- a/dlls/shell32/changenotify.c
+++ b/dlls/shell32/changenotify.c
@@ -21,6 +21,8 @@
#include <string.h>
#include "wine/debug.h"
+#include "windef.h"
+#include "wingdi.h"
#include "pidl.h"
#include "shell32_main.h"
#include "undocshell.h"
diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 64b00a3..0ac39b1 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -24,10 +24,15 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "wine/debug.h"
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c
index 4ab2e99..7194824 100644
--- a/dlls/shell32/clipboard.c
+++ b/dlls/shell32/clipboard.c
@@ -35,9 +35,13 @@
*
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
#include "pidl.h"
#include "undocshell.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index c4c299c..db27b5d 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -18,10 +18,12 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c
index b6dc7da..b4ab270 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -23,6 +23,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "wingdi.h"
#include "pidl.h"
#include "winerror.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c
index 6ff3bac..baacf7b 100644
--- a/dlls/shell32/debughlp.c
+++ b/dlls/shell32/debughlp.c
@@ -22,6 +22,8 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include "windef.h"
+#include "wingdi.h"
#include "pidl.h"
#include "shlguid.h"
#include "wine/debug.h"
diff --git a/dlls/shell32/debughlp.h b/dlls/shell32/debughlp.h
index d5c72c3..87166e3 100644
--- a/dlls/shell32/debughlp.h
+++ b/dlls/shell32/debughlp.h
@@ -21,7 +21,11 @@
#ifndef __WINE_SHELL32_DEBUGHLP_H
#define __WINE_SHELL32_DEBUGHLP_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "shlobj.h"
extern void pdump (LPCITEMIDLIST pidl);
diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 501e823..cb8146d 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -22,9 +22,14 @@
#include "wine/port.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "commdlg.h"
#include "wine/debug.h"
diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c
index 308f487..68c3621 100644
--- a/dlls/shell32/dragdrophelper.c
+++ b/dlls/shell32/dragdrophelper.c
@@ -22,14 +22,18 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "objbase.h"
#include "ole2.h"
#include "shlguid.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "wine/debug.h"
diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c
index d2acc4b..283a5dc 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -18,9 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "undocshell.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index db527e8..6f12b12 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -18,10 +18,12 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "objbase.h"
#include "undocshell.h"
#include "shlguid.h"
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index 2ae0676..8ef9488 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -20,13 +20,14 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
@@ -36,6 +37,7 @@
#include "wine/debug.h"
#include "shellapi.h"
+#include "objbase.h"
#include "shlguid.h"
#include "pidl.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index 0bcd5f8..93f9d7a 100644
--- a/dlls/shell32/memorystream.c
+++ b/dlls/shell32/memorystream.c
@@ -26,10 +26,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "wine/debug.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 96a7626..26bf730 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -26,10 +26,13 @@
#include "wine/port.h"
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "objbase.h"
#include "shlguid.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h
index b963382..d28f8f0 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -34,6 +34,11 @@
#ifndef __WINE_PIDL_H
#define __WINE_PIDL_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
#include "shlobj.h"
/*
diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c
index a023a06..c8599a6 100644
--- a/dlls/shell32/regsvr.c
+++ b/dlls/shell32/regsvr.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index c2b8dc0..376a985 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -31,11 +32,14 @@
#include <ctype.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "wownt32.h"
#include "dlgs.h"
#include "shellapi.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "shlwapi.h"
#include "ddeml.h"
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index bfdff49..e13205e 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -23,13 +23,17 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "dlgs.h"
#include "shellapi.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "shlguid.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index a5be854..77b6a96 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -22,6 +22,13 @@
#ifndef __WINE_SHELL_MAIN_H
#define __WINE_SHELL_MAIN_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "docobj.h"
#include "undocshell.h"
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index 140a58c..8c8901e 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -21,7 +21,11 @@
#ifndef __WINE_SHELLFOLDER_HELP_H
#define __WINE_SHELLFOLDER_HELP_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
+#include "winuser.h"
#include "shlobj.h"
diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c
index ddd1c4b..25a39a5 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -22,6 +22,7 @@
#include <ctype.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -34,10 +35,13 @@
#include "wine/debug.h"
#include "wine/port.h"
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "undocshell.h"
diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 8a14f4c..a743871 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -21,10 +21,15 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "shellapi.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shlguid.h"
#include "winreg.h"
@@ -36,7 +41,6 @@
#include "wine/debug.h"
#include "shlwapi.h"
-#include "winuser.h"
#include "debughlp.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 68908d2..b137cdf 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -22,14 +22,20 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "winerror.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "wine/debug.h"
#include "winnls.h"
#include "shellapi.h"
+#include "objbase.h"
#include "shlguid.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shell32_main.h"
#include "undocshell.h"
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index f6976f3..fa3b276 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <ctype.h>
#include "wine/debug.h"
@@ -33,6 +34,8 @@
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/shellreg.c b/dlls/shell32/shellreg.c
index ed4b5e3..51e9fa5 100644
--- a/dlls/shell32/shellreg.c
+++ b/dlls/shell32/shellreg.c
@@ -21,9 +21,14 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
+#include "winbase.h"
#include "shellapi.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "winerror.h"
#include "winreg.h"
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index ad7b2f4..d48f707 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -17,15 +17,19 @@
*/
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winerror.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "winreg.h"
#include "shlobj.h"
diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c
index 0459d65..5fbd311 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -25,13 +25,16 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
#include "ole2.h"
#include "shlguid.h"
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 820ee17..e15f869 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -25,13 +25,16 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
#include "ole2.h"
#include "shlguid.h"
diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c
index 5bdf9ce..157c488 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -25,14 +25,17 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
#include "pidl.h"
#include "shlguid.h"
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index 55eae28..b490b78 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -32,11 +33,14 @@
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "wownt32.h"
#include "heap.h"
#include "shellapi.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shlwapi.h"
#include "ddeml.h"
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 75bed82..52f78ed 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -24,11 +24,16 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <ctype.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "shellapi.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shresdef.h"
#define NO_SHLWAPI_STREAM
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 7616e67..7506598 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -27,11 +27,14 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
#include "ole2.h"
#include "shlguid.h"
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 2f47d00..a8cb6d4 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -18,9 +18,14 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "undocshell.h"
#include "shlwapi.h"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index c2af179..1b2586f 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -39,6 +39,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
@@ -48,6 +49,8 @@
#include "winnls.h"
#include "servprov.h"
#include "shlguid.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "undocshell.h"
#include "shresdef.h"
diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c
index e9818fa..6e36fa1 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -29,10 +29,12 @@
* Up to date as of SHELL32 v5.00 (W2K)
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index 984f629..81ba94b 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -19,8 +19,10 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "shresdef.h"
diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c
index 926d784..f024093 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -24,6 +24,8 @@
#define NONAMELESSSTRUCT
#include "wine/debug.h"
+#include "windef.h"
+#include "wingdi.h"
#include "pidl.h"
#include "shlguid.h"
#include "shlobj.h"
diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index d83b76c..593727d 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -25,6 +25,8 @@
#include "winerror.h"
#include "wine/debug.h"
+#include "windef.h"
+#include "wingdi.h"
#include "pidl.h"
#include "shlguid.h"
#include "undocshell.h"
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 1b76ea5..55a4b11 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -27,11 +27,15 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "shellapi.h"
#include "shell32_main.h"
diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c
index a7c46b5..837bd46 100644
--- a/dlls/shell32/tests/generated.c
+++ b/dlls/shell32/tests/generated.c
@@ -14,8 +14,11 @@
#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
#include "wtypes.h"
#include "shellapi.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "wine/test.h"
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 03f1f5c..6bb5d27 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index 595b95b..079c9fa 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -19,7 +19,13 @@
#ifndef __WINE_UNDOCSHELL_H
#define __WINE_UNDOCSHELL_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "shlobj.h"
diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 6991fb8..3871bee 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -17,10 +17,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winreg.h"
+#include "objbase.h"
#include "shlguid.h"
#include "shlwapi.h"
#include "wine/debug.h"
diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c
index 2332659..ea7d9fc 100644
--- a/dlls/shlwapi/clist.c
+++ b/dlls/shlwapi/clist.c
@@ -17,8 +17,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "wine/debug.h"
diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c
index da2b1c6..c92d8d1 100644
--- a/dlls/shlwapi/istream.c
+++ b/dlls/shlwapi/istream.c
@@ -17,10 +17,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index e192644..7b7ac6e 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -24,6 +24,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -37,13 +38,13 @@
#include "docobj.h"
#include "exdisp.h"
#include "shlguid.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "olectl.h"
#include "shellapi.h"
#include "commdlg.h"
#include "wine/unicode.h"
#include "servprov.h"
-#include "wingdi.h"
#include "winreg.h"
#include "winuser.h"
#include "wine/debug.h"
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c
index 78a9fe6..a0b7f9d 100644
--- a/dlls/shlwapi/path.c
+++ b/dlls/shlwapi/path.c
@@ -22,10 +22,12 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "wine/unicode.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c
index 7bf6009..8565da7 100644
--- a/dlls/shlwapi/reg.c
+++ b/dlls/shlwapi/reg.c
@@ -19,7 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winreg.h"
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 29e8ef2..e5d6ef8 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -19,9 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "winreg.h"
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index 2e890e5..5d68bb7 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -19,6 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 00c493b..210dd92 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -24,15 +24,19 @@
#include "wine/port.h"
#include <math.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#define NO_SHLWAPI_REG
#define NO_SHLWAPI_STREAM
#include "shlwapi.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "shlobj.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c
index fdca7ca..9617b55 100644
--- a/dlls/shlwapi/tests/clist.c
+++ b/dlls/shlwapi/tests/clist.c
@@ -17,7 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "objbase.h"
diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c
index 1593bfc..6997e64 100644
--- a/dlls/shlwapi/tests/generated.c
+++ b/dlls/shlwapi/tests/generated.c
@@ -11,8 +11,12 @@
#define WINE_NOWINSOCK
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wtypes.h"
+#include "winreg.h"
#include "shlwapi.h"
#include "wine/test.h"
diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index 73d950e..e33f854 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -19,9 +19,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/unicode.h"
#include "winreg.h"
diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c
index 09c3e73..0f03083 100644
--- a/dlls/shlwapi/tests/shreg.c
+++ b/dlls/shlwapi/tests/shreg.c
@@ -19,9 +19,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c
index 98a3dfd..8ad525f 100644
--- a/dlls/shlwapi/thread.c
+++ b/dlls/shlwapi/thread.c
@@ -18,6 +18,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index c3e7a3d..183ba85 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
diff --git a/dlls/shlwapi/wsprintf.c b/dlls/shlwapi/wsprintf.c
index 0c9d05b..1c477bd 100644
--- a/dlls/shlwapi/wsprintf.c
+++ b/dlls/shlwapi/wsprintf.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c
index bf20c2d..f768ddd 100644
--- a/dlls/snmpapi/main.c
+++ b/dlls/snmpapi/main.c
@@ -20,6 +20,9 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c
index 8486ee5..f49eb02 100644
--- a/dlls/sti/sti_main.c
+++ b/dlls/sti/sti_main.c
@@ -16,6 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/dlls/tapi32/assisted.c b/dlls/tapi32/assisted.c
index 817b5eb..e24ac79 100644
--- a/dlls/tapi32/assisted.c
+++ b/dlls/tapi32/assisted.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winbase.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "tapi.h"
#include "wine/debug.h"
diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c
index 2b6b415..f97b65b 100644
--- a/dlls/tapi32/line.c
+++ b/dlls/tapi32/line.c
@@ -20,9 +20,10 @@
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winerror.h"
#include "tapi.h"
diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c
index ab8063b..58cf728 100644
--- a/dlls/tapi32/phone.c
+++ b/dlls/tapi32/phone.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "winbase.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "tapi.h"
#include "wine/debug.h"
diff --git a/dlls/ttydrv/graphics.c b/dlls/ttydrv/graphics.c
index f94e615..d035243 100644
--- a/dlls/ttydrv/graphics.c
+++ b/dlls/ttydrv/graphics.c
@@ -20,6 +20,9 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "gdi.h"
diff --git a/dlls/ttydrv/ttydrv.h b/dlls/ttydrv/ttydrv.h
index dcf7ee0..7248c8e 100644
--- a/dlls/ttydrv/ttydrv.h
+++ b/dlls/ttydrv/ttydrv.h
@@ -33,8 +33,10 @@
# include <curses.h>
#endif
#endif
+#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/ttydrv/ttydrv_main.c b/dlls/ttydrv/ttydrv_main.c
index 6800ba1..317ba04 100644
--- a/dlls/ttydrv/ttydrv_main.c
+++ b/dlls/ttydrv/ttydrv_main.c
@@ -20,8 +20,10 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/debug.h"
diff --git a/dlls/ttydrv/user.c b/dlls/ttydrv/user.c
index f778bc9..9c9afdb 100644
--- a/dlls/ttydrv/user.c
+++ b/dlls/ttydrv/user.c
@@ -20,6 +20,10 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "dinput.h"
#include "gdi.h"
#include "ttydrv.h"
diff --git a/dlls/twain/twain.h b/dlls/twain/twain.h
index ccc5e75..317b2e7 100644
--- a/dlls/twain/twain.h
+++ b/dlls/twain/twain.h
@@ -52,7 +52,10 @@
#ifndef TWAIN
#define TWAIN
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#undef FAR
#define FAR
diff --git a/dlls/twain/twain_i.h b/dlls/twain/twain_i.h
index 4a2d0c0..118f557 100644
--- a/dlls/twain/twain_i.h
+++ b/dlls/twain/twain_i.h
@@ -22,8 +22,11 @@
#ifdef HAVE_SANE
# include <sane/sane.h>
#endif
-#include "twain.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
+#include "twain.h"
/* internel information about an active data source */
typedef struct tagActiveDS
diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c
index 56e24b7..2602537 100644
--- a/dlls/urlmon/tests/generated.c
+++ b/dlls/urlmon/tests/generated.c
@@ -11,7 +11,10 @@
#define WINE_NOWINSOCK
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "urlmon.h"
#include "wine/test.h"
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index c0e6ac2..2ccd56e 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -20,12 +20,14 @@
*/
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include <stdio.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "winuser.h"
#include "objbase.h"
diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c
index 8f88361..d4803cf 100644
--- a/dlls/urlmon/urlmon_main.c
+++ b/dlls/urlmon/urlmon_main.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wtypes.h"
diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h
index d34597e..be39cef 100644
--- a/dlls/urlmon/urlmon_main.h
+++ b/dlls/urlmon/urlmon_main.h
@@ -19,7 +19,10 @@
#ifndef __WINE_URLMON_MAIN_H
#define __WINE_URLMON_MAIN_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
extern HINSTANCE URLMON_hInstance;
diff --git a/dlls/user/bidi16.c b/dlls/user/bidi16.c
index f5da3ba..a33b03a 100644
--- a/dlls/user/bidi16.c
+++ b/dlls/user/bidi16.c
@@ -19,7 +19,9 @@
* NOTE: Right now, most of these functions do nothing.
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
diff --git a/dlls/user/cache.c b/dlls/user/cache.c
index 774c816..fb34f80 100644
--- a/dlls/user/cache.c
+++ b/dlls/user/cache.c
@@ -19,7 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "user.h"
diff --git a/dlls/user/caret.c b/dlls/user/caret.c
index f16de2b..63c68b3 100644
--- a/dlls/user/caret.c
+++ b/dlls/user/caret.c
@@ -21,6 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c
index 864fb65..f22245c 100644
--- a/dlls/user/comm16.c
+++ b/dlls/user/comm16.c
@@ -53,11 +53,13 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/user/dde/client.c b/dlls/user/dde/client.c
index ee104bb..6ea0856 100644
--- a/dlls/user/dde/client.c
+++ b/dlls/user/dde/client.c
@@ -24,9 +24,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/user/dde/ddeml16.c b/dlls/user/dde/ddeml16.c
index 3af4461..3dd7d8e 100644
--- a/dlls/user/dde/ddeml16.c
+++ b/dlls/user/dde/ddeml16.c
@@ -22,9 +22,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/user/dde/misc.c b/dlls/user/dde/misc.c
index 83689ec..b6b57ea 100644
--- a/dlls/user/dde/misc.c
+++ b/dlls/user/dde/misc.c
@@ -28,9 +28,10 @@
#include "wine/port.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/user/dde/server.c b/dlls/user/dde/server.c
index 9f9851a..d0c30e0 100644
--- a/dlls/user/dde/server.c
+++ b/dlls/user/dde/server.c
@@ -24,9 +24,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/user/dialog16.c b/dlls/user/dialog16.c
index e58fde4..04a4cf6 100644
--- a/dlls/user/dialog16.c
+++ b/dlls/user/dialog16.c
@@ -21,7 +21,10 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wownt32.h"
#include "wine/winuser16.h"
#include "controls.h"
diff --git a/dlls/user/display.c b/dlls/user/display.c
index 49bff97..da8eb33 100644
--- a/dlls/user/display.c
+++ b/dlls/user/display.c
@@ -18,8 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/debug.h"
#include "windef.h"
+#include "winbase.h"
#include "user.h"
#include "wine/winuser16.h"
diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c
index 6d81250..f30db6d 100644
--- a/dlls/user/exticon.c
+++ b/dlls/user/exticon.c
@@ -24,6 +24,7 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h> /* abs() */
#include <sys/types.h>
@@ -33,8 +34,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/user/focus.c b/dlls/user/focus.c
index 46e446b..f91367a 100644
--- a/dlls/user/focus.c
+++ b/dlls/user/focus.c
@@ -20,6 +20,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/user/hook.c b/dlls/user/hook.c
index af36229..cbd0e84 100644
--- a/dlls/user/hook.c
+++ b/dlls/user/hook.c
@@ -61,6 +61,8 @@
* WH_MOUSE_LL Implemented but should use SendMessage instead
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/user/hook16.c b/dlls/user/hook16.c
index 75d5a7d..33db82a 100644
--- a/dlls/user/hook16.c
+++ b/dlls/user/hook16.c
@@ -21,6 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c
index da02a14..69bb91b 100644
--- a/dlls/user/lstr.c
+++ b/dlls/user/lstr.c
@@ -28,8 +28,10 @@
#include <stdio.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
+#include "ntstatus.h"
#include "wine/exception.h"
#include "wine/unicode.h"
diff --git a/dlls/user/message.c b/dlls/user/message.c
index be0e90a..43d1dbb 100644
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
@@ -22,7 +22,10 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/user/message.h b/dlls/user/message.h
index dc776ae..6098388 100644
--- a/dlls/user/message.h
+++ b/dlls/user/message.h
@@ -21,7 +21,10 @@
#ifndef __WINE_MESSAGE_H
#define __WINE_MESSAGE_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
struct received_message_info;
diff --git a/dlls/user/misc.c b/dlls/user/misc.c
index 0fee348..bec20ff 100644
--- a/dlls/user/misc.c
+++ b/dlls/user/misc.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/user/mouse.c b/dlls/user/mouse.c
index 7d5b3c5..66dfb2b 100644
--- a/dlls/user/mouse.c
+++ b/dlls/user/mouse.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
diff --git a/dlls/user/network.c b/dlls/user/network.c
index 9185418..21f79f5 100644
--- a/dlls/user/network.c
+++ b/dlls/user/network.c
@@ -21,12 +21,14 @@
#include "config.h"
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wine/winnet16.h"
#include "winnetwk.h"
diff --git a/dlls/user/painting.c b/dlls/user/painting.c
index 46ab96c..f22f642 100644
--- a/dlls/user/painting.c
+++ b/dlls/user/painting.c
@@ -18,9 +18,11 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/server.h"
diff --git a/dlls/user/property.c b/dlls/user/property.c
index 469a24b..971d506 100644
--- a/dlls/user/property.c
+++ b/dlls/user/property.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
#include "wine/winuser16.h"
diff --git a/dlls/user/resource.c b/dlls/user/resource.c
index 56b5c7a..28630b0 100644
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/user/resources/user32.rc b/dlls/user/resources/user32.rc
index 245f6f6..060239b 100644
--- a/dlls/user/resources/user32.rc
+++ b/dlls/user/resources/user32.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "dlgs.h"
diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c
index 012fdc2..33508b2 100644
--- a/dlls/user/tests/class.c
+++ b/dlls/user/tests/class.c
@@ -19,9 +19,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "wingdi.h"
diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c
index e19f66a..ba421f2 100644
--- a/dlls/user/tests/sysparams.c
+++ b/dlls/user/tests/sysparams.c
@@ -19,9 +19,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winuser.h"
diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c
index de24550..6aa3b8c 100644
--- a/dlls/user/tests/win.c
+++ b/dlls/user/tests/win.c
@@ -21,6 +21,7 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
diff --git a/dlls/user/tests/wsprintf.c b/dlls/user/tests/wsprintf.c
index 744b753..b1f8c8f 100644
--- a/dlls/user/tests/wsprintf.c
+++ b/dlls/user/tests/wsprintf.c
@@ -17,7 +17,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/user/text.c b/dlls/user/text.c
index 2a9ffe3..30c784d 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -27,14 +27,15 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/unicode.h"
-#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
#include "wownt32.h"
diff --git a/dlls/user/user16.c b/dlls/user/user16.c
index 9a84728..5adcb06 100644
--- a/dlls/user/user16.c
+++ b/dlls/user/user16.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "wine/winuser16.h"
+#include "windef.h"
#include "winbase.h"
#include "wownt32.h"
#include "task.h"
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index 7d5583d..89953c5 100644
--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/user/winproc.h b/dlls/user/winproc.h
index 18e135c..9085df9 100644
--- a/dlls/user/winproc.h
+++ b/dlls/user/winproc.h
@@ -21,7 +21,10 @@
#ifndef __WINE_WINPROC_H
#define __WINE_WINPROC_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "winnls.h"
diff --git a/dlls/user/wsprintf.c b/dlls/user/wsprintf.c
index a822d7f..0a4ee46 100644
--- a/dlls/user/wsprintf.c
+++ b/dlls/user/wsprintf.c
@@ -26,6 +26,7 @@
#include <string.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/version/info.c b/dlls/version/info.c
index b8289d5..4730225 100644
--- a/dlls/version/info.c
+++ b/dlls/version/info.c
@@ -20,9 +20,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winver.h"
#include "wine/winuser16.h"
diff --git a/dlls/version/install.c b/dlls/version/install.c
index 7cc8232..847caa0 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -20,6 +20,7 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index e6db345..cf35d5b 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@ -31,6 +32,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "lzexpand.h"
diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c
index 9243d92..ab9ff3d 100644
--- a/dlls/version/ver16.c
+++ b/dlls/version/ver16.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "winver.h"
diff --git a/dlls/win32s/w32skernel.c b/dlls/win32s/w32skernel.c
index db2ba1f..13fe443 100644
--- a/dlls/win32s/w32skernel.c
+++ b/dlls/win32s/w32skernel.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/windef16.h"
#include "thread.h"
diff --git a/dlls/win32s/w32sys.c b/dlls/win32s/w32sys.c
index 5cc429c..17bad8b 100644
--- a/dlls/win32s/w32sys.c
+++ b/dlls/win32s/w32sys.c
@@ -21,11 +21,13 @@
#include "config.h"
+#include <stdarg.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
#include "wine/winbase16.h"
#include "wine/debug.h"
diff --git a/dlls/win32s/win32s16.c b/dlls/win32s/win32s16.c
index 2d084d9..23f80d4 100644
--- a/dlls/win32s/win32s16.c
+++ b/dlls/win32s/win32s16.c
@@ -19,9 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/debug.h"
diff --git a/dlls/winaspi/aspi.h b/dlls/winaspi/aspi.h
index 4761b39..006b691 100644
--- a/dlls/winaspi/aspi.h
+++ b/dlls/winaspi/aspi.h
@@ -20,7 +20,10 @@
#ifndef __WINE_ASPI_H
#define __WINE_ASPI_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "pshpack1.h"
#ifdef __cplusplus
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 200748d..f091b66 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -28,8 +28,10 @@
# include <unistd.h>
#endif
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/windef16.h"
#include "winreg.h"
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index c6c9d80..ab5cef8 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -21,6 +21,7 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#include <errno.h>
@@ -30,6 +31,7 @@
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "aspi.h"
#include "wnaspi32.h"
diff --git a/dlls/winedos/dma.c b/dlls/winedos/dma.c
index e02954c..ca9e88f 100644
--- a/dlls/winedos/dma.c
+++ b/dlls/winedos/dma.c
@@ -20,7 +20,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "dosexe.h"
#include "wine/debug.h"
diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c
index 88ab4c6..87a1e00 100644
--- a/dlls/winedos/dosaspi.c
+++ b/dlls/winedos/dosaspi.c
@@ -18,7 +18,9 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/windef16.h"
#include "wine/winaspi.h"
diff --git a/dlls/winedos/dosconf.c b/dlls/winedos/dosconf.c
index 8b05777..aa27432 100644
--- a/dlls/winedos/dosconf.c
+++ b/dlls/winedos/dosconf.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -29,6 +30,7 @@
#include <stdlib.h>
#include <ctype.h>
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/winedos/dosexe.h b/dlls/winedos/dosexe.h
index f0027ef..e2c5f07 100644
--- a/dlls/winedos/dosexe.h
+++ b/dlls/winedos/dosexe.h
@@ -21,8 +21,11 @@
#ifndef __WINE_DOSEXE_H
#define __WINE_DOSEXE_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "wine/windef16.h"
-#include "winbase.h" /* for LPSTARTUPINFO32A */
+#include "winbase.h"
#include "winnt.h" /* for PCONTEXT */
#include "wincon.h" /* for MOUSE_EVENT_RECORD */
#include "miscemu.h"
diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c
index 4a7f7f5..6f0ebfe 100644
--- a/dlls/winedos/dosvm.c
+++ b/dlls/winedos/dosvm.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c
index 9bf0c12..e9a6b64 100644
--- a/dlls/winedos/int09.c
+++ b/dlls/winedos/int09.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/winedos/int11.c b/dlls/winedos/int11.c
index 4c3b09c..b6dd6b7 100644
--- a/dlls/winedos/int11.c
+++ b/dlls/winedos/int11.c
@@ -21,11 +21,13 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "miscemu.h"
#include "msdos.h"
diff --git a/dlls/winedos/int17.c b/dlls/winedos/int17.c
index 4be7b50..8c7728f 100644
--- a/dlls/winedos/int17.c
+++ b/dlls/winedos/int17.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "miscemu.h"
#include "wine/debug.h"
#include "msdos.h"
diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c
index 3055c5c..470f397 100644
--- a/dlls/winedos/int21.c
+++ b/dlls/winedos/int21.c
@@ -25,8 +25,11 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
#include "dosexe.h"
diff --git a/dlls/winedos/int29.c b/dlls/winedos/int29.c
index 2167c8b..62e32b4 100644
--- a/dlls/winedos/int29.c
+++ b/dlls/winedos/int29.c
@@ -20,7 +20,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "miscemu.h"
#include "dosexe.h"
diff --git a/dlls/winedos/int2f.c b/dlls/winedos/int2f.c
index 6a598ea..7807a8e 100644
--- a/dlls/winedos/int2f.c
+++ b/dlls/winedos/int2f.c
@@ -30,6 +30,7 @@
#include "wine/winbase16.h"
#include "miscemu.h"
#include "wine/debug.h"
+#include "ntstatus.h"
#include "winioctl.h"
#include "ntddstor.h"
#include "ntddcdrm.h"
diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c
index 91af7b6..c03add7 100644
--- a/dlls/winedos/int31.c
+++ b/dlls/winedos/int31.c
@@ -21,7 +21,10 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wownt32.h"
#include "miscemu.h"
diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c
index 5526453..7f0a868 100644
--- a/dlls/winedos/int33.c
+++ b/dlls/winedos/int33.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/winedos/ioports.c b/dlls/winedos/ioports.c
index 9d899be..98be490 100644
--- a/dlls/winedos/ioports.c
+++ b/dlls/winedos/ioports.c
@@ -21,7 +21,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "dosexe.h"
#include "vga.h"
#include "wine/debug.h"
diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c
index f7dc102..b55db39 100644
--- a/dlls/winedos/module.c
+++ b/dlls/winedos/module.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -37,6 +38,7 @@
# include <sys/time.h>
#endif
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c
index 9488109..db94bb2 100644
--- a/dlls/winedos/soundblaster.c
+++ b/dlls/winedos/soundblaster.c
@@ -20,9 +20,14 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "dosexe.h"
#include "wine/debug.h"
+#include "wingdi.h"
+#include "mmsystem.h"
#include "dsound.h"
WINE_DEFAULT_DEBUG_CHANNEL(sblaster);
diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c
index f54c427..dfa5fcf 100644
--- a/dlls/winedos/vga.c
+++ b/dlls/winedos/vga.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h
index 2cddec8..fb3b7d3 100644
--- a/dlls/winedos/vga.h
+++ b/dlls/winedos/vga.h
@@ -21,6 +21,9 @@
#ifndef __WINE_VGA_H
#define __WINE_VGA_H
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c
index e4f91fc..6fa723b 100644
--- a/dlls/winedos/vxd.c
+++ b/dlls/winedos/vxd.c
@@ -23,6 +23,7 @@
#include <fcntl.h>
#include <memory.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -31,11 +32,13 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wingdi.h"
#include "winuser.h"
+#include "ntstatus.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "msdos.h"
diff --git a/dlls/winedos/xms.c b/dlls/winedos/xms.c
index 701c6ee..3cf6a45 100644
--- a/dlls/winedos/xms.c
+++ b/dlls/winedos/xms.c
@@ -25,7 +25,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "miscemu.h"
diff --git a/dlls/wineps/builtin.c b/dlls/wineps/builtin.c
index 02baa66..ab1168a 100644
--- a/dlls/wineps/builtin.c
+++ b/dlls/wineps/builtin.c
@@ -17,10 +17,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/dlls/wineps/download.c b/dlls/wineps/download.c
index 3d8f19b..c4ce963 100644
--- a/dlls/wineps/download.c
+++ b/dlls/wineps/download.c
@@ -20,8 +20,10 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/dlls/wineps/escape.c b/dlls/wineps/escape.c
index 1c9bd77..d2afb4c 100644
--- a/dlls/wineps/escape.c
+++ b/dlls/wineps/escape.c
@@ -17,7 +17,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
#include "wine/winuser16.h"
diff --git a/dlls/wineps/font.c b/dlls/wineps/font.c
index d99b6f0..7be86c4 100644
--- a/dlls/wineps/font.c
+++ b/dlls/wineps/font.c
@@ -17,10 +17,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <assert.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winspool.h"
diff --git a/dlls/wineps/ppd.c b/dlls/wineps/ppd.c
index b51de5c..445ba54 100644
--- a/dlls/wineps/ppd.c
+++ b/dlls/wineps/ppd.c
@@ -20,9 +20,11 @@
*/
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
-#include "windef.h" /* HEAP_ZERO_MEMORY */
+#include "windef.h"
+#include "winbase.h"
#include "wine/debug.h"
#include "psdrv.h"
#include "winspool.h"
diff --git a/dlls/wineps/psdrv.h b/dlls/wineps/psdrv.h
index 077bc75..b6909b3 100644
--- a/dlls/wineps/psdrv.h
+++ b/dlls/wineps/psdrv.h
@@ -21,7 +21,10 @@
#ifndef __WINE_PSDRV_H
#define __WINE_PSDRV_H
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
#include "winspool.h"
diff --git a/dlls/wineps/rsrc.rc b/dlls/wineps/rsrc.rc
index a74870d..d2e3732 100644
--- a/dlls/wineps/rsrc.rc
+++ b/dlls/wineps/rsrc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "psdlg.h"
diff --git a/dlls/wineps/truetype.c b/dlls/wineps/truetype.c
index 573c7ee..31797b2 100644
--- a/dlls/wineps/truetype.c
+++ b/dlls/wineps/truetype.c
@@ -58,10 +58,12 @@
#include <sys/types.h>
#include <dirent.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <errno.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "psdrv.h"
diff --git a/dlls/wineps/type1.c b/dlls/wineps/type1.c
index 8aa68c4..0a4eef8 100644
--- a/dlls/wineps/type1.c
+++ b/dlls/wineps/type1.c
@@ -19,9 +19,11 @@
*/
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/dlls/wineps/type1afm.c b/dlls/wineps/type1afm.c
index df8a608..119cf17 100644
--- a/dlls/wineps/type1afm.c
+++ b/dlls/wineps/type1afm.c
@@ -29,6 +29,7 @@
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <dirent.h>
#include <errno.h>
@@ -40,6 +41,7 @@
#endif
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
#include "psdrv.h"
diff --git a/dlls/wineps/type42.c b/dlls/wineps/type42.c
index afca1df..a55863b 100644
--- a/dlls/wineps/type42.c
+++ b/dlls/wineps/type42.c
@@ -19,9 +19,11 @@
*/
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c
index 82eb536..87e3f40 100644
--- a/dlls/wininet/cookie.c
+++ b/dlls/wininet/cookie.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c
index d6a1707..a806782 100644
--- a/dlls/wininet/dialogs.c
+++ b/dlls/wininet/dialogs.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 21171d5..2986fc5 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -28,6 +28,7 @@
#include "wine/port.h"
#include <errno.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -40,12 +41,14 @@
#endif
#include <time.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wininet.h"
#include "winnls.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/debug.h"
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 9d0a90b..e18b020 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -30,6 +30,7 @@
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 26dcf86..d196669 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -30,6 +30,7 @@
#define MAXHOSTNAME 100 /* from http.c */
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_SYS_SOCKET_H
@@ -44,6 +45,7 @@
# include <unistd.h>
#endif
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c
index 3accfa4..dfe7759 100644
--- a/dlls/wininet/netconnection.c
+++ b/dlls/wininet/netconnection.c
@@ -35,6 +35,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/wininet/rsrc.rc b/dlls/wininet/rsrc.rc
index 84fccd7..8254b42 100644
--- a/dlls/wininet/rsrc.rc
+++ b/dlls/wininet/rsrc.rc
@@ -19,6 +19,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 74ab536..059e360 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -1,3 +1,4 @@
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index c20a86c..597147b 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -25,6 +25,7 @@
#define COM_NO_WINDOWS_H
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -38,6 +39,7 @@
#include "internet.h"
#include "winreg.h"
#include "shlwapi.h"
+#include "wingdi.h"
#include "shlobj.h"
#include "wine/debug.h"
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index d554593..793ea12 100644
--- a/dlls/wininet/utility.c
+++ b/dlls/wininet/utility.c
@@ -24,6 +24,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
diff --git a/dlls/wininet/wininet_main.c b/dlls/wininet/wininet_main.c
index 4a46427..b499078 100644
--- a/dlls/wininet/wininet_main.c
+++ b/dlls/wininet/wininet_main.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index 3bedb45..e493e10 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -26,6 +26,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -34,8 +35,9 @@
#include <sys/ioctl.h>
#endif
-#include "mmsystem.h"
+#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c
index 286044e..df45b39 100644
--- a/dlls/winmm/joystick/joystick.c
+++ b/dlls/winmm/joystick/joystick.c
@@ -37,6 +37,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index e2d65f1..5f2cee3 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -21,8 +21,11 @@
*/
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winver.h"
#include "winemm.h"
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 79cdaa3..7f90f38 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -24,13 +24,15 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include "mmsystem.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
+#include "mmsystem.h"
#include "winuser.h"
#include "winnls.h"
diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c
index 0426e90..3bc6c02 100644
--- a/dlls/winmm/mcianim/mcianim.c
+++ b/dlls/winmm/mcianim/mcianim.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/winmm/mciavi/mciavi_res.rc b/dlls/winmm/mciavi/mciavi_res.rc
index 7d4911a..14fe2e0 100644
--- a/dlls/winmm/mciavi/mciavi_res.rc
+++ b/dlls/winmm/mciavi/mciavi_res.rc
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
+#include "winbase.h"
#include "mmddk.h"
MCIAVI RCDATA
diff --git a/dlls/winmm/mciavi/private_mciavi.h b/dlls/winmm/mciavi/private_mciavi.h
index a4bdf4b..4bd1cc9 100644
--- a/dlls/winmm/mciavi/private_mciavi.h
+++ b/dlls/winmm/mciavi/private_mciavi.h
@@ -24,6 +24,7 @@
#define __WINE_PRIVATE_MCIAVI_H
#define COM_NO_WINDOWS_H
+#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index ba541c8..2c983f3 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -22,6 +22,7 @@
*/
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -29,6 +30,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
+#include "ntstatus.h"
#include "wownt32.h"
#include "mmddk.h"
#include "winioctl.h"
diff --git a/dlls/winmm/mciseq/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c
index e410f82..a586773 100644
--- a/dlls/winmm/mciseq/mcimidi.c
+++ b/dlls/winmm/mciseq/mcimidi.c
@@ -30,6 +30,7 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c
index 470cc3d..4ac572e 100644
--- a/dlls/winmm/mciwave/mciwave.c
+++ b/dlls/winmm/mciwave/mciwave.c
@@ -21,6 +21,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "winerror.h"
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c
index 08282de..17b5330 100644
--- a/dlls/winmm/message16.c
+++ b/dlls/winmm/message16.c
@@ -21,9 +21,12 @@
*/
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
#include "wine/winbase16.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "winver.h"
#include "wownt32.h"
diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c
index 3107335..67446c2 100644
--- a/dlls/winmm/midimap/midimap.c
+++ b/dlls/winmm/midimap/midimap.c
@@ -23,6 +23,7 @@
* IDF file loading
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index b835d26..9ab2125 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -30,13 +30,15 @@
#include <ctype.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
-#include "mmsystem.h"
#include "windef.h"
+#include "winbase.h"
+#include "mmsystem.h"
#include "heap.h"
#include "winemm.h"
diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c
index df465f7..5bd2fb0 100644
--- a/dlls/winmm/mmsystem.c
+++ b/dlls/winmm/mmsystem.c
@@ -26,12 +26,16 @@
* 99/4 added mmTask and mmThread functions support
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "mmsystem.h"
+#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
+#include "winreg.h"
+#include "ntstatus.h"
#include "winternl.h"
#include "wownt32.h"
diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index e898c08..6854c65 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -21,10 +21,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
-#include "mmsystem.h"
+#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
#include "wingdi.h"
#include "winuser.h"
#include "winreg.h"
diff --git a/dlls/winmm/sound16.c b/dlls/winmm/sound16.c
index bf1755c..46306d8 100644
--- a/dlls/winmm/sound16.c
+++ b/dlls/winmm/sound16.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wine/windef16.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 70e716a..38385b2 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -18,11 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "mmsystem.h"
diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c
index d9e1a89..85c06f8 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <time.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
@@ -31,9 +32,9 @@
# include <unistd.h>
#endif
-#include "mmsystem.h"
#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
#include "winemm.h"
diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c
index 76db664..6d53e49 100644
--- a/dlls/winmm/wavemap/wavemap.c
+++ b/dlls/winmm/wavemap/wavemap.c
@@ -28,12 +28,14 @@
* those should be taken care of...
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "mmddk.h"
+#include "mmreg.h"
#include "msacm.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/winealsa/alsa.c b/dlls/winmm/winealsa/alsa.c
index 91df60e..083f398 100644
--- a/dlls/winmm/winealsa/alsa.c
+++ b/dlls/winmm/winealsa/alsa.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c
index ed3ff75..de7dce0 100644
--- a/dlls/winmm/winealsa/audio.c
+++ b/dlls/winmm/winealsa/audio.c
@@ -25,6 +25,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -39,8 +40,8 @@
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "winuser.h"
diff --git a/dlls/winmm/winealsa/audio_05.c b/dlls/winmm/winealsa/audio_05.c
index e385911..df0f812 100644
--- a/dlls/winmm/winealsa/audio_05.c
+++ b/dlls/winmm/winealsa/audio_05.c
@@ -24,6 +24,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -37,8 +38,8 @@
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "winuser.h"
diff --git a/dlls/winmm/winearts/arts.c b/dlls/winmm/winearts/arts.c
index a6625c0..3e9d868 100644
--- a/dlls/winmm/winearts/arts.c
+++ b/dlls/winmm/winearts/arts.c
@@ -23,6 +23,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c
index 0ee3ac2..2f9a255 100644
--- a/dlls/winmm/winearts/audio.c
+++ b/dlls/winmm/winearts/audio.c
@@ -41,6 +41,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -48,6 +49,7 @@
#endif
#include <fcntl.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c
index b046eab..fa97c87 100644
--- a/dlls/winmm/wineaudioio/audio.c
+++ b/dlls/winmm/wineaudioio/audio.c
@@ -40,6 +40,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -57,6 +58,7 @@
#include <libaudioio.h>
#endif
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/dlls/winmm/wineaudioio/audioio.c b/dlls/winmm/wineaudioio/audioio.c
index b52bb75..1b2bfe8 100644
--- a/dlls/winmm/wineaudioio/audioio.c
+++ b/dlls/winmm/wineaudioio/audioio.c
@@ -22,6 +22,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c
index a687db6..9488f59 100644
--- a/dlls/winmm/winejack/audio.c
+++ b/dlls/winmm/winejack/audio.c
@@ -38,6 +38,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -45,6 +46,7 @@
#endif
#include <fcntl.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c
index 5e62fa7..5ec4b12 100644
--- a/dlls/winmm/winejack/jack.c
+++ b/dlls/winmm/winejack/jack.c
@@ -23,6 +23,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 9a6739d..ed288cd 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -22,6 +22,10 @@
*****************************************************************************
*/
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
#include "mmddk.h"
#include "wine/mmsystem16.h"
#include "wownt32.h"
diff --git a/dlls/winmm/winenas/audio.c b/dlls/winmm/winenas/audio.c
index 29370b3..303d5e6 100644
--- a/dlls/winmm/winenas/audio.c
+++ b/dlls/winmm/winenas/audio.c
@@ -37,6 +37,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -72,6 +73,7 @@
#undef BYTE
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/dlls/winmm/winenas/nas.c b/dlls/winmm/winenas/nas.c
index afce103..8709e6b 100644
--- a/dlls/winmm/winenas/nas.c
+++ b/dlls/winmm/winenas/nas.c
@@ -26,6 +26,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 057f464..fb56fab 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -40,6 +40,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -58,6 +59,7 @@
#endif
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 53e3fb4..b90215e 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -29,6 +29,7 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 685e8a6..39584ed 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -24,6 +24,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -39,6 +40,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "mmddk.h"
#include "oss.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c
index 4d2f9f2..a22784d 100644
--- a/dlls/winmm/wineoss/mmaux.c
+++ b/dlls/winmm/wineoss/mmaux.c
@@ -23,6 +23,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
@@ -34,6 +35,7 @@
#endif
#include "windef.h"
+#include "winbase.h"
#include "mmddk.h"
#include "oss.h"
#include "wine/debug.h"
diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c
index 78e6ebd..ba63632 100644
--- a/dlls/winmm/wineoss/oss.c
+++ b/dlls/winmm/wineoss/oss.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 9dacf9b..3d514dd 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -28,13 +28,16 @@
* 99/9 added support for loadable low level drivers
*/
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
-#include "mmsystem.h"
+#include "windef.h"
#include "winbase.h"
+#include "mmsystem.h"
#include "winuser.h"
+#include "winreg.h"
#include "heap.h"
#include "winternl.h"
#include "winemm.h"
diff --git a/dlls/winmm/winmm_res.rc b/dlls/winmm/winmm_res.rc
index 54e8345..546e1de 100644
--- a/dlls/winmm/winmm_res.rc
+++ b/dlls/winmm/winmm_res.rc
@@ -22,6 +22,8 @@
* MMSYSTEM...)
*/
+#include "windef.h"
+#include "winbase.h"
#include "mmddk.h"
#include "winnls.h"
diff --git a/dlls/winnls/winnls.c b/dlls/winnls/winnls.c
index fd64024..97a584c 100644
--- a/dlls/winnls/winnls.c
+++ b/dlls/winnls/winnls.c
@@ -16,7 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wine/winuser16.h"
/***********************************************************************
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 33b43d8..b58e2cc 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -36,6 +36,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <sys/types.h>
#ifdef HAVE_SYS_IPC_H
@@ -98,6 +99,8 @@
#endif
#include "wine/winbase16.h"
+#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winsock2.h"
diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c
index 8f27573..e59bd73 100644
--- a/dlls/winsock/socket.c
+++ b/dlls/winsock/socket.c
@@ -26,6 +26,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -113,6 +114,8 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "wine/winbase16.h"
+#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c
index aed3107..2696457 100644
--- a/dlls/winsock/tests/sock.c
+++ b/dlls/winsock/tests/sock.c
@@ -18,10 +18,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
#include <winsock2.h>
#include <mswsock.h>
#include "wine/test.h"
-#include <winbase.h>
#include <winnt.h>
#include <winerror.h>
diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c
index e7a7df7..733e6ba 100644
--- a/dlls/winspool/info.c
+++ b/dlls/winspool/info.c
@@ -25,6 +25,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -40,6 +41,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "wine/library.h"
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "winerror.h"
diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c
index 17b0c06..ed17586 100644
--- a/dlls/winspool/tests/info.c
+++ b/dlls/winspool/tests/info.c
@@ -16,7 +16,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "wine/test.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/dlls/winspool/wspool.c b/dlls/winspool/wspool.c
index 1db2854..f6cdb9c 100644
--- a/dlls/winspool/wspool.c
+++ b/dlls/winspool/wspool.c
@@ -21,6 +21,9 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winspool.h"
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c
index f4fc167..9071837 100644
--- a/dlls/wintab32/context.c
+++ b/dlls/wintab32/context.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/wintab32/manager.c b/dlls/wintab32/manager.c
index af1644c..b82c859 100644
--- a/dlls/wintab32/manager.c
+++ b/dlls/wintab32/manager.c
@@ -20,6 +20,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
diff --git a/dlls/wintab32/wintab16.c b/dlls/wintab32/wintab16.c
index 68e7af7..cc7dfc5 100644
--- a/dlls/wintab32/wintab16.c
+++ b/dlls/wintab32/wintab16.c
@@ -20,7 +20,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wintab.h"
diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c
index 9271b18..4fb3f10 100644
--- a/dlls/wintrust/wintrust_main.c
+++ b/dlls/wintrust/wintrust_main.c
@@ -18,7 +18,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "guiddef.h"
diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c
index d1f4abb..95f899c 100644
--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -25,6 +25,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
@@ -42,6 +43,7 @@
#include <netdb.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "wtypes.h"
diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c
index 496d560..2b72d61 100644
--- a/dlls/wsock32/service.c
+++ b/dlls/wsock32/service.c
@@ -20,6 +20,9 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winsock2.h"
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index 58294f2..58e80f8 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -21,6 +21,8 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wine/debug.h"
diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c
index b358e57..55847b5 100644
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
@@ -63,6 +63,7 @@
#include "config.h"
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
@@ -72,6 +73,8 @@
#include <time.h>
#include "ts_xlib.h"
+#include "windef.h"
+#include "winbase.h"
#include "winreg.h"
#include "clipboard.h"
#include "win.h"
diff --git a/dlls/x11drv/dga2.h b/dlls/x11drv/dga2.h
index 983bd0c..1357ba0 100644
--- a/dlls/x11drv/dga2.h
+++ b/dlls/x11drv/dga2.h
@@ -25,6 +25,10 @@
#endif
#ifdef HAVE_LIBXXF86DGA2
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddrawi.h"
extern LPDDHALMODEINFO xf86dga2_modes;
diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c
index 29d9aa7..e3480e4 100644
--- a/dlls/x11drv/event.c
+++ b/dlls/x11drv/event.c
@@ -33,14 +33,18 @@
#endif
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include "wine/winuser16.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "wingdi.h"
#include "shlobj.h" /* DROPFILES */
#include "clipboard.h"
#include "win.h"
#include "winpos.h"
-#include "windef.h"
#include "winreg.h"
#include "x11drv.h"
#include "shellapi.h"
diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c
index 38e3dcc..eb61dbe 100644
--- a/dlls/x11drv/keyboard.c
+++ b/dlls/x11drv/keyboard.c
@@ -36,11 +36,13 @@
#endif
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winnls.h"
diff --git a/dlls/x11drv/mouse.c b/dlls/x11drv/mouse.c
index 6b6c914..8976fcb 100644
--- a/dlls/x11drv/mouse.c
+++ b/dlls/x11drv/mouse.c
@@ -24,10 +24,12 @@
#ifdef HAVE_LIBXXF86DGA2
#include <X11/extensions/xf86dga.h>
#endif
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "wine/winuser16.h"
#include "x11drv.h"
diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c
index 3319567..dea4b2c 100644
--- a/dlls/x11drv/scroll.c
+++ b/dlls/x11drv/scroll.c
@@ -22,8 +22,11 @@
#include "config.h"
+#include <stdarg.h>
+
#include "ts_xlib.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c
index fc83708..b25b525 100644
--- a/dlls/x11drv/window.c
+++ b/dlls/x11drv/window.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -31,6 +32,7 @@
#include <X11/Xresource.h>
#include <X11/Xutil.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index a9777bb..42330d7 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -26,7 +26,9 @@
#include <X11/IntrinsicP.h>
#include <X11/extensions/shape.h>
#endif /* HAVE_LIBXSHAPE */
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/dlls/x11drv/x11ddraw.h b/dlls/x11drv/x11ddraw.h
index cb173f4..4322048 100644
--- a/dlls/x11drv/x11ddraw.h
+++ b/dlls/x11drv/x11ddraw.h
@@ -24,6 +24,11 @@
# error You must include config.h to use this header
#endif
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddrawi.h"
extern LPDDRAWI_DDRAWSURFACE_LCL X11DRV_DD_Primary;
diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h
index c0d95cc..ab11d8b 100644
--- a/dlls/x11drv/x11drv.h
+++ b/dlls/x11drv/x11drv.h
@@ -26,6 +26,7 @@
# error You must include config.h to use this header
#endif
+#include <stdarg.h>
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c
index 117e983..7528569 100644
--- a/dlls/x11drv/x11drv_main.c
+++ b/dlls/x11drv/x11drv_main.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -37,6 +38,7 @@
#include <X11/XKBlib.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "winreg.h"
diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c
index 781edc7..05bbe2b 100644
--- a/dlls/x11drv/xrender.c
+++ b/dlls/x11drv/xrender.c
@@ -24,10 +24,12 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wownt32.h"
#include "x11drv.h"
#include "bitmap.h"
diff --git a/dlls/x11drv/xvidmode.h b/dlls/x11drv/xvidmode.h
index b3b01b8..2113cc4 100644
--- a/dlls/x11drv/xvidmode.h
+++ b/dlls/x11drv/xvidmode.h
@@ -25,6 +25,10 @@
#endif
#ifdef HAVE_LIBXXF86VM
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "ddrawi.h"
extern LPDDHALMODEINFO xf86vm_modes;
diff --git a/files/directory.c b/files/directory.c
index 6c2e211..adfef2e 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -22,6 +22,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -34,12 +35,14 @@
#include <sys/errno.h>
#endif
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
-#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "drive.h"
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 8a23b32..cd7adff 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -29,6 +29,7 @@
#include <sys/errno.h>
#endif
#include <fcntl.h>
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include <sys/stat.h>
@@ -42,7 +43,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "wingdi.h"
diff --git a/files/drive.c b/files/drive.c
index 1b30044..acbc93d 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -29,6 +29,7 @@
#include <assert.h>
#include <ctype.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
@@ -56,7 +57,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h" /* for GetCurrentTask */
#include "winerror.h"
diff --git a/files/file.c b/files/file.c
index 3d2ad8b..875a64d 100644
--- a/files/file.c
+++ b/files/file.c
@@ -31,6 +31,7 @@
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_ERRNO_H
@@ -58,8 +59,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
#include "wine/server.h"
diff --git a/files/smb.c b/files/smb.c
index ee7ed18..734b16e 100644
--- a/files/smb.c
+++ b/files/smb.c
@@ -60,6 +60,7 @@
#include <ctype.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -103,6 +104,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "winerror.h"
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
diff --git a/graphics/dispdib.c b/graphics/dispdib.c
index 8036f36..98f61ae 100644
--- a/graphics/dispdib.c
+++ b/graphics/dispdib.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
#include "dispdib.h"
diff --git a/graphics/escape.c b/graphics/escape.c
index bb77e75..a269a17 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
#include "wine/debug.h"
diff --git a/graphics/fontengine.c b/graphics/fontengine.c
index 31d572b..e0f3bb1 100644
--- a/graphics/fontengine.c
+++ b/graphics/fontengine.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <math.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/wingdi16.h"
#include "wine/debug.h"
diff --git a/graphics/painting.c b/graphics/painting.c
index b251dac..a7c37c2 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -23,10 +23,12 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "gdi.h"
diff --git a/graphics/path.c b/graphics/path.c
index 8460bcb..c96e098 100644
--- a/graphics/path.c
+++ b/graphics/path.c
@@ -24,11 +24,13 @@
#include <assert.h>
#include <math.h>
+#include <stdarg.h>
#include <string.h>
#if defined(HAVE_FLOAT_H)
#include <float.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
diff --git a/graphics/x11drv/bitblt.c b/graphics/x11drv/bitblt.c
index e81d184..4dff6b0 100644
--- a/graphics/x11drv/bitblt.c
+++ b/graphics/x11drv/bitblt.c
@@ -25,8 +25,10 @@
#include "ts_xlib.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
diff --git a/graphics/x11drv/codepage.c b/graphics/x11drv/codepage.c
index 554bb47..f93b105 100644
--- a/graphics/x11drv/codepage.c
+++ b/graphics/x11drv/codepage.c
@@ -23,6 +23,7 @@
#include "ts_xlib.h"
#include <math.h>
+#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c
index c90e716..281251e 100644
--- a/graphics/x11drv/dib.c
+++ b/graphics/x11drv/dib.c
@@ -31,9 +31,11 @@
# endif
#endif /* defined(HAVE_LIBXXSHM) */
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "bitmap.h"
#include "x11drv.h"
#include "wine/debug.h"
diff --git a/graphics/x11drv/init.c b/graphics/x11drv/init.c
index c8a2d60..0b1816f 100644
--- a/graphics/x11drv/init.c
+++ b/graphics/x11drv/init.c
@@ -22,9 +22,11 @@
#include "ts_xlib.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "bitmap.h"
#include "x11drv.h"
#include "x11font.h"
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index 490810a..2179917 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -24,6 +24,7 @@
#include "ts_xlib.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <math.h>
diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 6ad2204..2f3d50d 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -29,6 +29,7 @@
#include "ts_xlib.h"
#include <ctype.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/include/async.h b/include/async.h
index cb1e67c..5225185 100644
--- a/include/async.h
+++ b/include/async.h
@@ -27,6 +27,7 @@
#define __WINE_ASYNC_H
#include <thread.h>
+#include <ntstatus.h>
#include <wine/server.h>
#include <winternl.h>
diff --git a/include/callback.h b/include/callback.h
index 9d57be5..cb39f02 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -21,7 +21,9 @@
#ifndef __WINE_CALLBACK_H
#define __WINE_CALLBACK_H
+#include <stdarg.h>
#include <windef.h>
+#include <winbase.h>
#include <winnt.h>
typedef struct {
diff --git a/include/commctrl.h b/include/commctrl.h
index 8ae5717..bcecc9a 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -21,11 +21,6 @@
#ifndef __WINE_COMMCTRL_H
#define __WINE_COMMCTRL_H
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
#include <prsht.h>
#ifdef __cplusplus
diff --git a/include/control.h b/include/control.h
index 96b9404..01cf987 100644
--- a/include/control.h
+++ b/include/control.h
@@ -19,11 +19,6 @@
#ifndef __CONTROL_INCLUDED__
#define __CONTROL_INCLUDED__
-#include <windef.h>
-#include <wingdi.h>
-#include <objbase.h>
-#include <oleauto.h>
-
typedef struct IMediaControl IMediaControl;
typedef struct IBasicAudio IBasicAudio;
typedef struct IBasicVideo IBasicVideo;
diff --git a/include/d3d.h b/include/d3d.h
index b7443fb..a5418bb 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -19,7 +19,8 @@
#ifndef __WINE_D3D_H
#define __WINE_D3D_H
-#include <ddraw.h>
+#include <stdlib.h>
+#include <objbase.h>
#include <d3dtypes.h> /* must precede d3dcaps.h */
#include <d3dcaps.h>
diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index 509b5df..6670e71 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -32,7 +32,6 @@
#define D3DVALP(val, prec) ((float)(val))
#define D3DVAL(val) ((float)(val))
-typedef float D3DVALUE,*LPD3DVALUE;
#define D3DDivide(a, b) (float)((double) (a) / (double) (b))
#define D3DMultiply(a, b) ((a) * (b))
@@ -77,53 +76,16 @@
typedef HRESULT (CALLBACK *LPD3DENUMTEXTUREFORMATSCALLBACK)(LPDDSURFACEDESC lpDdsd, LPVOID lpContext);
typedef HRESULT (CALLBACK *LPD3DENUMPIXELFORMATSCALLBACK)(LPDDPIXELFORMAT lpDDPixFmt, LPVOID lpContext);
+#ifndef DX_SHARED_DEFINES
+
+typedef float D3DVALUE,*LPD3DVALUE;
+
#ifndef D3DCOLOR_DEFINED
typedef DWORD D3DCOLOR, *LPD3DCOLOR;
#define D3DCOLOR_DEFINED
#endif
-typedef DWORD D3DMATERIALHANDLE, *LPD3DMATERIALHANDLE;
-typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE;
-typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE;
-
-typedef struct _D3DCOLORVALUE {
- union {
- D3DVALUE r;
- D3DVALUE dvR;
- } DUMMYUNIONNAME1;
- union {
- D3DVALUE g;
- D3DVALUE dvG;
- } DUMMYUNIONNAME2;
- union {
- D3DVALUE b;
- D3DVALUE dvB;
- } DUMMYUNIONNAME3;
- union {
- D3DVALUE a;
- D3DVALUE dvA;
- } DUMMYUNIONNAME4;
-} D3DCOLORVALUE,*LPD3DCOLORVALUE;
-
-typedef struct _D3DRECT {
- union {
- LONG x1;
- LONG lX1;
- } DUMMYUNIONNAME1;
- union {
- LONG y1;
- LONG lY1;
- } DUMMYUNIONNAME2;
- union {
- LONG x2;
- LONG lX2;
- } DUMMYUNIONNAME3;
- union {
- LONG y2;
- LONG lY2;
- } DUMMYUNIONNAME4;
-} D3DRECT, *LPD3DRECT;
-
+#ifndef D3DVECTOR_DEFINED
typedef struct _D3DVECTOR {
union {
D3DVALUE x;
@@ -175,6 +137,53 @@
friend _D3DVECTOR CrossProduct(const _D3DVECTOR& v1, const _D3DVECTOR& v2);
#endif
} D3DVECTOR,*LPD3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
+
+#define DX_SHARED_DEFINES
+#endif /* DX_SHARED_DEFINES */
+
+typedef DWORD D3DMATERIALHANDLE, *LPD3DMATERIALHANDLE;
+typedef DWORD D3DTEXTUREHANDLE, *LPD3DTEXTUREHANDLE;
+typedef DWORD D3DMATRIXHANDLE, *LPD3DMATRIXHANDLE;
+
+typedef struct _D3DCOLORVALUE {
+ union {
+ D3DVALUE r;
+ D3DVALUE dvR;
+ } DUMMYUNIONNAME1;
+ union {
+ D3DVALUE g;
+ D3DVALUE dvG;
+ } DUMMYUNIONNAME2;
+ union {
+ D3DVALUE b;
+ D3DVALUE dvB;
+ } DUMMYUNIONNAME3;
+ union {
+ D3DVALUE a;
+ D3DVALUE dvA;
+ } DUMMYUNIONNAME4;
+} D3DCOLORVALUE,*LPD3DCOLORVALUE;
+
+typedef struct _D3DRECT {
+ union {
+ LONG x1;
+ LONG lX1;
+ } DUMMYUNIONNAME1;
+ union {
+ LONG y1;
+ LONG lY1;
+ } DUMMYUNIONNAME2;
+ union {
+ LONG x2;
+ LONG lX2;
+ } DUMMYUNIONNAME3;
+ union {
+ LONG y2;
+ LONG lY2;
+ } DUMMYUNIONNAME4;
+} D3DRECT, *LPD3DRECT;
typedef struct _D3DHVERTEX {
DWORD dwFlags;
diff --git a/include/ddeml.h b/include/ddeml.h
index ab463dc..b198f31 100644
--- a/include/ddeml.h
+++ b/include/ddeml.h
@@ -22,8 +22,6 @@
#ifndef __WINE_DDEML_H
#define __WINE_DDEML_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/ddraw.h b/include/ddraw.h
index 4bee9e0..159c4f6 100644
--- a/include/ddraw.h
+++ b/include/ddraw.h
@@ -19,8 +19,6 @@
#ifndef __WINE_DDRAW_H
#define __WINE_DDRAW_H
-#include <windef.h> /* LARGE_INTEGER ... */
-#include <wingdi.h> /* PALETTE stuff ... */
#include <objbase.h>
#ifdef __cplusplus
diff --git a/include/devenum.idl b/include/devenum.idl
index 5022a78..cdfe231 100644
--- a/include/devenum.idl
+++ b/include/devenum.idl
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-import "guiddef.h";
import "oaidl.idl";
cpp_quote("#define CDEF_CLASS_DEFAULT 0x0001")
diff --git a/include/dinput.h b/include/dinput.h
index e056b4f..468b5d2 100644
--- a/include/dinput.h
+++ b/include/dinput.h
@@ -19,7 +19,6 @@
#ifndef __WINE_DINPUT_H
#define __WINE_DINPUT_H
-#include <windef.h> /* for MAX_PATH */
#include <objbase.h>
#ifndef DIRECTINPUT_VERSION
diff --git a/include/dsconf.h b/include/dsconf.h
index 5467f2f..48f9978 100644
--- a/include/dsconf.h
+++ b/include/dsconf.h
@@ -19,8 +19,6 @@
#ifndef __WINE_DSCONF_H
#define __WINE_DSCONF_H
-#include <dsound.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/dsound.h b/include/dsound.h
index 8a4036c..96da76f 100644
--- a/include/dsound.h
+++ b/include/dsound.h
@@ -23,13 +23,35 @@
#define DIRECTSOUND_VERSION 0x0800
#endif
-#include <mmsystem.h>
-#include <d3dtypes.h>
+#define COM_NO_WINDOWS_H
+#include <objbase.h>
+#include <float.h>
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
+#ifndef DX_SHARED_DEFINES
+
+typedef float D3DVALUE, *LPD3DVALUE;
+
+#ifndef D3DCOLOR_DEFINED
+typedef DWORD D3DCOLOR, *LPD3DCOLOR;
+#define D3DCOLOR_DEFINED
+#endif
+
+#ifndef D3DVECTOR_DEFINED
+typedef struct _D3DVECTOR {
+ float x;
+ float y;
+ float z;
+} D3DVECTOR, *LPD3DVECTOR;
+#define D3DVECTOR_DEFINED
+#endif
+
+#define DX_SHARED_DEFINES
+#endif /* DX_SHARED_DEFINES */
+
/*****************************************************************************
* Predeclare the interfaces
*/
diff --git a/include/file.h b/include/file.h
index ea63023..a8ccb9d 100644
--- a/include/file.h
+++ b/include/file.h
@@ -21,13 +21,16 @@
#ifndef __WINE_FILE_H
#define __WINE_FILE_H
+#include <stdarg.h>
#include <time.h> /* time_t */
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/types.h>
+#include <windef.h>
#include <winbase.h>
#include <wine/windef16.h> /* HFILE16 */
+#include <winreg.h>
#include <winternl.h>
#define MAX_PATHNAME_LEN 1024
diff --git a/include/gdi.h b/include/gdi.h
index 850b4a5..85e41b1 100644
--- a/include/gdi.h
+++ b/include/gdi.h
@@ -21,7 +21,9 @@
#ifndef __WINE_GDI_H
#define __WINE_GDI_H
+#include <stdarg.h>
#include <windef.h>
+#include <winbase.h>
#include <wingdi.h>
#include <wine/wingdi16.h>
#include <math.h>
diff --git a/include/heap.h b/include/heap.h
index 16d0fd1..e3bf4fb 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -21,8 +21,10 @@
#ifndef __WINE_HEAP_H
#define __WINE_HEAP_H
+#include <stdarg.h>
#include <string.h>
+#include <windef.h>
#include <winbase.h>
#include <winnls.h>
diff --git a/include/icmpapi.h b/include/icmpapi.h
index ad375eb..6b36f05 100644
--- a/include/icmpapi.h
+++ b/include/icmpapi.h
@@ -21,8 +21,6 @@
#ifndef __WINE_ICMPAPI_H
#define __WINE_ICMPAPI_H
-#include <windef.h>
-
HANDLE WINAPI IcmpCreateFile(
VOID
);
diff --git a/include/imagehlp.h b/include/imagehlp.h
index 84e8078..2206cd0 100644
--- a/include/imagehlp.h
+++ b/include/imagehlp.h
@@ -21,9 +21,6 @@
#ifndef __WINE_IMAGEHLP_H
#define __WINE_IMAGEHLP_H
-#include <windef.h>
-#include <winbase.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/imm.h b/include/imm.h
index 52097d6..8a70575 100644
--- a/include/imm.h
+++ b/include/imm.h
@@ -21,8 +21,6 @@
#ifndef __WINE_IMM_H
#define __WINE_IMM_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/lzexpand.h b/include/lzexpand.h
index cb73eed..03a43c1 100644
--- a/include/lzexpand.h
+++ b/include/lzexpand.h
@@ -20,8 +20,6 @@
#ifndef __WINE_LZEXPAND_H
#define __WINE_LZEXPAND_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/mapidefs.h b/include/mapidefs.h
index 6d02393..55f6040 100644
--- a/include/mapidefs.h
+++ b/include/mapidefs.h
@@ -19,7 +19,6 @@
#ifndef __WINE_MAPIDEFS_H
#define __WINE_MAPIDEFS_H
-#include <windef.h>
#include <windows.h>
#include <winerror.h>
#ifndef _OBJBASE_H_
diff --git a/include/mmreg.h b/include/mmreg.h
index 265f52a..cb96b6b 100644
--- a/include/mmreg.h
+++ b/include/mmreg.h
@@ -28,8 +28,6 @@
#ifndef _ACM_WAVEFILTER
#define _ACM_WAVEFILTER
-#include <windef.h>
-
#define WAVE_FILTER_UNKNOWN 0x0000
#define WAVE_FILTER_DEVELOPMENT 0xFFFF
diff --git a/include/mmsystem.h b/include/mmsystem.h
index cd0c6d6..d74a230 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -21,8 +21,6 @@
#ifndef __WINE_MMSYSTEM_H
#define __WINE_MMSYSTEM_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/module.h b/include/module.h
index 6ee79bb..8ed7258 100644
--- a/include/module.h
+++ b/include/module.h
@@ -21,8 +21,10 @@
#ifndef __WINE_MODULE_H
#define __WINE_MODULE_H
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
+#include <winreg.h>
#include <wine/windef16.h>
#include <wine/winbase16.h>
#include <winternl.h>
diff --git a/include/msacm.h b/include/msacm.h
index 0412f9c..8e9c85b 100644
--- a/include/msacm.h
+++ b/include/msacm.h
@@ -21,10 +21,6 @@
#ifndef __WINE_MSACM_H
#define __WINE_MSACM_H
-#include <windef.h>
-#include <mmsystem.h>
-#include <mmreg.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/ntsecapi.h b/include/ntsecapi.h
index 2bb7a39..09adf8c 100644
--- a/include/ntsecapi.h
+++ b/include/ntsecapi.h
@@ -19,8 +19,6 @@
#ifndef __WINE_NTSECAPI_H
#define __WINE_NTSECAPI_H
-#include <winnt.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/ole2.h b/include/ole2.h
index 25572a5..7e19fef 100644
--- a/include/ole2.h
+++ b/include/ole2.h
@@ -21,7 +21,6 @@
#ifndef __WINE_OLE2_H
#define __WINE_OLE2_H
-#include <windef.h>
#include <winerror.h>
#include <objbase.h>
#include <oleauto.h>
diff --git a/include/oleauto.h b/include/oleauto.h
index 1857b95..76872cd 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -19,7 +19,6 @@
#ifndef __WINE_OLEAUTO_H
#define __WINE_OLEAUTO_H
-#include <winbase.h>
#include <oaidl.h>
#ifdef __cplusplus
diff --git a/include/olectl.h b/include/olectl.h
index dc20107..7a9927c 100644
--- a/include/olectl.h
+++ b/include/olectl.h
@@ -19,7 +19,6 @@
#ifndef __WINE_OLECTL_H
#define __WINE_OLECTL_H
-#include <windef.h>
#include <ocidl.h>
#ifdef __cplusplus
diff --git a/include/oledlg.h b/include/oledlg.h
index 62cf4b8..175d892 100644
--- a/include/oledlg.h
+++ b/include/oledlg.h
@@ -23,7 +23,6 @@
#include <commdlg.h>
#include <prsht.h>
-#include <windef.h>
#include <ole2.h>
#ifdef __cplusplus
diff --git a/include/prsht.h b/include/prsht.h
index 942b09d..519f6e1 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -19,10 +19,6 @@
#ifndef __WINE_PRSHT_H
#define __WINE_PRSHT_H
-#include <windef.h>
-#include <wingdi.h>
-#include <winuser.h>
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/psapi.h b/include/psapi.h
index 4df75e6..0a1ecc5 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -21,8 +21,6 @@
#ifndef __WINE_PSAPI_H
#define __WINE_PSAPI_H
-#include <windef.h>
-
typedef struct _MODULEINFO {
LPVOID lpBaseOfDll;
DWORD SizeOfImage;
diff --git a/include/ras.h b/include/ras.h
index 789acc0..b589e3e 100644
--- a/include/ras.h
+++ b/include/ras.h
@@ -19,7 +19,6 @@
#ifndef __WINE_RAS_H
#define __WINE_RAS_H
-#include <windef.h>
#include <lmcons.h>
#ifdef __cplusplus
diff --git a/include/rpc.h b/include/rpc.h
index db2efa7..2d7379c 100644
--- a/include/rpc.h
+++ b/include/rpc.h
@@ -35,6 +35,8 @@
#define __RPC_WIN32__
#endif
+#include <basetsd.h>
+
#define __RPC_FAR
#define __RPC_API WINAPI
#define __RPC_USER WINAPI
@@ -48,7 +50,6 @@
#include <rpcdce.h>
/* #include <rpcnsi.h> */
#include <rpcnterr.h>
-#include <excpt.h>
#include <winerror.h>
/* ignore exception handling for now */
diff --git a/include/rpcdce.h b/include/rpcdce.h
index c550d83..3caf8bc 100644
--- a/include/rpcdce.h
+++ b/include/rpcdce.h
@@ -19,23 +19,6 @@
#ifndef __WINE_RPCDCE_H
#define __WINE_RPCDCE_H
-#include <windef.h>
-
-/* avoid delving into windows.h ifndef __WINESRC__; this
- would pull in rpcndr.h, which needs rpcdcep.h, which
- needs us, in turn, causing a compile failure */
-#ifndef RPC_NO_WINDOWS_H
-#define __NO_HAD_RPC_NO_WINDOWS_H
-#define RPC_NO_WINDOWS_H
-#endif
-
-#include <rpc.h>
-
-#ifdef __NO_HAD_RPC_NO_WINDOWS_H
-#undef RPC_NO_WINDOWS_H
-#undef __NO_HAD_RPC_NO_WINDOWS_H
-#endif
-
#ifndef GUID_DEFINED
#include <guiddef.h>
#endif
diff --git a/include/rpcdcep.h b/include/rpcdcep.h
index b9c5f58..cbea950 100644
--- a/include/rpcdcep.h
+++ b/include/rpcdcep.h
@@ -19,8 +19,6 @@
#ifndef __WINE_RPCDCEP_H
#define __WINE_RPCDCEP_H
-#include <rpcdce.h>
-
typedef struct _RPC_VERSION {
unsigned short MajorVersion;
unsigned short MinorVersion;
diff --git a/include/rpcndr.h b/include/rpcndr.h
index f55c365..254cd8e 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -25,7 +25,6 @@
#define __WINE_RPCNDR_H
#include <basetsd.h>
-#include <rpcdcep.h>
/* stupid #if can't handle casts... this __stupidity
is just a workaround for that limitation */
diff --git a/include/rpcproxy.h b/include/rpcproxy.h
index 18aff4b..8e5a9c1 100644
--- a/include/rpcproxy.h
+++ b/include/rpcproxy.h
@@ -26,7 +26,6 @@
#include <basetsd.h>
#include <guiddef.h>
-#include <winnt.h>
#include <rpc.h>
#include <rpcndr.h>
diff --git a/include/shellapi.h b/include/shellapi.h
index 86afc6a..ed4208a 100644
--- a/include/shellapi.h
+++ b/include/shellapi.h
@@ -19,8 +19,6 @@
#ifndef __WINE_SHELLAPI_H
#define __WINE_SHELLAPI_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/shlguid.h b/include/shlguid.h
index 76d9472..bc29ebd 100644
--- a/include/shlguid.h
+++ b/include/shlguid.h
@@ -19,8 +19,6 @@
#ifndef __WINE_SHLGUID_H
#define __WINE_SHLGUID_H
-#include <objbase.h>
-
#define DEFINE_SHLGUID(name, l, w1, w2) DEFINE_OLEGUID(name,l,w1,w2)
DEFINE_SHLGUID(CLSID_ShellDesktop, 0x00021400L, 0, 0);
diff --git a/include/shlobj.h b/include/shlobj.h
index 44e3067..ddf5c2b 100644
--- a/include/shlobj.h
+++ b/include/shlobj.h
@@ -19,10 +19,7 @@
#ifndef __WINE_SHLOBJ_H
#define __WINE_SHLOBJ_H
-#include <windef.h>
-#include <winbase.h> /* WIN32_FIND_* */
#include <ole2.h>
-#include <oleauto.h>
#include <commctrl.h>
#include <prsht.h>
#include <shlguid.h>
diff --git a/include/strmif.h b/include/strmif.h
index 8cb686b..1b0fb6d 100644
--- a/include/strmif.h
+++ b/include/strmif.h
@@ -8,7 +8,6 @@
extern "C" {
#endif
#include <objidl.h>
-#include <guiddef.h>
#include <oaidl.h>
#define CDEF_CLASS_DEFAULT 0x0001
#define CDEF_BYPASS_CLASS_MANAGER 0x0002
diff --git a/include/syslevel.h b/include/syslevel.h
index 0e540d4..5e4fc20 100644
--- a/include/syslevel.h
+++ b/include/syslevel.h
@@ -21,6 +21,7 @@
#ifndef __WINE_SYSLEVEL_H
#define __WINE_SYSLEVEL_H
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
diff --git a/include/tapi.h b/include/tapi.h
index 6ee134c..aaae1b3 100644
--- a/include/tapi.h
+++ b/include/tapi.h
@@ -21,8 +21,6 @@
#ifndef __WINE_TAPI_H
#define __WINE_TAPI_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/tchar.h b/include/tchar.h
index 1e5cdb4..e673d4e 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -23,8 +23,6 @@
#error Wine should not include tchar.h internally
#endif
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/include/thread.h b/include/thread.h
index c1fa03e..f9d8379 100644
--- a/include/thread.h
+++ b/include/thread.h
@@ -21,6 +21,10 @@
#ifndef __WINE_THREAD_H
#define __WINE_THREAD_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
#define WINE_NO_TEB
#include <winternl.h>
#include <wine/windef16.h>
diff --git a/include/user.h b/include/user.h
index 927c7dc..d8221ff 100644
--- a/include/user.h
+++ b/include/user.h
@@ -21,6 +21,8 @@
#ifndef __WINE_USER_H
#define __WINE_USER_H
+#include <stdarg.h>
+#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
diff --git a/include/vfw.h b/include/vfw.h
index e2108ea..2ac448d 100644
--- a/include/vfw.h
+++ b/include/vfw.h
@@ -19,9 +19,9 @@
#ifndef __WINE_VFW_H
#define __WINE_VFW_H
-#include <windef.h>
#include <mmsystem.h>
-#include <wingdi.h>
+#include <mmreg.h>
+#include <msacm.h>
#define VFWAPI WINAPI
#define VFWAPIV WINAPIV
diff --git a/include/win.h b/include/win.h
index e078ff6..b403c9f 100644
--- a/include/win.h
+++ b/include/win.h
@@ -21,6 +21,7 @@
#ifndef __WINE_WIN_H
#define __WINE_WIN_H
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
diff --git a/include/winbase.h b/include/winbase.h
index 11cc638..b3f5827 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -19,12 +19,6 @@
#ifndef __WINE_WINBASE_H
#define __WINE_WINBASE_H
-#ifndef RC_INVOKED
-#include <stdarg.h>
-#endif
-
-#include <basetsd.h>
-#include <windef.h>
#include <winerror.h>
#ifdef __cplusplus
diff --git a/include/wincrypt.h b/include/wincrypt.h
index 32b1244..403fe85 100644
--- a/include/wincrypt.h
+++ b/include/wincrypt.h
@@ -19,8 +19,6 @@
#ifndef __WINE_WINCRYPT_H
#define __WINE_WINCRYPT_H
-#include <windef.h>
-
/* some typedefs for function parameters */
typedef unsigned int ALG_ID;
typedef unsigned long HCRYPTPROV;
diff --git a/include/windows.h b/include/windows.h
index db9a09f..0a81f0f 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -34,6 +34,7 @@
/* All the basic includes */
#include <excpt.h>
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
diff --git a/include/wine/library.h b/include/wine/library.h
index b501bf4..d22368f 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -21,7 +21,10 @@
#ifndef __WINE_WINE_LIBRARY_H
#define __WINE_WINE_LIBRARY_H
+#include <stdarg.h>
#include <sys/types.h>
+
+#include <windef.h>
#include <winbase.h>
/* configuration */
diff --git a/include/wine/rpcss_shared.h b/include/wine/rpcss_shared.h
index 5d1760b..6992f04 100644
--- a/include/wine/rpcss_shared.h
+++ b/include/wine/rpcss_shared.h
@@ -21,9 +21,10 @@
#ifndef __WINE_RPCSS_SHARED_H
#define __WINE_RPCSS_SHARED_H
-#include <basetsd.h>
+#include <stdarg.h>
#include <windef.h>
-
+#include <winbase.h>
+#include <rpc.h>
#include <rpcdcep.h>
#define RPCSS_NP_PROTOCOL_VERSION 0x0000
diff --git a/include/wine/server.h b/include/wine/server.h
index 2e0d808..d811032 100644
--- a/include/wine/server.h
+++ b/include/wine/server.h
@@ -21,6 +21,10 @@
#ifndef __WINE_WINE_SERVER_H
#define __WINE_WINE_SERVER_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
#include <winternl.h>
#include <wine/exception.h>
#include <wine/server_protocol.h>
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 049718a..ac49701 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -8,8 +8,11 @@
#ifndef __WINE_WINE_SERVER_PROTOCOL_H
#define __WINE_WINE_SERVER_PROTOCOL_H
+#include <stdarg.h>
#include <stdlib.h>
#include <time.h>
+
+#include <windef.h>
#include <winbase.h>
struct request_header
diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h
index 787c62a..3b889be 100644
--- a/include/wine/winbase16.h
+++ b/include/wine/winbase16.h
@@ -19,6 +19,7 @@
#ifndef __WINE_WINE_WINBASE16_H
#define __WINE_WINE_WINBASE16_H
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winnls.h>
diff --git a/include/wine/windef16.h b/include/wine/windef16.h
index 126aa51..d869793 100644
--- a/include/wine/windef16.h
+++ b/include/wine/windef16.h
@@ -23,7 +23,11 @@
#ifndef __WINE_WINDEF16_H
#define __WINE_WINDEF16_H
+#ifndef RC_INVOKED
+#include <stdarg.h>
+#endif
#include <windef.h>
+#include <winbase.h>
/* Standard data types */
diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc
index 5bb6ad8..56e9d64 100644
--- a/include/wine/wine_common_ver.rc
+++ b/include/wine/wine_common_ver.rc
@@ -16,6 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "windef.h"
+#include "winbase.h"
#include "winver.h"
/*
diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index af61dd9..12bb18c 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -19,7 +19,9 @@
#ifndef __WINE_WINE_WINGDI16_H
#define __WINE_WINE_WINGDI16_H
+#include <stdarg.h>
#include <windef.h>
+#include <winbase.h>
#include <wingdi.h>
#include <wine/winbase16.h>
diff --git a/include/wine/winsock16.h b/include/wine/winsock16.h
index a841740..3014d64 100644
--- a/include/wine/winsock16.h
+++ b/include/wine/winsock16.h
@@ -19,7 +19,9 @@
#ifndef __WINE_WINE_WINSOCK16_H
#define __WINE_WINE_WINSOCK16_H
+#include <stdarg.h>
#include <windef.h>
+#include <winbase.h>
#include <pshpack1.h>
typedef UINT16 SOCKET16;
diff --git a/include/winnetwk.h b/include/winnetwk.h
index b9b406b..26d013f 100644
--- a/include/winnetwk.h
+++ b/include/winnetwk.h
@@ -20,9 +20,6 @@
#ifndef _WINNETWK_H_
#define _WINNETWK_H_
-#include <windef.h>
-#include <winerror.h>
-
/*
* Network types
*/
diff --git a/include/winnt.h b/include/winnt.h
index 83fe440..72e08d4 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -1514,8 +1514,6 @@
#define IS_TEXT_UNICODE_NULL_BYTES 0x1000
#define IS_TEXT_UNICODE_NOT_ASCII_MASK 0xF000
-#include <ntstatus.h>
-
#define MAXIMUM_WAIT_OBJECTS 64
#define MAXIMUM_SUSPEND_COUNT 127
diff --git a/include/winpos.h b/include/winpos.h
index 299af65..3669d63 100644
--- a/include/winpos.h
+++ b/include/winpos.h
@@ -21,6 +21,7 @@
#ifndef __WINE_WINPOS_H
#define __WINE_WINPOS_H
+#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
diff --git a/include/winreg.h b/include/winreg.h
index 63ef69b..57dad61 100644
--- a/include/winreg.h
+++ b/include/winreg.h
@@ -21,9 +21,6 @@
#ifndef __WINE_WINREG_H
#define __WINE_WINREG_H
-#include <winbase.h>
-#include <winnt.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/include/winsvc.h b/include/winsvc.h
index f9e7efa..963a883 100644
--- a/include/winsvc.h
+++ b/include/winsvc.h
@@ -23,8 +23,6 @@
extern "C" {
#endif /* defined(__cplusplus) */
-#include <windef.h>
-
/* Controls */
#define SERVICE_CONTROL_STOP 0x00000001
#define SERVICE_CONTROL_PAUSE 0x00000002
diff --git a/include/winternl.h b/include/winternl.h
index 74551ce..f471b85 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -22,8 +22,6 @@
#define __WINE_WINTERNAL_H
#include <windef.h>
-#include <winnt.h>
-#include <winreg.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/winver.h b/include/winver.h
index 47048ee..d46f26c 100644
--- a/include/winver.h
+++ b/include/winver.h
@@ -20,8 +20,6 @@
#ifndef __WINE_WINVER_H
#define __WINE_WINVER_H
-#include <windef.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* defined(__cplusplus) */
diff --git a/libs/uuid/dx8guid.c b/libs/uuid/dx8guid.c
index 7ac9700..4bd9dab 100644
--- a/libs/uuid/dx8guid.c
+++ b/libs/uuid/dx8guid.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
diff --git a/libs/uuid/dx9guid.c b/libs/uuid/dx9guid.c
index 61ee62e..d65ba90 100644
--- a/libs/uuid/dx9guid.c
+++ b/libs/uuid/dx9guid.c
@@ -20,6 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
diff --git a/libs/uuid/dxguid.c b/libs/uuid/dxguid.c
index 3e2d5ab..7f260f9 100644
--- a/libs/uuid/dxguid.c
+++ b/libs/uuid/dxguid.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#define COM_NO_WINDOWS_H
#include "windef.h"
#include "winbase.h"
@@ -32,6 +34,7 @@
#include "d3d.h"
#include "ddraw.h"
+#include "mmsystem.h"
#include "dsound.h"
#include "dsdriver.h"
#include "dsconf.h"
diff --git a/libs/uuid/uuid.c b/libs/uuid/uuid.c
index c38cc9a..ed1ac3e 100644
--- a/libs/uuid/uuid.c
+++ b/libs/uuid/uuid.c
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#define COM_NO_WINDOWS_H
#include "initguid.h"
diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c
index f7cb400..d490d3b 100644
--- a/libs/wine/ldt.c
+++ b/libs/wine/ldt.c
@@ -24,10 +24,12 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include "windef.h"
#include "winbase.h"
#define WINE_EXPORT_LDT_COPY
#include "wine/library.h"
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 1422032..32e0d9e 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@ -37,6 +38,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "wine/library.h"
/* argc/argv for the Windows application */
diff --git a/loader/loadorder.c b/loader/loadorder.c
index 0b6380e..672fd35 100644
--- a/loader/loadorder.c
+++ b/loader/loadorder.c
@@ -21,12 +21,15 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "file.h"
#include "module.h"
diff --git a/loader/module.c b/loader/module.c
index c7f92d1..590fa5c 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -32,6 +33,10 @@
#endif
#include "wine/winbase16.h"
#include "winerror.h"
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "heap.h"
#include "thread.h"
diff --git a/loader/ne/module.c b/loader/ne/module.c
index 6803c12..99fb811 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -31,6 +32,7 @@
#endif
#include <ctype.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/library.h"
diff --git a/loader/pe_image.c b/loader/pe_image.c
index cda8017..168e5f7 100644
--- a/loader/pe_image.c
+++ b/loader/pe_image.c
@@ -40,7 +40,10 @@
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
+#include <stdarg.h>
#include <string.h>
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "snoop.h"
diff --git a/loader/task.c b/loader/task.c
index 031167b..245ab13 100644
--- a/loader/task.c
+++ b/loader/task.c
@@ -21,6 +21,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
@@ -28,6 +29,7 @@
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winnt.h"
diff --git a/memory/codepage.c b/memory/codepage.c
index 88aa7ce..384cdb6 100644
--- a/memory/codepage.c
+++ b/memory/codepage.c
@@ -19,10 +19,12 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnls.h"
diff --git a/memory/environ.c b/memory/environ.c
index a80d268..d29ced0 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -21,11 +21,14 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "thread.h"
#include "wine/winbase16.h"
diff --git a/memory/global.c b/memory/global.c
index 447db40..eeabd1e 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -39,6 +39,7 @@
#include "wine/winbase16.h"
#include "wine/exception.h"
+#include "ntstatus.h"
#include "global.h"
#include "toolhelp.h"
#include "selectors.h"
diff --git a/memory/heap.c b/memory/heap.c
index f2f37ed..689d3a2 100644
--- a/memory/heap.c
+++ b/memory/heap.c
@@ -23,12 +23,15 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "thread.h"
diff --git a/memory/instr.c b/memory/instr.c
index c5212ac..ada93ef 100644
--- a/memory/instr.c
+++ b/memory/instr.c
@@ -18,7 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "module.h"
diff --git a/memory/local.c b/memory/local.c
index 5615e08..cf19047 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -28,8 +28,10 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
diff --git a/memory/string.c b/memory/string.c
index 0466aa0..57df2e8 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -20,8 +20,10 @@
*/
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
diff --git a/memory/virtual.c b/memory/virtual.c
index 5dcfb35..7a33bba 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -22,6 +22,7 @@
#include "wine/port.h"
#include <fcntl.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@ -31,8 +32,11 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wine/exception.h"
diff --git a/misc/cpu.c b/misc/cpu.c
index ea694a5..12410b1 100644
--- a/misc/cpu.c
+++ b/misc/cpu.c
@@ -34,6 +34,7 @@
#include <ctype.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_SYS_TIME_H
@@ -43,8 +44,10 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wine/unicode.h"
diff --git a/misc/options.c b/misc/options.c
index cdade48..a323b08 100644
--- a/misc/options.c
+++ b/misc/options.c
@@ -19,11 +19,14 @@
*/
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/library.h"
#include "options.h"
diff --git a/misc/registry.c b/misc/registry.c
index 7ab7aa1..c37a4d6 100644
--- a/misc/registry.c
+++ b/misc/registry.c
@@ -38,6 +38,7 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -52,7 +53,9 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
#include "wine/winbase16.h"
diff --git a/misc/version.c b/misc/version.c
index 8971de7..39a07f6 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -26,11 +26,14 @@
#include <string.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wine/winbase16.h"
diff --git a/msdos/dosmem.c b/msdos/dosmem.c
index 82fe3e7..72ce56b 100644
--- a/msdos/dosmem.c
+++ b/msdos/dosmem.c
@@ -23,6 +23,7 @@
#include "wine/port.h"
#include <signal.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
@@ -35,6 +36,7 @@
# include <sys/time.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
diff --git a/msdos/dpmi.c b/msdos/dpmi.c
index 81c6726..27538e1 100644
--- a/msdos/dpmi.c
+++ b/msdos/dpmi.c
@@ -21,6 +21,9 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "callback.h"
#include "wine/debug.h"
diff --git a/msdos/int21.c b/msdos/int21.c
index f05b88c..94b9e3c 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -28,6 +28,7 @@
#include <time.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>
@@ -46,6 +47,7 @@
#include <ctype.h>
#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wingdi.h"
#include "winuser.h" /* SW_NORMAL */
diff --git a/msdos/ioports.c b/msdos/ioports.c
index a104742..52f9dea 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -30,6 +30,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
@@ -39,6 +40,7 @@
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
+#include "winreg.h"
#include "winternl.h"
#include "callback.h"
#include "miscemu.h"
diff --git a/msdos/ppdev.c b/msdos/ppdev.c
index 1ba9c97..b2fc553 100644
--- a/msdos/ppdev.c
+++ b/msdos/ppdev.c
@@ -20,8 +20,11 @@
#include "config.h"
+#include "windef.h"
+
#ifdef HAVE_PPDEV
+#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -33,6 +36,8 @@
#include <linux/ppdev.h>
#include "winerror.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "miscemu.h"
@@ -315,7 +320,6 @@
#else /* HAVE_PPDEV */
-#include "windef.h"
char IO_pp_init(void)
{
diff --git a/objects/brush.c b/objects/brush.c
index d1eca2e..3b54fbb 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -20,8 +20,10 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
diff --git a/objects/clipping.c b/objects/clipping.c
index 7cd5dba..11fd7bb 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
#include "wine/winuser16.h"
diff --git a/objects/dc.c b/objects/dc.c
index 1408600..486d67e 100644
--- a/objects/dc.c
+++ b/objects/dc.c
@@ -20,10 +20,13 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
+#include "winreg.h"
#include "winternl.h"
#include "winerror.h"
#include "wownt32.h"
diff --git a/objects/dcvalues.c b/objects/dcvalues.c
index 6cad06e..2516398 100644
--- a/objects/dcvalues.c
+++ b/objects/dcvalues.c
@@ -20,6 +20,9 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wownt32.h"
diff --git a/objects/dib.c b/objects/dib.c
index 3119ac9..943cdb7 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -18,9 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "bitmap.h"
#include "selectors.h"
diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index 613ba19..1f014ee 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -34,8 +34,10 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include <assert.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winnls.h"
diff --git a/objects/font.c b/objects/font.c
index db1950f..382585f 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -23,10 +23,12 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "wownt32.h"
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index f7bbe80..3e7a5ad 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -22,9 +22,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
#include "winerror.h"
diff --git a/objects/linedda.c b/objects/linedda.c
index f4bd666..a99da9e 100644
--- a/objects/linedda.c
+++ b/objects/linedda.c
@@ -18,8 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
/**********************************************************************
diff --git a/objects/palette.c b/objects/palette.c
index 66615b6..02966cf 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -23,11 +23,12 @@
* Information in the "Undocumented Windows" is incorrect.
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
-#include "winbase.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
#include "wine/winuser16.h"
diff --git a/objects/pen.c b/objects/pen.c
index 83d2f82..9d60b63 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -20,9 +20,11 @@
#include "config.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
#include "gdi.h"
diff --git a/objects/region.c b/objects/region.c
index 8c66eae..e82db2a 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -94,9 +94,11 @@
* the y-x-banding that's so nice to have...
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "gdi.h"
#include "wine/debug.h"
diff --git a/objects/text.c b/objects/text.c
index dfc239e..3aa1bdf 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -19,12 +19,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
-#include "winbase.h"
#include "winerror.h"
#include "gdi.h"
#include "wine/debug.h"
diff --git a/programs/notepad/rsrc.rc b/programs/notepad/rsrc.rc
index 4cb30a9..50b64c7 100644
--- a/programs/notepad/rsrc.rc
+++ b/programs/notepad/rsrc.rc
@@ -18,6 +18,7 @@
*/
#include "windef.h"
+#include "winbase.h"
#include "winuser.h"
#include "main.h"
#include "winnls.h"
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 3dbc7d7..69cdd94 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -77,8 +77,11 @@
/*******************************************************************************
* Dynamically load all things that depend on user32.dll
*/
-#include "winuser.h"
+#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "commdlg.h"
diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c
index 6323357..b2bf05f 100644
--- a/programs/rpcss/np_server.c
+++ b/programs/rpcss/np_server.c
@@ -20,6 +20,7 @@
#include <assert.h>
+#include "ntstatus.h"
#include "rpcss.h"
#include "wine/debug.h"
diff --git a/programs/wcmd/wcmd.h b/programs/wcmd/wcmd.h
index 5017808..84082ee 100644
--- a/programs/wcmd/wcmd.h
+++ b/programs/wcmd/wcmd.h
@@ -28,6 +28,7 @@
#include <ctype.h>
#ifdef WINELIB
+#include <windef.h>
#include <winbase.h>
#include <wincon.h>
#endif /* !WINELIB */
diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c
index cd6b60a..ceab860 100644
--- a/programs/wcmd/wcmdmain.c
+++ b/programs/wcmd/wcmdmain.c
@@ -24,6 +24,7 @@
* - Lots of functionality missing from builtins
*/
+#include "ntstatus.h"
#include "wcmd.h"
char *inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "CTTY",
diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c
index e0e4783..b4015af 100644
--- a/programs/winecfg/drive.c
+++ b/programs/winecfg/drive.c
@@ -20,16 +20,21 @@
*
*/
-#include <winreg.h>
-#include <wine/debug.h>
+#include <assert.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wine/debug.h>
#include <shellapi.h>
+#include <objbase.h>
#include <shlguid.h>
#include <shlwapi.h>
#include <shlobj.h>
-#include <string.h>
-#include <assert.h>
#include "winecfg.h"
#include "resource.h"
diff --git a/programs/winecfg/properties.h b/programs/winecfg/properties.h
index 1b4a954..036a6b1 100644
--- a/programs/winecfg/properties.h
+++ b/programs/winecfg/properties.h
@@ -24,6 +24,13 @@
#ifndef WINE_CFG_PROPERTIES_H
#define WINE_CFG_PROPERTIES_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#define MAX_NAME_LENGTH 64
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 340e456..1d4f88d 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -23,6 +23,13 @@
#ifndef WINE_CFG_H
#define WINE_CFG_H
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "properties.h"
#define IS_OPTION_TRUE(ch) \
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 3a8f3fb..97ed061 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -20,6 +20,10 @@
*
*/
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winnls.h"
#include "winresrc.h"
#include "resource.h"
diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c
index 04362e0..a73cf25 100644
--- a/programs/winecfg/x11drvdlg.c
+++ b/programs/winecfg/x11drvdlg.c
@@ -20,11 +20,15 @@
*
*/
-#include <winreg.h>
-#include <wine/debug.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wine/debug.h>
+
#include "resource.h"
#include "winecfg.h"
diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c
index 15f131d..951bfdc 100644
--- a/programs/wineconsole/curses.c
+++ b/programs/wineconsole/curses.c
@@ -42,6 +42,7 @@
#endif
#undef KEY_EVENT /* avoid redefinition warning */
#include <unistd.h>
+#include <windef.h>
#include <winbase.h>
#include <winnls.h>
#include "winecon_private.h"
diff --git a/programs/wineconsole/dialog.c b/programs/wineconsole/dialog.c
index 7b34188..6ca6696 100644
--- a/programs/wineconsole/dialog.c
+++ b/programs/wineconsole/dialog.c
@@ -19,9 +19,15 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
#include "commctrl.h"
#include "prsht.h"
#include "winecon_user.h"
diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c
index 9bb1f0d..7758919 100644
--- a/programs/wineconsole/registry.c
+++ b/programs/wineconsole/registry.c
@@ -19,6 +19,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "winreg.h"
#include "winecon_private.h"
diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h
index 81f18c6..fbdf4c8 100644
--- a/programs/wineconsole/winecon_private.h
+++ b/programs/wineconsole/winecon_private.h
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+#include <windef.h>
#include <winbase.h>
#include <wincon.h>
diff --git a/programs/wineconsole/winecon_user.h b/programs/wineconsole/winecon_user.h
index 518db43..bc0abe1 100644
--- a/programs/wineconsole/winecon_user.h
+++ b/programs/wineconsole/winecon_user.h
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+#include <windef.h>
#include <winbase.h>
#include <wingdi.h>
#include <winuser.h>
diff --git a/programs/wineconsole/wineconsole_res.rc b/programs/wineconsole/wineconsole_res.rc
index d38f545..c1355fb 100644
--- a/programs/wineconsole/wineconsole_res.rc
+++ b/programs/wineconsole/wineconsole_res.rc
@@ -17,6 +17,8 @@
*/
#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
#include "commctrl.h"
diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l
index 7b1374c..792c082 100644
--- a/programs/winedbg/debug.l
+++ b/programs/winedbg/debug.l
@@ -22,6 +22,9 @@
%{
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wincon.h"
#include "debugger.h"
diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h
index 29cff45..85d2346 100644
--- a/programs/winedbg/debugger.h
+++ b/programs/winedbg/debugger.h
@@ -22,8 +22,11 @@
#define __WINE_DEBUGGER_H
#include <assert.h>
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
+#include "ntstatus.h"
#include "wine/exception.h"
#ifdef __i386__
diff --git a/programs/winedbg/expr.c b/programs/winedbg/expr.c
index 2bd10a0..1a702e8 100644
--- a/programs/winedbg/expr.c
+++ b/programs/winedbg/expr.c
@@ -19,15 +19,17 @@
*/
#include "config.h"
+
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "debugger.h"
#include "expr.h"
-#include <stdarg.h>
-
struct expr
{
unsigned int perm;
diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index a6dad14..40757ac 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -20,8 +20,12 @@
*/
#include "config.h"
+
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c
index c9f73d4..6f58c02 100644
--- a/programs/winedbg/winedbg.c
+++ b/programs/winedbg/winedbg.c
@@ -25,11 +25,11 @@
#include <string.h>
#include "debugger.h"
-#include "winternl.h"
#include "wincon.h"
#include "winreg.h"
#include "wingdi.h"
#include "winuser.h"
+#include "winternl.h"
#include "excpt.h"
#include "wine/library.h"
#include "winnls.h"
diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index edc2393..d8c5da7 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wine/winbase16.h"
#include "winuser.h"
diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c
index 6c6c393..8647e77 100644
--- a/programs/winhelp/hlpfile.c
+++ b/programs/winhelp/hlpfile.c
@@ -19,8 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/programs/winhelp/macro.h b/programs/winhelp/macro.h
index 84d9d29..49eb6d9 100644
--- a/programs/winhelp/macro.h
+++ b/programs/winhelp/macro.h
@@ -19,6 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c
index 6494d87..771447b 100644
--- a/programs/winhelp/winhelp.c
+++ b/programs/winhelp/winhelp.c
@@ -23,6 +23,9 @@
#include <assert.h>
#include <stdio.h>
#include <string.h>
+#include <stdarg.h>
+
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/programs/winhelp/winhelp.h b/programs/winhelp/winhelp.h
index 2c83a94..99e86ee 100644
--- a/programs/winhelp/winhelp.h
+++ b/programs/winhelp/winhelp.h
@@ -33,7 +33,11 @@
#ifndef RC_INVOKED
+#include <stdarg.h>
+
#include "hlpfile.h"
+#include "windef.h"
+#include "winbase.h"
#include "macro.h"
#include "winhelp_res.h"
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index 0d9dfb8..6186ef2 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
@@ -30,7 +31,9 @@
#include <sys/mman.h>
#endif
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/library.h"
#include "module.h"
diff --git a/relay32/relay386.c b/relay32/relay386.c
index a9290ae..f2a396d 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -23,8 +23,12 @@
#include <assert.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/unicode.h"
#include "wine/debug.h"
diff --git a/relay32/snoop.c b/relay32/snoop.c
index c36eb20..94f997b 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -22,8 +22,13 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include "ntstatus.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "snoop.h"
#include "wine/debug.h"
diff --git a/scheduler/client.c b/scheduler/client.c
index 9f643f9..ec62534 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -50,6 +50,7 @@
#endif
#include <stdarg.h>
+#include "ntstatus.h"
#include "thread.h"
#include "wine/library.h"
#include "wine/server.h"
diff --git a/scheduler/fiber.c b/scheduler/fiber.c
index dfc93aa..475c8b5 100644
--- a/scheduler/fiber.c
+++ b/scheduler/fiber.c
@@ -22,8 +22,10 @@
*/
#include <setjmp.h>
+#include <stdarg.h>
#define NONAMELESSUNION
+#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/exception.h"
diff --git a/scheduler/handle.c b/scheduler/handle.c
index b3f2ed0..a5bc9e5 100644
--- a/scheduler/handle.c
+++ b/scheduler/handle.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_IO_H
# include <io.h>
@@ -28,6 +29,7 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "wine/server.h"
#include "winerror.h"
diff --git a/scheduler/synchro.c b/scheduler/synchro.c
index 2537e1a..b2ce0fe 100644
--- a/scheduler/synchro.c
+++ b/scheduler/synchro.c
@@ -20,7 +20,12 @@
#include "config.h"
+#include <stdarg.h>
+
+#include "ntstatus.h"
+#include "windef.h"
#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "../kernel/kernel_private.h" /* FIXME: to be changed when moving file to dlls/kernel */
diff --git a/scheduler/syslevel.c b/scheduler/syslevel.c
index 798133a..9ad2f51 100644
--- a/scheduler/syslevel.c
+++ b/scheduler/syslevel.c
@@ -20,10 +20,14 @@
#include "config.h"
+#include <stdarg.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
#include "winternl.h"
#include "wine/winbase16.h"
#include "syslevel.h"
diff --git a/scheduler/thread.c b/scheduler/thread.c
index ca72346..0738f64 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -34,6 +34,7 @@
# include <unistd.h>
#endif
#include "wine/winbase16.h"
+#include "ntstatus.h"
#include "thread.h"
#include "module.h"
#include "winerror.h"
diff --git a/server/context_i386.c b/server/context_i386.c
index 01aaef2..4ef2fa5 100644
--- a/server/context_i386.c
+++ b/server/context_i386.c
@@ -27,6 +27,7 @@
#ifdef HAVE_SYS_REG_H
#include <sys/reg.h>
#endif
+#include <stdarg.h>
#include <unistd.h>
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
@@ -35,6 +36,7 @@
# include <sys/param.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/context_powerpc.c b/server/context_powerpc.c
index fca6225..96d81e2 100644
--- a/server/context_powerpc.c
+++ b/server/context_powerpc.c
@@ -28,6 +28,7 @@
#ifdef HAVE_SYS_REG_H
# include <sys/reg.h>
#endif
+#include <stdarg.h>
#include <unistd.h>
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
@@ -45,6 +46,7 @@
# endif
#endif /* PTRACE_POKEUSER */
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/context_sparc.c b/server/context_sparc.c
index 342881b..157f02b 100644
--- a/server/context_sparc.c
+++ b/server/context_sparc.c
@@ -28,11 +28,13 @@
#ifdef HAVE_SYS_REG_H
# include <sys/reg.h>
#endif
+#include <stdarg.h>
#include <unistd.h>
#ifdef HAVE_SYS_PTRACE_H
# include <sys/ptrace.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/debugger.c b/server/debugger.c
index 29f92b2..56dbbc6 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -24,8 +24,10 @@
#include <assert.h>
#include <signal.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "handle.h"
diff --git a/server/device.c b/server/device.c
index 1a63712..c2422b9 100644
--- a/server/device.c
+++ b/server/device.c
@@ -26,10 +26,12 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "handle.h"
diff --git a/server/file.c b/server/file.c
index 96d5250..1ff29a9 100644
--- a/server/file.c
+++ b/server/file.c
@@ -23,6 +23,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -40,6 +41,7 @@
#endif
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/handle.c b/server/handle.c
index ff9e546..7669688 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -24,9 +24,11 @@
#include <assert.h>
#include <limits.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "handle.h"
diff --git a/server/hook.c b/server/hook.c
index fa42d8d..ab86865 100644
--- a/server/hook.c
+++ b/server/hook.c
@@ -22,8 +22,10 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
#include "winuser.h"
diff --git a/server/mapping.c b/server/mapping.c
index 45f473c..ccd0e8c 100644
--- a/server/mapping.c
+++ b/server/mapping.c
@@ -22,11 +22,13 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/named_pipe.c b/server/named_pipe.c
index e595090..b69eec6 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -28,6 +28,7 @@
#include <assert.h>
#include <fcntl.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
@@ -38,6 +39,7 @@
#include <time.h>
#include <unistd.h>
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/process.c b/server/process.c
index 3f4f9e8..15ab052 100644
--- a/server/process.c
+++ b/server/process.c
@@ -25,6 +25,7 @@
#include <limits.h>
#include <signal.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
@@ -33,6 +34,7 @@
#endif
#include <unistd.h>
+#include "windef.h"
#include "winbase.h"
#include "winnt.h"
diff --git a/server/queue.c b/server/queue.c
index 65bb680..4868a23 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -22,9 +22,11 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/server/serial.c b/server/serial.c
index b2dca50..65dd087 100644
--- a/server/serial.c
+++ b/server/serial.c
@@ -25,6 +25,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -43,6 +44,7 @@
#endif
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/smb.c b/server/smb.c
index f31cebe..2ddd410 100644
--- a/server/smb.c
+++ b/server/smb.c
@@ -26,6 +26,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -44,6 +45,7 @@
#endif
#include "winerror.h"
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/sock.c b/server/sock.c
index 6161d23..3b3e4ba 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -25,6 +25,7 @@
#include <assert.h>
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -46,6 +47,7 @@
#include <time.h>
#include <unistd.h>
+#include "windef.h"
#include "winbase.h"
#include "process.h"
diff --git a/server/thread.c b/server/thread.c
index 6b451fe..14c42bd 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -33,6 +33,7 @@
#include <unistd.h>
#include <time.h>
+#include "windef.h"
#include "winbase.h"
#include "file.h"
diff --git a/server/thread.h b/server/thread.h
index 9403ddf..9874076 100644
--- a/server/thread.h
+++ b/server/thread.h
@@ -22,6 +22,7 @@
#define __WINE_SERVER_THREAD_H
#include "object.h"
+#include "ntstatus.h"
/* thread structure */
diff --git a/server/trace.c b/server/trace.c
index 8ba7d3a..deba957 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -22,6 +22,7 @@
#include "wine/port.h"
#include <ctype.h>
+#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/server/window.c b/server/window.c
index 61e4e4a..f1d74da 100644
--- a/server/window.c
+++ b/server/window.c
@@ -22,7 +22,9 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/tools/make_ctests b/tools/make_ctests
index 196bd53..5084385 100755
--- a/tools/make_ctests
+++ b/tools/make_ctests
@@ -23,6 +23,7 @@
cat <<EOF
/* Automatically generated file; DO NOT EDIT!! */
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "windef.h"
diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h
index bc7d57a..d784a39 100644
--- a/tools/widl/widltypes.h
+++ b/tools/widl/widltypes.h
@@ -21,7 +21,9 @@
#ifndef __WIDL_WIDLTYPES_H
#define __WIDL_WIDLTYPES_H
+#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
#include "guiddef.h"
#include "wine/rpcfc.h"
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 26a2b34..10db504 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -27,10 +27,12 @@
#include <assert.h>
#include <ctype.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "build.h"
diff --git a/tools/winebuild/res16.c b/tools/winebuild/res16.c
index 3694bef..f917baa 100644
--- a/tools/winebuild/res16.c
+++ b/tools/winebuild/res16.c
@@ -24,6 +24,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -36,6 +37,7 @@
#include <sys/mman.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "build.h"
diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c
index 15635a9..071a764 100644
--- a/tools/winebuild/res32.c
+++ b/tools/winebuild/res32.c
@@ -24,6 +24,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
@@ -36,6 +37,7 @@
#include <sys/mman.h>
#endif
+#include "windef.h"
#include "winbase.h"
#include "build.h"
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 6cebc05..bba57cd 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -27,8 +27,10 @@
#include <assert.h>
#include <ctype.h>
+#include <stdarg.h>
#include <string.h>
+#include "windef.h"
#include "winbase.h"
#include "wine/exception.h"
#include "build.h"
diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c
index 2ead49b..0df9cf5 100644
--- a/tools/winedump/debug.c
+++ b/tools/winedump/debug.c
@@ -24,6 +24,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -41,6 +42,7 @@
#include <fcntl.h>
#include "windef.h"
+#include "winbase.h"
#include "winedump.h"
#include "pe.h"
#include "cvinclude.h"
diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c
index f286b92..0a0e1e1 100644
--- a/tools/winedump/ne.c
+++ b/tools/winedump/ne.c
@@ -22,6 +22,7 @@
#include "wine/port.h"
#include <fcntl.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c
index 913cae0..3f6a82a 100644
--- a/tools/winedump/pe.c
+++ b/tools/winedump/pe.c
@@ -22,6 +22,7 @@
#include "wine/port.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -41,6 +42,7 @@
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
+#include "winbase.h"
#include "winedump.h"
#include "pe.h"
diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h
index b917740..b666bd9 100644
--- a/tools/wmc/utils.h
+++ b/tools/wmc/utils.h
@@ -21,12 +21,10 @@
#ifndef __WMC_UTILS_H
#define __WMC_UTILS_H
-#ifndef __WMC_WMCTYPES_H
-#include "wmctypes.h"
-#endif
-
#include <stddef.h> /* size_t */
+#include "wmctypes.h"
+
void *xmalloc(size_t);
void *xrealloc(void *, size_t);
char *xstrdup(const char *str);
diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h
index 19eee29..f410236 100644
--- a/tools/wmc/wmc.h
+++ b/tools/wmc/wmc.h
@@ -21,12 +21,10 @@
#ifndef __WMC_WMC_H
#define __WMC_WMC_H
-#ifndef __WMC_WMCTYPES_H
-#include "wmctypes.h"
-#endif
-
#include <time.h> /* For time_t */
+#include "wmctypes.h"
+
#define WMC_MAJOR_VERSION 1
#define WMC_MINOR_VERSION 0
#define WMC_MICRO_VERSION 0
diff --git a/tools/wmc/wmctypes.h b/tools/wmc/wmctypes.h
index f709d7c..2f8e02a 100644
--- a/tools/wmc/wmctypes.h
+++ b/tools/wmc/wmctypes.h
@@ -21,9 +21,9 @@
#ifndef __WMC_WMCTYPES_H
#define __WMC_WMCTYPES_H
-#ifndef __WINE_WINDEF_H
+#include <stdarg.h>
#include "windef.h"
-#endif
+#include "winbase.h"
/* Byteordering defines */
#define WMC_BO_NATIVE 0x00
diff --git a/tools/wrc/dumpres.h b/tools/wrc/dumpres.h
index 63f5a0a..3ebccb8 100644
--- a/tools/wrc/dumpres.h
+++ b/tools/wrc/dumpres.h
@@ -21,9 +21,7 @@
#ifndef __WRC_DUMPRES_H
#define __WRC_DUMPRES_H
-#ifndef __WRC_WRCTYPES_H
#include "wrctypes.h"
-#endif
char *get_typename(resource_t* r);
void dump_resources(resource_t *top);
diff --git a/tools/wrc/genres.h b/tools/wrc/genres.h
index 7dbca3f..8005d5e 100644
--- a/tools/wrc/genres.h
+++ b/tools/wrc/genres.h
@@ -21,9 +21,7 @@
#ifndef __WRC_GENRES_H
#define __WRC_GENRES_H
-#ifndef __WRC_WRCTYPES_H
#include "wrctypes.h"
-#endif
res_t *new_res(void);
res_t *grow_res(res_t *r, int add);
diff --git a/tools/wrc/newstruc.h b/tools/wrc/newstruc.h
index 6dc4bb1..a0a624d 100644
--- a/tools/wrc/newstruc.h
+++ b/tools/wrc/newstruc.h
@@ -21,9 +21,7 @@
#ifndef __WRC_NEWSTRUC_H
#define __WRC_NEWSTRUC_H
-#ifndef __WRC_WRCTYPES_H
#include "wrctypes.h"
-#endif
#define __NEW_STRUCT_FUNC(p) \
p##_t *new_##p(void)\
diff --git a/tools/wrc/readres.h b/tools/wrc/readres.h
index 6b25dac..d4e7a91 100644
--- a/tools/wrc/readres.h
+++ b/tools/wrc/readres.h
@@ -21,9 +21,7 @@
#ifndef __WRC_READRES_H
#define __WRC_READRES_H
-#ifndef __WRC_WRCTYPES_H
#include "wrctypes.h"
-#endif
resource_t *read_resfile(char *inname);
diff --git a/tools/wrc/utils.h b/tools/wrc/utils.h
index afb9597..c424008 100644
--- a/tools/wrc/utils.h
+++ b/tools/wrc/utils.h
@@ -21,12 +21,10 @@
#ifndef __WRC_UTILS_H
#define __WRC_UTILS_H
-#ifndef __WRC_WRCTYPES_H
-#include "wrctypes.h"
-#endif
-
#include <stddef.h> /* size_t */
+#include "wrctypes.h"
+
void *xmalloc(size_t);
void *xrealloc(void *, size_t);
char *xstrdup(const char *str);
diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h
index ec8db77..075177c 100644
--- a/tools/wrc/wrc.h
+++ b/tools/wrc/wrc.h
@@ -21,12 +21,10 @@
#ifndef __WRC_WRC_H
#define __WRC_WRC_H
-#ifndef __WRC_WRCTYPES_H
-#include "wrctypes.h"
-#endif
-
#include <time.h> /* For time_t */
+#include "wrctypes.h"
+
#define WRC_MAJOR_VERSION 1
#define WRC_MINOR_VERSION 1
#define WRC_MICRO_VERSION 9
diff --git a/tools/wrc/wrctypes.h b/tools/wrc/wrctypes.h
index 0f73a1f..e7eb9a4 100644
--- a/tools/wrc/wrctypes.h
+++ b/tools/wrc/wrctypes.h
@@ -21,7 +21,9 @@
#ifndef __WRC_WRCTYPES_H
#define __WRC_WRCTYPES_H
+#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
#ifndef MAKELANGID
#include "winnls.h"
diff --git a/win32/device.c b/win32/device.c
index 0cec32d..2b3dda2 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -32,6 +32,7 @@
#include <stdarg.h>
#include <time.h>
+#include "ntstatus.h"
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
diff --git a/win32/except.c b/win32/except.c
index d7cb912..1d1910c 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -38,9 +38,13 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
+#include "ntstatus.h"
#include "windef.h"
+#include "winbase.h"
#include "winerror.h"
+#include "winreg.h"
#include "winternl.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/win32/newfns.c b/win32/newfns.c
index 9ab2b76..8eef6d1 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -24,6 +24,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_SYS_TIME_H
diff --git a/windows/class.c b/windows/class.c
index 3ae47f4..c4e7400 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -29,12 +29,14 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "wine/winbase16.h"
#include "winerror.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wownt32.h"
diff --git a/windows/clipboard.c b/windows/clipboard.c
index e9699d4..d1bbce4 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -32,6 +32,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <sys/types.h>
#include <fcntl.h>
diff --git a/windows/cursoricon.c b/windows/cursoricon.c
index 261a247..488407d 100644
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -43,12 +43,17 @@
* FIXME: what are we going to do with animation and color (bpp > 1) cursors ?!
*/
+#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wownt32.h"
+#include "winerror.h"
+#include "ntstatus.h"
+#include "excpt.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wine/exception.h"
@@ -58,8 +63,6 @@
#include "wine/debug.h"
#include "user.h"
#include "message.h"
-#include "winerror.h"
-#include "excpt.h"
WINE_DEFAULT_DEBUG_CHANNEL(cursor);
WINE_DECLARE_DEBUG_CHANNEL(icon);
diff --git a/windows/defdlg.c b/windows/defdlg.c
index f6df054..5d1f6aa 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
diff --git a/windows/dialog.c b/windows/dialog.c
index 7dbe839..3ce861e 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
diff --git a/windows/driver.c b/windows/driver.c
index 1cd7abb..befbad1 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -22,9 +22,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/windows/input.c b/windows/input.c
index bfefcb4..953d188 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include <ctype.h>
#include <assert.h>
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 50df439..976ced0 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -22,6 +22,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/windows/mdi.c b/windows/mdi.c
index 219e7f6..7622db1 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -81,6 +81,7 @@
*/
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <math.h>
diff --git a/windows/message.c b/windows/message.c
index c3e3dbf..20b7b16 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
@@ -28,11 +29,13 @@
#endif
#include <sys/types.h>
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "message.h"
#include "winerror.h"
+#include "ntstatus.h"
#include "wine/server.h"
#include "controls.h"
#include "dde.h"
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 3fb5922..54eb740 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -18,12 +18,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
+#include "winreg.h"
#include "winternl.h"
#include "dlgs.h"
#include "user.h"
diff --git a/windows/multimon.c b/windows/multimon.c
index e909538..d1fe7b4 100644
--- a/windows/multimon.c
+++ b/windows/multimon.c
@@ -18,10 +18,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
-#include "wingdi.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "wine/unicode.h"
diff --git a/windows/nonclient.c b/windows/nonclient.c
index 354e0eb..cc9ee27 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -20,7 +20,10 @@
#include "config.h"
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wownt32.h"
diff --git a/windows/painting.c b/windows/painting.c
index c95abdd..e6bac8b 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -19,8 +19,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "wownt32.h"
diff --git a/windows/queue.c b/windows/queue.c
index 08cde7f..ba303c2 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -18,10 +18,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include <signal.h>
#include <assert.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winbase16.h"
diff --git a/windows/rect.c b/windows/rect.c
index bba18ef..40bcaaa 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
diff --git a/windows/scroll.c b/windows/scroll.c
index a160364..070c12b 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -19,9 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
diff --git a/windows/spy.c b/windows/spy.c
index f17afb6..30f2cf8 100644
--- a/windows/spy.c
+++ b/windows/spy.c
@@ -21,8 +21,10 @@
#include <stdlib.h>
#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winreg.h"
#include "wownt32.h"
@@ -30,6 +32,7 @@
#include "win.h"
#include "wine/debug.h"
#include "message.h"
+#include "winnls.h"
#include "commctrl.h"
WINE_DEFAULT_DEBUG_CHANNEL(message);
diff --git a/windows/struct32.h b/windows/struct32.h
index 33b14ed..b4541c2 100644
--- a/windows/struct32.h
+++ b/windows/struct32.h
@@ -21,8 +21,9 @@
#ifndef __WINE_STRUCT32_H
#define __WINE_STRUCT32_H
-#include "winbase.h"
+#include <stdarg.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 84fe6ca..e98e1f8 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -20,14 +20,15 @@
*/
#include <assert.h>
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
-#include "winbase.h"
#include "winuser.h"
#include "wownt32.h"
#include "winreg.h"
diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c
index fe83e7d..cde72fc 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -18,15 +18,16 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include "windef.h"
-#include "wingdi.h"
-#include "wine/winuser16.h"
#include "winbase.h"
#include "winreg.h"
+#include "wingdi.h"
+#include "wine/winuser16.h"
#include "winuser.h"
#include "winerror.h"
#include "user.h"
diff --git a/windows/sysparams.c b/windows/sysparams.c
index 87464f7..4078be6 100644
--- a/windows/sysparams.c
+++ b/windows/sysparams.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/windows/timer.c b/windows/timer.c
index ede3134..f127021 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -18,7 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
+
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
diff --git a/windows/user.c b/windows/user.c
index d108aa4..f971f96 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -19,10 +19,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "wine/winbase16.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "wine/winuser16.h"
diff --git a/windows/win.c b/windows/win.c
index 6a74b01..ac38611 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -22,9 +22,11 @@
#include "wine/port.h"
#include <assert.h>
+#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include "windef.h"
+#include "winbase.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "wownt32.h"
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 6f5e3c0..7dc9c63 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -22,12 +22,14 @@
#include "config.h"
#include <stdlib.h>
+#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include "wine/debug.h"
+#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/windows/winpos.c b/windows/winpos.c
index 6660552..7e5ae7b 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -19,9 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <stdarg.h>
#include <string.h>
#include "winerror.h"
#include "windef.h"
+#include "winbase.h"
#include "wingdi.h"
#include "winerror.h"
#include "wine/winuser16.h"
diff --git a/windows/winproc.c b/windows/winproc.c
index 81cee8a..085b1eb 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -22,6 +22,7 @@
#include "config.h"
#include "wine/port.h"
+#include <stdarg.h>
#include <string.h>
#include "windef.h"
