diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d2c5201970..85d2fb1ae3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2018-05-18  Alan Modra  <amodra@gmail.com>
+
+	* libbfd-in.h: Add include guard.
+	* libcoff-in.h: Likewise.
+	* doc/Makefile.am (libbfd.h, libcoff.h): Append another #endif.
+	* doc/Makefile.in: Regenerate.
+	* libbfd.h: Regenerate.
+	* libcoff.h: Regenerate.
+
 2018-05-16  Maciej W. Rozycki  <macro@mips.com>
 
 	* elf32-nds32.c (nds32_convert_32_to_16): Preset `insn_type'.
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
index 4657e37a28..8e9d831bc9 100644
--- a/bfd/doc/Makefile.am
+++ b/bfd/doc/Makefile.am
@@ -277,6 +277,7 @@ libbfd.h: $(LIBBFD_H_DEP)
 	echo "#ifdef __cplusplus" >> $@
 	echo "}" >> $@
 	echo "#endif" >> $@
+	echo "#endif" >> $@
 
 LIBCOFF_H_DEP = \
 	$(srcdir)/../libcoff-in.h	\
@@ -299,6 +300,7 @@ libcoff.h: $(LIBCOFF_H_DEP)
 	echo "#ifdef __cplusplus" >> $@
 	echo "}" >> $@
 	echo "#endif" >> $@
+	echo "#endif" >> $@
 
 BFD_H_DEP = \
 	$(srcdir)/../bfd-in.h 		\
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
index a80dc75fe3..6ce67ce578 100644
--- a/bfd/doc/Makefile.in
+++ b/bfd/doc/Makefile.in
@@ -1013,6 +1013,7 @@ libbfd.h: $(LIBBFD_H_DEP)
 	echo "#ifdef __cplusplus" >> $@
 	echo "}" >> $@
 	echo "#endif" >> $@
+	echo "#endif" >> $@
 
 libcoff.h: $(LIBCOFF_H_DEP)
 	echo "$(LIBCOFF_H_DEP)" | sed -f $(srcdir)/header.sed > $@
@@ -1028,6 +1029,7 @@ libcoff.h: $(LIBCOFF_H_DEP)
 	echo "#ifdef __cplusplus" >> $@
 	echo "}" >> $@
 	echo "#endif" >> $@
+	echo "#endif" >> $@
 
 bfd.h: $(BFD_H_DEP)
 	echo "$(BFD_H_DEP)" | sed -f $(srcdir)/header.sed > $@
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
index d8b445f894..a763f97faa 100644
--- a/bfd/libbfd-in.h
+++ b/bfd/libbfd-in.h
@@ -22,6 +22,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#ifndef _LIBBFD_H
+#define _LIBBFD_H 1
+
 #include "hashtab.h"
 
 #ifdef __cplusplus
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index 495ffb49f7..0fe4a94181 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -27,6 +27,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#ifndef _LIBBFD_H
+#define _LIBBFD_H 1
+
 #include "hashtab.h"
 
 #ifdef __cplusplus
@@ -3231,3 +3234,4 @@ bfd_boolean _bfd_generic_verify_endian_match
 #ifdef __cplusplus
 }
 #endif
+#endif
diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
index d0b18cf653..edb1b7dc86 100644
--- a/bfd/libcoff-in.h
+++ b/bfd/libcoff-in.h
@@ -19,6 +19,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#ifndef _LIBCOFF_H
+#define _LIBCOFF_H 1
+
 #include "bfdlink.h"
 #include "coff-bfd.h"
 
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index 653a0089d8..a31866faac 100644
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -23,6 +23,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
+#ifndef _LIBCOFF_H
+#define _LIBCOFF_H 1
+
 #include "bfdlink.h"
 #include "coff-bfd.h"
 
@@ -973,3 +976,4 @@ typedef struct
 #ifdef __cplusplus
 }
 #endif
+#endif