diff --git a/src/Makefile.am b/src/Makefile.am
index 810083a98..ace768661 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,7 +113,9 @@ main_CPPFLAGS = $(HBCFLAGS)
 main_LDADD = libharfbuzz.la $(HBLIBS)
 
 TESTS = \
-	check-internal-symbols.sh
+	check-header-guards.sh \
+	check-internal-symbols.sh \
+	$(NULL)
 
 if HAVE_ICU
 else
diff --git a/src/check-header-guards.sh b/src/check-header-guards.sh
new file mode 100755
index 000000000..b84fd68c5
--- /dev/null
+++ b/src/check-header-guards.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+LC_ALL=C
+export LC_ALL
+
+test -z "$srcdir" && srcdir=.
+stat=0
+
+cd "$srcdir"
+
+for x in *.h *.hh ; do
+	tag=`echo "$x" | tr 'a-z.-' 'A-Z_'`
+	lines=`grep "$tag" "$x" | wc -l`
+	if test "x$lines" != x3; then
+		echo "Ouch, header file $x does not have correct preprocessor guards"
+		stat=1
+	fi
+done
+
+exit $stat
diff --git a/src/check-libstdc++.sh b/src/check-libstdc++.sh
index 82e62d6fb..c0abcbe41 100755
--- a/src/check-libstdc++.sh
+++ b/src/check-libstdc++.sh
@@ -11,7 +11,6 @@ else
 fi
 
 test -z "$srcdir" && srcdir=.
-test -z "$MAKE" && MAKE=make
 stat=0
 
 so=.libs/libharfbuzz.so