diff --git a/src/global.h b/src/global.h
index 8d1853acc67c9af4e4d3789008dbafaf2744de13..f780f0563b7bbd4f8817e41386a733f539c14c5b 100644
--- a/src/global.h
+++ b/src/global.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: global.h,v 1.112 2008/06/29 11:45:54 mast Exp $
+|| $Id: global.h,v 1.113 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef GLOBAL_H
@@ -214,6 +214,7 @@ void *alloca();
 #endif
 
 #include <stdio.h>
+#include <stdarg.h>
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
diff --git a/src/module_support.h b/src/module_support.h
index fa27afd57bdb42a5773ed8753ebb86367508370b..457c73b1ebbf18e642b4693f188548b50a812a82 100644
--- a/src/module_support.h
+++ b/src/module_support.h
@@ -2,11 +2,10 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: module_support.h,v 1.18 2005/12/04 18:58:06 nilsson Exp $
+|| $Id: module_support.h,v 1.19 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef MODULE_SUPPORT_H
-#include <stdarg.h>
 
 #include "module.h"
 
diff --git a/src/pike_error.h b/src/pike_error.h
index cf4697e58647604b2b719596cf53f940822c06fa..d7f15b61ce7b8d9fd3f73e9203abe6557abc0494 100644
--- a/src/pike_error.h
+++ b/src/pike_error.h
@@ -2,14 +2,12 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_error.h,v 1.49 2008/10/04 17:17:14 mast Exp $
+|| $Id: pike_error.h,v 1.50 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef PIKE_ERROR_H
 #define PIKE_ERROR_H
 
-#include <stdarg.h>
-
 #ifdef CONFIGURE_TEST
 
 #include <stdio.h>
diff --git a/src/port.h b/src/port.h
index 055888de84ea774ab28bcbb7d06f776a532f3c22..44eeb0ddc9fcbb4d5ca3e29f2781857c80cde03c 100644
--- a/src/port.h
+++ b/src/port.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: port.h,v 1.64 2007/12/31 12:39:16 grubba Exp $
+|| $Id: port.h,v 1.65 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef PORT_H
@@ -231,10 +231,6 @@ char *STRCHR(char *s,int c);
 #  endif
 #endif
 
-#if !defined(HAVE_VFPRINTF) || !defined(HAVE_VSPRINTF) || !defined(HAVE_VSNPRINTF)
-#  include <stdarg.h>
-#endif
-
 #ifndef HAVE_VFPRINTF
 PMOD_EXPORT int VFPRINTF(FILE *f,const char *s,va_list args);
 #else
diff --git a/src/program.h b/src/program.h
index 52c6e5a4bd77193dca7ce11fb9db377fa41d45f8..2960c365eff1ea318919f0f0f46af6c4afe29674 100644
--- a/src/program.h
+++ b/src/program.h
@@ -2,13 +2,12 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: program.h,v 1.259 2008/08/17 15:30:35 mast Exp $
+|| $Id: program.h,v 1.260 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
-#include <stdarg.h>
 #include "global.h"
 #include "pike_macros.h"
 #include "pike_error.h"
diff --git a/src/stralloc.h b/src/stralloc.h
index 0bada4871442b7718e76c1d3623d217eeba568c0..4b4a67fb9da62dd7a20418bc2aeac8f43ee418e6 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -2,15 +2,13 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: stralloc.h,v 1.110 2008/07/22 23:35:11 mast Exp $
+|| $Id: stralloc.h,v 1.111 2008/10/06 17:00:00 mast Exp $
 */
 
 #ifndef STRALLOC_H
 #define STRALLOC_H
 #include "global.h"
 
-#include <stdarg.h>
-
 #include "pike_macros.h"
 #include "block_alloc_h.h"