--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@
 # Perform some platform independent checks on the gnulib code.
 check: \
   sc_prohibit_augmenting_PATH_via_TESTS_ENVIRONMENT			\
+  sc_pragma_columns							\
   sc_prefer_ac_check_funcs_once
 
 sc_prefer_ac_check_funcs_once:
@@ -32,6 +33,18 @@
 		 "  see <$$url>" 1>&2; exit 1; } || :			\
 	else :; fi
 
+sc_pragma_columns:
+	if test -d .git; then						\
+          git ls-files|grep '\.in\.h$$'					\
+              | xargs grep -l '^@PRAGMA_SYSTEM_HEADER@'			\
+              | xargs grep -L '^@PRAGMA_COLUMNS@'			\
+              | grep .							\
+	    && { printf '%s\n'						\
+                   'the files listed above use @PRAGMA_SYSTEM_HEADER@'	\
+                   'without also using @PRAGMA_COLUMNS@' 1>&2;		\
+		 exit 1; } || :;					\
+	else :; fi
+
 # Regenerate some files that are stored in the repository.
 regen: MODULES.html