diff --git a/include/ChangeLog b/include/ChangeLog
index 07e0129c836..e2fa68f30d9 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-12  Ian Lance Taylor  <ian@wasabisystems.com>
 
+	* demangle.h: Instead of checking ANSI_PROTOTYPES, just include
+	"libiberty.h".
+
 	* demangle.h: If ANSI_PROTOTYPES is defined, include <stddef.h>.
 
 	* demangle.h (enum demangle_component_type): Define.
diff --git a/include/demangle.h b/include/demangle.h
index dfe42069294..6e995e4817d 100644
--- a/include/demangle.h
+++ b/include/demangle.h
@@ -21,12 +21,7 @@
 #if !defined (DEMANGLE_H)
 #define DEMANGLE_H
 
-#include "ansidecl.h"
-
-#ifdef ANSI_PROTOTYPES
-/* Get a definition for size_t.  */
-#include <stddef.h>
-#endif
+#include "libiberty.h"
 
 #ifdef __cplusplus
 extern "C" {