2 files changed, 9 insertions, 7 deletions
diff --git a/elf.h b/elf.h
index d131b9b..e904a2c 100644
--- a/elf.h
+++ b/elf.h
@@ -19,10 +19,6 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
-#include <features.h>
-
-__BEGIN_DECLS
-
 /* Standard ELF types.  */
 
 #include <stdint.h>
@@ -3374,7 +3370,4 @@ typedef Elf32_Addr Elf32_Conflict;
 
 #define R_TILEGX_NUM		130
 
-
-__END_DECLS
-
 #endif	/* elf.h */
diff --git a/tests/source/dotest b/tests/source/dotest
index bb0f664..241c021 100755
--- a/tests/source/dotest
+++ b/tests/source/dotest
@@ -109,6 +109,15 @@ testit src.space
 
 
 #
+# Make sure we don't keep re-importing stuff into elf.h that
+# breaks non-GNU systems. #507470
+#
+grep -E "features.h|_DECLS" "${top_srcdir}"/elf.h > src.elf.h
+testit src.elf.h
+
+
+
+#
 # Python checks
 #
 if pyflakes </dev/null 2>/dev/null; then