Fixed header dependencies to be fully compatible with the Windows

headers (with help from Dimitrie O. Paun).

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"

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"

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"

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"

controls/icontitle.c

@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H

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"

controls/menu.c

@@ -31,6 +31,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 

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"

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"

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"

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 @@ BOOL WINAPI AbortSystemShutdownA( LPSTR lpMachineName )
  *
  * See AbortSystemShutdownA.
  */
-BOOL WINAPI AbortSystemShutdownW( LPCWSTR lpMachineName )
+BOOL WINAPI AbortSystemShutdownW( LPWSTR lpMachineName )
 {
     TRACE("stub %s (harmless)\n", debugstr_w(lpMachineName));
     return TRUE;

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

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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"

dlls/avifil32/extrachunk.c

@@ -21,6 +21,7 @@
 
 #include "extrachunk.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "windowsx.h"
 #include "vfw.h"
 

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

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"
 

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"

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"

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"

dlls/avifil32/rsrc.rc

@@ -19,6 +19,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "winuser.h"
 #include "winver.h"
 #include "avifile_private.h"

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"

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"

dlls/cabinet/cabextract.c

@@ -28,6 +28,7 @@
  
 #include "config.h"
 
+#include <stdarg.h>
 #include <stdlib.h>
 
 #include "windef.h"

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"

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"

dlls/cabinet/fci.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

dlls/cabinet/fdi.c

@@ -60,6 +60,7 @@
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <stdio.h>
 
 #include "windef.h"

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"

dlls/comcat/regsvr.c

@@ -20,6 +20,7 @@
 
 #define COM_NO_WINDOWS_H
 
+#include <stdarg.h>
 #include <string.h>
 
 #include "windef.h"

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"

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"

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;

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"

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"
 

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"
 

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"

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"
 

dlls/comctl32/rsrc.rc

@@ -20,6 +20,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "comctl32.h"

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"
 

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"
 

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"

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"

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"

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"
 

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"
 

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"

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"
 

dlls/commdlg/cdlg.h

@@ -146,6 +146,11 @@ typedef struct {
 #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"

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"

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

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"

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"

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"

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);

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);

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"

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>
 

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"
 

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"

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"

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"

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"

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

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"

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"
 

dlls/commdlg/printdlg.c

@@ -22,6 +22,7 @@
  */
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 

dlls/commdlg/printdlg16.c

@@ -23,6 +23,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 

dlls/commdlg/rsrc.rc

@@ -19,6 +19,7 @@
  */
 
 #include "windef.h"
+#include "winbase.h"
 #include "winuser.h"
 #include "winnls.h"
 #include "cdlg.h"

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"

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"
 

dlls/d3d8/basetexture.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/cubetexture.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/d3d8_main.c

@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

dlls/d3d8/d3d8_private.h

@@ -58,6 +58,10 @@ extern int num_lock;
 #define LEAVE_GL() wine_tsx11_unlock_ptr()
 #endif
 
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
 #include "d3d8.h"
 
 /* Device caps */

dlls/d3d8/device.c

@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <stdarg.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

dlls/d3d8/directx.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #include "windef.h"

dlls/d3d8/drawprim.c

@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <stdarg.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

dlls/d3d8/indexbuffer.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/d3d8/resource.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"

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);