diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2cf8b27e9da5e87ddbc7a5c503af3903f09e7860..4e2d2aef20518d1a44abc0bacff21677caf1f388 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* elf32-xtensa.c (xtensa_make_property_section): Remove prototype.
+
 2016-06-24  John Baldwin  <jhb@FreeBSD.org>
 
 	* elf.c (elfcore_grok_freebsd_note): Handle NT_FREEBSD_PROCSTAT_AUXV
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index af9618dbfc23f91b881920d12f775f515b3e6d13..41506f431d8dfe4ac31df11bb0864c544a0d4d37 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -110,7 +110,6 @@ static bfd_boolean xtensa_is_proptable_section (asection *);
 static int internal_reloc_compare (const void *, const void *);
 static int internal_reloc_matches (const void *, const void *);
 static asection *xtensa_get_property_section (asection *, const char *);
-extern asection *xtensa_make_property_section (asection *, const char *);
 static flagword xtensa_get_property_predef_flags (asection *);
 
 /* Other functions called directly by the linker.  */
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1c3e80a5780247e81d3945f70bb55e70d3b158ba..d7246f824cfee3602a85f88129190b7ba2fba91d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-xtensa.c (xtensa_make_property_section): Remove prototype.
+
 2016-06-24  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* config/tc-mips.c (append_insn): Use any `O_symbol' expression
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index d2a356734ddc2aeb29d32b8095e9c545c8018a9b..5840135157ff6710107c1eeeefccae696acf681f 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -526,10 +526,6 @@ static void xtensa_switch_section_emit_state (emit_state *, segT, subsegT);
 static void xtensa_restore_emit_state (emit_state *);
 static segT cache_literal_section (bfd_boolean);
 
-/* Import from elf32-xtensa.c in BFD library.  */
-
-extern asection *xtensa_make_property_section (asection *, const char *);
-
 /* op_placement_info functions.  */
 
 static void init_op_placement_info_table (void);
diff --git a/include/ChangeLog b/include/ChangeLog
index e57acb4dfe243bbb6f504cc288d632dea262a504..ecfac716419685634e66eb38e265d5c8832f09dd 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* elf/xtensa.h (xtensa_make_property_section): New prototype.
+
 2016-06-24  John Baldwin  <jhb@FreeBSD.org>
 
 	* elf/common.h (AT_FREEBSD_EXECPATH, AT_FREEBSD_CANARY)
diff --git a/include/elf/xtensa.h b/include/elf/xtensa.h
index ca178f5f3bdb9d018be6ce6bd067573526f40e0c..be55cd7c75b6401054d01fc04e21636456c650b3 100644
--- a/include/elf/xtensa.h
+++ b/include/elf/xtensa.h
@@ -209,6 +209,8 @@ typedef struct property_table_entry_t
 
 #define XTENSA_PROP_INSN_ABSLIT        0x00020000
 
+extern asection *xtensa_make_property_section (asection *, const char *);
+
 #ifdef __cplusplus
 }
 #endif