diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6b97b1da56b..d996712cbdd 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-27  RodneyBrown  <RodneyBrown@pmsc.com>
+	    Jeff Law <law@cygnus.com>
+
+	* Makefile.in (rename.o, waitpid.o): Depend on config.h
+	* rename.c: include config.h, unistd.h
+	* waitpid.c: include config.h, sys/wait.h
+
 2000-07-21  Alex Samuel  <samuel@codesourcery.com>
 
 	* cp-demangle.c (demangle_ctor_dtor_name): Remove not-in-charge
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 68aba712032..242fde7841b 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -280,6 +280,7 @@ objalloc.o: config.h $(INCDIR)/objalloc.h
 obstack.o: config.h $(INCDIR)/obstack.h
 partition.o: config.h $(INCDIR)/partition.h
 pexecute.o: config.h $(INCDIR)/libiberty.h
+rename.o: config.h
 setenv.o: config.h
 sort.o: config.h $(INCDIR)/sort.h $(INCDIR)/ansidecl.h
 spaces.o: $(INCDIR)/libiberty.h
@@ -295,4 +296,5 @@ xmalloc.o: config.h $(INCDIR)/libiberty.h
 xmemdup.o: config.h $(INCDIR)/libiberty.h
 xstrdup.o: config.h $(INCDIR)/libiberty.h
 xstrerror.o: config.h $(INCDIR)/libiberty.h
+waitpid.o: config.h
 hashtab.o: config.h $(INCDIR)/libiberty.h $(INCDIR)/hashtab.h $(INCDIR)/ansidecl.h
diff --git a/libiberty/rename.c b/libiberty/rename.c
index ae26e2d0040..2e9dec18fa1 100644
--- a/libiberty/rename.c
+++ b/libiberty/rename.c
@@ -3,7 +3,13 @@
 
 /* Rename a file.  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 int
 rename (zfrom, zto)
diff --git a/libiberty/waitpid.c b/libiberty/waitpid.c
index 23db0b932d2..2848309826a 100644
--- a/libiberty/waitpid.c
+++ b/libiberty/waitpid.c
@@ -1,3 +1,10 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 int
 waitpid (pid, stat_loc, options)
 	int pid, *stat_loc, options;