diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 167e46303185..57d73ce9f866 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 18 02:30:47 1999  Philippe De Muyter  <phdm@macqel.be>
+
+	* setenv.c (sys/types.h, stdio.h): Include those files unconditionaly.
+
 Fri Oct 15 01:47:51 1999  Vladimir Makarov  <vmakarov@loony.cygnus.com>
 
 	* Makefile.in (CFILES): Add hashtab.c
diff --git a/libiberty/setenv.c b/libiberty/setenv.c
index 8a039d18fa8d..eec13006c229 100644
--- a/libiberty/setenv.c
+++ b/libiberty/setenv.c
@@ -21,6 +21,8 @@
 #endif
 
 #include "ansidecl.h"
+#include <sys/types.h> /* For `size_t' */
+#include <stdio.h>     /* For `NULL' */
 
 #include <errno.h>
 #if !defined(errno) && !defined(HAVE_ERRNO_DECL)