diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 653882818d6..a6a4634f1d0 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-26  Mark Mitchell  <mark@markmitchell.com>
+
+	* splay-tree.c: Tweak include directives to make sure declarations of
+	xmalloc and free are available.
+
 1998-10-25  Mark Mitchell  <mark@markmitchell.com>
 
 	* cplus-dem.c (gnu_special): Fix handling of virtual tables in
diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index 22dd267f573..68b9f995f67 100644
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -23,8 +23,18 @@
      Lewis, Harry R. and Denenberg, Larry.  Data Structures and Their
      Algorithms.  Harper-Collins, Inc.  1991.  */
 
+#if defined (IN_GCC) || defined (HAVE_CONFIG_H)
+#include "config.h"
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #ifndef IN_GCC
 #include "libiberty.h"
+#else /* IN_GCC */
+extern char* xmalloc ();
 #endif /* IN_GCC */
 #include "splay-tree.h"