diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 22deb6f1db..b81575b1b2 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,6 +1,6 @@
 2002-07-20  Alan Modra  <amodra@bigpond.net.au>
 
-	* budemang.c: Include string.h.
+	* budemang.c: Include config.h and string.h/strings.h.
 
 2002-07-18 Denis Chertykov  <denisc@overta.ru>
 	   Frank Ch. Eigler  <fche@redhat.com>
diff --git a/binutils/budemang.c b/binutils/budemang.c
index f80e196c9a..3f8d385c5e 100644
--- a/binutils/budemang.c
+++ b/binutils/budemang.c
@@ -18,8 +18,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
+#include "config.h"
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
 #include "bfd.h"
 #include "libiberty.h"
 #include "demangle.h"