diff --git a/cmdutils.h b/cmdutils.h
index 7f3db2af1a..83ea4ad39e 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_CMDUTILS_H
-#define FFMPEG_CMDUTILS_H
+#ifndef CMDUTILS_H
+#define CMDUTILS_H
 
 #include <stdint.h>
 
diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
index 1947b525ea..33affae24d 100755
--- a/tests/fate/source-check.sh
+++ b/tests/fate/source-check.sh
@@ -19,10 +19,12 @@ git grep -L -E "This file is part of FFmpeg|This file is part of libswresample|"
 echo Headers without standard inclusion guards:
 for f in `git ls-files | grep '\.h$'` ; do
     macro="`echo $f | sed \
-        -e '/\/\|^ff/!{s/\(.*\)/ffmpeg\/\1/}' \
         -e 's/^lib//' \
-        -e 's/[^A-Za-z0-9]\{1\,\}/_/g' \
-        -e 's/_\(a\|v\|av\)f_/_/' \
+        -e 's/[^A-Za-z0-9]\{1,\}/_/g' \
+        -e 's/_af_/_/' \
+        -e 's/_vf_/_/' \
+        -e 's/_avf_/_/' \
+        -e 's/_vaf_/_/' \
     | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 
     grep -L "^#define $macro$" $f