diff --git a/ChangeLog b/ChangeLog
index bed3bd1e5c..56ef82760d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-03-02  Florian Weimer  <fweimer@redhat.com>
+
+	* elf/get-dynamic-info.h: Remove header file inclusion guard.
+
 2017-03-02  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #21015]
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 6413558975..7525c3a5b2 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _GET_DYNAMIC_INFO_H
-#define _GET_DYNAMIC_INFO_H 1
+/* This file is included multiple times and therefore lacks a header
+   file inclusion guard.  */
 
 #include <assert.h>
 #include <libc-diag.h>
@@ -182,5 +182,3 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
     info[DT_RPATH] = NULL;
 #endif
 }
-
-#endif /* get-dynamic-info.h */