diff --git a/ChangeLog b/ChangeLog
index a24e2633..a9e3d365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-16  Eli Zaretskii  <eliz@gnu.org>
+
+	* output.c [WINDOWS32]: Include windows.h and sub_proc.h, to avoid
+	compiler warnings for CLOSE_ON_EXEC.
+
 2013-09-16  Paul Smith  <psmith@gnu.org>
 
 	* configure.ac: Update version to 3.99.91.
diff --git a/output.c b/output.c
index c9e19099..c445e63b 100644
--- a/output.c
+++ b/output.c
@@ -30,6 +30,11 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 # include <sys/file.h>
 #endif
 
+#ifdef WINDOWS32
+# include <windows.h>
+# include "sub_proc.h"
+#endif /* WINDOWS32 */
+
 struct output *output_context = NULL;
 static unsigned int stdio_traced = 0;