diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c
index c0d7712d95..9c3dd4e770 100644
--- a/dlls/advapi32/advapi.c
+++ b/dlls/advapi32/advapi.c
@@ -24,9 +24,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
 
-#include "winbase.h"
 #include "windef.h"
+#include "winbase.h"
 #include "winnls.h"
 #include "winerror.h"
 
diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c
index f2506b6d1d..10c1e1cc16 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <stdarg.h>
 #include <sys/stat.h>
 
 #include "windef.h"
diff --git a/dlls/twain/capability.c b/dlls/twain/capability.c
index 28311e71dc..fb0fdfa29f 100644
--- a/dlls/twain/capability.c
+++ b/dlls/twain/capability.c
@@ -16,6 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <stdarg.h>
+
+#include "windef.h"
 #include "winbase.h"
 #include "twain.h"
 #include "twain_i.h"
diff --git a/dlls/twain/ds_image.c b/dlls/twain/ds_image.c
index f31d9db073..0171616421 100644
--- a/dlls/twain/ds_image.c
+++ b/dlls/twain/ds_image.c
@@ -18,6 +18,9 @@
 
 #include "config.h"
 
+#include <stdarg.h>
+
+#include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
diff --git a/dlls/twain/dsm_ctrl.c b/dlls/twain/dsm_ctrl.c
index 3c55ea5fb1..648b53698f 100644
--- a/dlls/twain/dsm_ctrl.c
+++ b/dlls/twain/dsm_ctrl.c
@@ -21,9 +21,11 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <stdarg.h>
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "windef.h"
 #include "winbase.h"
 #include "twain.h"
 #include "twain_i.h"
diff --git a/dlls/twain/twain32_main.c b/dlls/twain/twain32_main.c
index 56a5a329d6..e4cf857866 100644
--- a/dlls/twain/twain32_main.c
+++ b/dlls/twain/twain32_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 "winbase.h"
 #include "twain.h"
diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c
index f85d5c71ca..ae3495f28a 100644
--- a/dlls/winaspi/aspi.c
+++ b/dlls/winaspi/aspi.c
@@ -40,6 +40,7 @@ HKEY_DYN_DATA
 #include "config.h"
 
 #include <stdio.h>
+#include <stdarg.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -52,11 +53,14 @@ HKEY_DYN_DATA
 #include <errno.h>
 #include <string.h>
 
-#include "wine/debug.h"
+#include "windef.h"
+#include "winbase.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "winescsi.h"
 
+#include "wine/debug.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(aspi);
 
 /* Internal function prototypes */
diff --git a/tools/bin2res.c b/tools/bin2res.c
index e018bc5335..d117fe12b1 100644
--- a/tools/bin2res.c
+++ b/tools/bin2res.c
@@ -34,6 +34,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c
index 23e724e912..4df0bca385 100644
--- a/tools/wrc/genres.c
+++ b/tools/wrc/genres.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 #include <assert.h>
 #include <ctype.h>