diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 737d239450..2e9bff43fb 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -423,7 +423,7 @@ atexit.o: config.h
 basename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
 	$(INCDIR)/safe-ctype.h
 bsearch.o: config.h $(INCDIR)/ansidecl.h
-calloc.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+calloc.o: $(INCDIR)/ansidecl.h
 choose-temp.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 clock.o: config.h
 concat.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
@@ -431,7 +431,7 @@ copysign.o: $(INCDIR)/ansidecl.h
 cp-demangle.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
 	$(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
 cplus-dem.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/demangle.h \
-	$(INCDIR)/getopt.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+	$(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
 dyn-string.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/dyn-string.h \
 	$(INCDIR)/libiberty.h
 fdmatch.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
@@ -451,7 +451,8 @@ hex.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 lbasename.o: $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
 	$(INCDIR)/safe-ctype.h
 lrealpath.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+make-relative-prefix.o: config.h $(INCDIR)/ansidecl.h \
+	$(INCDIR)/libiberty.h
 make-temp-file.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 md5.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
 memchr.o: $(INCDIR)/ansidecl.h
@@ -464,18 +465,23 @@ objalloc.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/objalloc.h
 obstack.o: config.h $(INCDIR)/obstack.h
 partition.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
 	$(INCDIR)/partition.h
-pex-djgpp.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-mpw.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-msdos.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
-	$(INCDIR)/safe-ctype.h
-pex-os2.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-unix.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-pex-win32.o: config.h pex-common.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
-physmem.o: config.h $(INCDIR)/libiberty.h
+pex-djgpp.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h
+pex-mpw.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h
+pex-msdos.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h $(INCDIR)/safe-ctype.h
+pex-os2.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h
+pex-unix.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h
+pex-win32.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+	$(srcdir)/pex-common.h
+physmem.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 putenv.o: config.h $(INCDIR)/ansidecl.h
 random.o: $(INCDIR)/ansidecl.h
 regex.o: config.h $(INCDIR)/xregex.h $(INCDIR)/xregex2.h
-rename.o: config.h
+rename.o: config.h $(INCDIR)/ansidecl.h
 safe-ctype.o: $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h
 setenv.o: config.h $(INCDIR)/ansidecl.h
 sigsetmask.o: $(INCDIR)/ansidecl.h
@@ -486,6 +492,7 @@ splay-tree.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
 	$(INCDIR)/splay-tree.h
 strcasecmp.o: $(INCDIR)/ansidecl.h
 strchr.o: $(INCDIR)/ansidecl.h
+strdup.o: $(INCDIR)/ansidecl.h
 strerror.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 strncasecmp.o: $(INCDIR)/ansidecl.h
 strncmp.o: $(INCDIR)/ansidecl.h
@@ -498,6 +505,7 @@ ternary.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
 	$(INCDIR)/ternary.h
 vasprintf.o: config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
 vfork.o: $(INCDIR)/ansidecl.h
+vfprintf.o: $(INCDIR)/ansidecl.h
 vprintf.o: $(INCDIR)/ansidecl.h
 vsprintf.o: $(INCDIR)/ansidecl.h
 waitpid.o: config.h
diff --git a/libiberty/argv.c b/libiberty/argv.c
index e4a03793b6..31d8ef55e2 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 #include <string.h>
 #include <stdlib.h>
 
-#else	/* !__STDC__ */
+#else	/* !ANSI_PROTOTYPES */
 
 #if !defined _WIN32 || defined __GNUC__
 extern char *memcpy ();		/* Copy memory region */
@@ -46,7 +46,7 @@ extern void free ();		/* Free malloc'd memory */
 extern char *strdup ();		/* Duplicate a string */
 #endif
 
-#endif	/* __STDC__ */
+#endif	/* ANSI_PROTOTYPES */
 
 
 #ifndef NULL
diff --git a/libiberty/calloc.c b/libiberty/calloc.c
index b342f6c1b3..5073682307 100644
--- a/libiberty/calloc.c
+++ b/libiberty/calloc.c
@@ -13,8 +13,6 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of
 */
  
 #include "ansidecl.h"
-#include "libiberty.h"
- 
 #ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 #else
@@ -23,6 +21,7 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of
 
 /* For systems with larger pointers than ints, this must be declared.  */
 PTR malloc PARAMS ((size_t));
+void bzero PARAMS ((PTR, size_t));
 
 PTR
 calloc (nelem, elsize)
diff --git a/libiberty/floatformat.c b/libiberty/floatformat.c
index d9e9fad816..d69024f739 100644
--- a/libiberty/floatformat.c
+++ b/libiberty/floatformat.c
@@ -17,9 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
+#include "ansidecl.h"
 #include "floatformat.h"
 #include <math.h>		/* ldexp */
-#ifdef __STDC__
+#ifdef ANSI_PROTOTYPES
 #include <stddef.h>
 extern void *memcpy (void *s1, const void *s2, size_t n);
 extern void *memset (void *s, int c, size_t n);
diff --git a/libiberty/getcwd.c b/libiberty/getcwd.c
index 465b4e0b2a..a19d26796d 100644
--- a/libiberty/getcwd.c
+++ b/libiberty/getcwd.c
@@ -40,7 +40,7 @@ extern int errno;
 char *
 getcwd (buf, len)
   char *buf;
-  int len;
+  size_t len;
 {
   char ourbuf[MAXPATHLEN];
   char *result;
diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c
index 2f8dfd6c58..32067afb5b 100644
--- a/libiberty/hashtab.c
+++ b/libiberty/hashtab.c
@@ -634,9 +634,6 @@ htab_traverse (htab, callback, info)
      htab_trav callback;
      PTR info;
 {
-  PTR *slot;
-  PTR *limit;
-
   if ((htab->n_elements - htab->n_deleted) * 8 < htab->size)
     htab_expand (htab);
 
diff --git a/libiberty/rename.c b/libiberty/rename.c
index 05630629c1..399980ab7d 100644
--- a/libiberty/rename.c
+++ b/libiberty/rename.c
@@ -12,6 +12,7 @@ exists, it is removed.
 
 */
 
+#include "ansidecl.h"
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -22,8 +23,8 @@ exists, it is removed.
 
 int
 rename (zfrom, zto)
-     char *zfrom;
-     char *zto;
+     const char *zfrom;
+     const char *zto;
 {
   if (link (zfrom, zto) < 0)
     {
diff --git a/libiberty/strsignal.c b/libiberty/strsignal.c
index 86c8aca5b4..a8a7d341fe 100644
--- a/libiberty/strsignal.c
+++ b/libiberty/strsignal.c
@@ -42,7 +42,7 @@ extern PTR memset ();
 #undef sys_nsig
 
 #ifndef NULL
-#  ifdef __STDC__
+#  ifdef ANSI_PROTOTYPES
 #    define NULL (void *) 0
 #  else
 #    define NULL 0
diff --git a/libiberty/strstr.c b/libiberty/strstr.c
index 470e04b1a7..a059c7f5dc 100644
--- a/libiberty/strstr.c
+++ b/libiberty/strstr.c
@@ -27,8 +27,8 @@ strstr (s1, s2)
   register char *p = s1;
   extern char *strchr ();
   extern int strncmp ();
-#if __GNUC__==2
-  extern __SIZE_TYPE__ strlen ();
+#if __GNUC__ >= 2
+  extern __SIZE_TYPE__ strlen (const char *);
 #endif
   register int len = strlen (s2);
 
diff --git a/libiberty/vfprintf.c b/libiberty/vfprintf.c
index db7b2ff4c1..18f09d47d3 100644
--- a/libiberty/vfprintf.c
+++ b/libiberty/vfprintf.c
@@ -3,7 +3,8 @@
    Copyright (C) 1998 Free Software Foundation, Inc.
  */
 
-#ifdef __STDC__
+#include "ansidecl.h"
+#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
diff --git a/libiberty/vprintf.c b/libiberty/vprintf.c
index c57c3e4f31..9487896ea5 100644
--- a/libiberty/vprintf.c
+++ b/libiberty/vprintf.c
@@ -15,13 +15,13 @@ nonstandard but common function @code{_doprnt}.
 
 */
 
-#ifdef __STDC__
+#include <ansidecl.h>
+#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 #include <stdio.h>
-#include <ansidecl.h>
 #undef vprintf
 int
 vprintf (format, ap)
diff --git a/libiberty/vsprintf.c b/libiberty/vsprintf.c
index b69e9bc9ca..9f09d7e275 100644
--- a/libiberty/vsprintf.c
+++ b/libiberty/vsprintf.c
@@ -26,9 +26,13 @@ the resulting executable to be covered by the GNU General Public License.
 This exception does not however invalidate any other reasons why
 the executable file might be covered by the GNU General Public License. */
 
-#include <varargs.h>
-#include <stdio.h>
 #include <ansidecl.h>
+#ifdef ANSI_PROTOTYPES
+#include <stdarg.h>
+#else
+#include <varargs.h>
+#endif
+#include <stdio.h>
 #undef vsprintf
 
 #if defined _IOSTRG && defined _IOWRT