diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e046fc3bfe..53b09327a6 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-08  Ben Elliston  <bje@au.ibm.com>
+
+	* elf32-xtensa.c: Include <stdarg.h> unconditionally, not only
+	when ANSI_PROTOTYPES is defined.  Remove #ifdef logic.
+
 2005-07-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf-bfd.h (elf_backend_data): Add special_sections.
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 67ff80c4ef..f80f8c6ecd 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -21,11 +21,7 @@
 #include "bfd.h"
 #include "sysdep.h"
 
-#ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <strings.h>
 
 #include "bfdlink.h"