diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2c67bd7674..ba678b6a94 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-16  Alan Modra  <amodra@gmail.com>
+
+	* archures.c (bfd_default_set_arch_mach): Make available in bfd.h.
+	* libbfd.h: Regenerate.
+	* bfd-in2.h: Regenerate.
+
 2016-07-16  Alan Modra  <amodra@gmail.com>
 
 	* libbfd-in.h (BFD_ALIGN): Move to..
diff --git a/bfd/archures.c b/bfd/archures.c
index 96c91099ac..af70b18157 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -934,7 +934,7 @@ bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg)
 }
 
 /*
-INTERNAL_FUNCTION
+FUNCTION
 	bfd_default_set_arch_mach
 
 SYNOPSIS
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 5fffc46c33..8b12547d9a 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -2387,6 +2387,9 @@ const bfd_arch_info_type *bfd_arch_get_compatible
 
 void bfd_set_arch_info (bfd *abfd, const bfd_arch_info_type *arg);
 
+bfd_boolean bfd_default_set_arch_mach
+   (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
+
 enum bfd_architecture bfd_get_arch (bfd *abfd);
 
 unsigned long bfd_get_mach (bfd *abfd);
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index eb6312b1ea..9d751ee43a 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -3148,9 +3148,6 @@ bfd_byte *bfd_generic_get_relocated_section_contents
 
 /* Extracted from archures.c.  */
 extern const bfd_arch_info_type bfd_default_arch_struct;
-bfd_boolean bfd_default_set_arch_mach
-   (bfd *abfd, enum bfd_architecture arch, unsigned long mach);
-
 const bfd_arch_info_type *bfd_default_compatible
    (const bfd_arch_info_type *a, const bfd_arch_info_type *b);
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 582655e832..eaaf108128 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,14 @@
+2016-07-16  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-epiphany.c: Don't include libbfd.h.
+	* config/tc-frv.c: Likewise.
+	* config/tc-ip2k.c: Likewise.
+	* config/tc-iq2000.c: Likewise.
+	* config/tc-m32c.c: Likewise.
+	* config/tc-mep.c: Likewise.
+	* config/tc-mt.c: Likewise.
+	* config/tc-nios2.c: Likewise.
+
 2016-07-16  Alan Modra  <amodra@gmail.com>
 
 	* config/bfin-parse.y: Don't include libbfd.h.
diff --git a/gas/config/tc-epiphany.c b/gas/config/tc-epiphany.c
index f35198e4e8..d14c3a0f68 100644
--- a/gas/config/tc-epiphany.c
+++ b/gas/config/tc-epiphany.c
@@ -28,7 +28,6 @@
 #include "elf/common.h"
 #include "elf/epiphany.h"
 #include "dwarf2dbg.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */
diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c
index 8912f44edc..f49096db50 100644
--- a/gas/config/tc-frv.c
+++ b/gas/config/tc-frv.c
@@ -24,7 +24,6 @@
 #include "opcodes/frv-desc.h"
 #include "opcodes/frv-opc.h"
 #include "cgen.h"
-#include "libbfd.h"
 #include "elf/common.h"
 #include "elf/frv.h"
 #include "dwarf2dbg.h"
diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 642dfea089..c1e50c1bdf 100644
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -26,7 +26,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/ip2k.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */
diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
index f150e19d02..3bb8726054 100644
--- a/gas/config/tc-iq2000.c
+++ b/gas/config/tc-iq2000.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/iq2000.h"
-#include "libbfd.h"
 #include "sb.h"
 #include "macro.h"
 
diff --git a/gas/config/tc-m32c.c b/gas/config/tc-m32c.c
index b28797b38e..ed1d1c83be 100644
--- a/gas/config/tc-m32c.c
+++ b/gas/config/tc-m32c.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/m32c.h"
-#include "libbfd.h"
 #include "safe-ctype.h"
 
 /* Structure to hold all of the different components
diff --git a/gas/config/tc-mep.c b/gas/config/tc-mep.c
index 6128b6e669..f018f74274 100644
--- a/gas/config/tc-mep.c
+++ b/gas/config/tc-mep.c
@@ -28,7 +28,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/mep.h"
-#include "libbfd.h"
 #include "xregex.h"
 
 /* Structure to hold all of the different components describing
diff --git a/gas/config/tc-mt.c b/gas/config/tc-mt.c
index e0bca88669..bbcd87e1a0 100644
--- a/gas/config/tc-mt.c
+++ b/gas/config/tc-mt.c
@@ -27,7 +27,6 @@
 #include "cgen.h"
 #include "elf/common.h"
 #include "elf/mt.h"
-#include "libbfd.h"
 
 /* Structure to hold all of the different components
    describing an individual instruction.  */
diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index 0ddc5017bc..0a1286a0f9 100644
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -25,7 +25,6 @@
 #include "elf/nios2.h"
 #include "tc-nios2.h"
 #include "bfd.h"
-#include "libbfd.h"
 #include "dwarf2dbg.h"
 #include "subsegs.h"
 #include "safe-ctype.h"