diff --git a/compat/aix/math.h b/compat/aix/math.h
index 7c8134c8f5..caa181709d 100644
--- a/compat/aix/math.h
+++ b/compat/aix/math.h
@@ -1,9 +1,8 @@
-/*
- * Workaround aix-specific class() function clashing with libav class usage
- */
+/* Work around the class() function in AIX math.h clashing with identifiers
+ * named "class". */
 
-#ifndef COMPAT_AIX_MATH_H
-#define COMPAT_AIX_MATH_H
+#ifndef LIBAV_COMPAT_AIX_MATH_H
+#define LIBAV_COMPAT_AIX_MATH_H
 
 #define class class_in_math_h_causes_problems
 
@@ -11,4 +10,4 @@
 
 #undef class
 
-#endif /* COMPAT_AIX_MATH_H */
+#endif /* LIBAV_COMPAT_AIX_MATH_H */
diff --git a/compat/tms470/math.h b/compat/tms470/math.h
index 1104d744e7..ac8d3cdf54 100644
--- a/compat/tms470/math.h
+++ b/compat/tms470/math.h
@@ -1,3 +1,6 @@
+#ifndef LIBAV_COMPAT_TMS470_MATH_H
+#define LIBAV_COMPAT_TMS470_MATH_H
+
 #include_next <math.h>
 
 #undef INFINITY
@@ -5,3 +8,5 @@
 
 #define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
 #define NAN      (*(const float*)((const unsigned []){ 0x7fc00000 }))
+
+#endif /* LIBAV_COMPAT_TMS470_MATH_H */
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index a5ff6ac258..8b7ff6ba7a 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
  * w32threads to pthreads wrapper
  */
 
-#ifndef LIBAV_W32PTHREADS_H
-#define LIBAV_W32PTHREADS_H
+#ifndef LIBAV_COMPAT_W32PTHREADS_H
+#define LIBAV_COMPAT_W32PTHREADS_H
 
 /* Build up a pthread-like API using underlying Windows API. Have only static
  * methods so as to not conflict with a potentially linked in pthread-win32
@@ -276,4 +276,4 @@ static void w32thread_init(void)
 
 }
 
-#endif /* LIBAV_W32PTHREADS_H */
+#endif /* LIBAV_COMPAT_W32PTHREADS_H */
diff --git a/libavutil/arm/cpu.h b/libavutil/arm/cpu.h
index 91c959ab27..b45f30b1a1 100644
--- a/libavutil/arm/cpu.h
+++ b/libavutil/arm/cpu.h
@@ -29,4 +29,4 @@
 #define have_vfpv3(flags)   (HAVE_VFPV3   && ((flags) & AV_CPU_FLAG_VFPV3))
 #define have_neon(flags)    (HAVE_NEON    && ((flags) & AV_CPU_FLAG_NEON))
 
-#endif
+#endif /* AVUTIL_ARM_CPU_H */