diff --git a/include/ChangeLog b/include/ChangeLog
index 570af4385..ba7cfbe6b 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-18  Alan Modra  <amodra@bigpond.net.au>
+
+	* bfdlink.h: Remove mention of a29k.
+	* dis-asm.h: Remove a29k support.
+	* aout/encap.h: Likewise.
+
 2005-08-17  Mark Kettenis  <kettenis@gnu.org>
 
 	* floatformat.h (struct floatformat): Change type of large
diff --git a/include/aout/encap.h b/include/aout/encap.h
index 0808ae6c2..be8e88ccd 100644
--- a/include/aout/encap.h
+++ b/include/aout/encap.h
@@ -85,7 +85,6 @@ struct coffheader
    
 #define COFF_MAGIC_I386 0514 /* I386MAGIC */
 #define COFF_MAGIC_M68K 0520 /* MC68MAGIC */
-#define	COFF_MAGIC_A29K 0x17A	/* Used by asm29k cross-tools */
 
 #ifdef COFF_MAGIC
 short __header_offset_temp;
diff --git a/include/bfdlink.h b/include/bfdlink.h
index a3a11fa63..66a5b4284 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -510,8 +510,7 @@ struct bfd_link_callbacks
      const char *name, const char *reloc_name, bfd_vma addend,
      bfd *abfd, asection *section, bfd_vma address);
   /* A function which is called when a dangerous reloc is performed.
-     The canonical example is an a29k IHCONST reloc which does not
-     follow an IHIHALF reloc.  MESSAGE is an appropriate message.
+     MESSAGE is an appropriate message.
      ABFD, SECTION and ADDRESS identify the location at which the
      problem occurred; if this is the result of a
      bfd_section_reloc_link_order or bfd_symbol_reloc_link_order, then
diff --git a/include/dis-asm.h b/include/dis-asm.h
index 37c8101ca..67eebfc1b 100644
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -218,8 +218,6 @@ extern int print_insn_alpha		(bfd_vma, disassemble_info *);
 extern int print_insn_big_arm		(bfd_vma, disassemble_info *);
 extern int print_insn_little_arm	(bfd_vma, disassemble_info *);
 extern int print_insn_sparc		(bfd_vma, disassemble_info *);
-extern int print_insn_big_a29k		(bfd_vma, disassemble_info *);
-extern int print_insn_little_a29k	(bfd_vma, disassemble_info *);
 extern int print_insn_avr		(bfd_vma, disassemble_info *);
 extern int print_insn_d10v		(bfd_vma, disassemble_info *);
 extern int print_insn_d30v		(bfd_vma, disassemble_info *);