diff --git a/compat/aix/math.h b/compat/aix/math.h
index 65a89c4565..dee13c8dd7 100644
--- a/compat/aix/math.h
+++ b/compat/aix/math.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_COMPAT_AIX_MATH_H
-#define FFMPEG_COMPAT_AIX_MATH_H
+#ifndef COMPAT_AIX_MATH_H
+#define COMPAT_AIX_MATH_H
 
 #define class class_in_math_h_causes_problems
 
@@ -28,4 +28,4 @@
 
 #undef class
 
-#endif /* FFMPEG_COMPAT_AIX_MATH_H */
+#endif /* COMPAT_AIX_MATH_H */
diff --git a/compat/msvcrt/snprintf.h b/compat/msvcrt/snprintf.h
index f02113c5a2..cd47953e87 100644
--- a/compat/msvcrt/snprintf.h
+++ b/compat/msvcrt/snprintf.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef COMPAT_SNPRINTF_H
-#define COMPAT_SNPRINTF_H
+#ifndef COMPAT_MSVCRT_SNPRINTF_H
+#define COMPAT_MSVCRT_SNPRINTF_H
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -35,4 +35,4 @@ int avpriv_vsnprintf(char *s, size_t n, const char *fmt, va_list ap);
 #define _snprintf avpriv_snprintf
 #define vsnprintf avpriv_vsnprintf
 
-#endif /* COMPAT_SNPRINTF_H */
+#endif /* COMPAT_MSVCRT_SNPRINTF_H */
diff --git a/compat/os2threads.h b/compat/os2threads.h
index f8fb2c8c63..7c0fe13af3 100644
--- a/compat/os2threads.h
+++ b/compat/os2threads.h
@@ -23,8 +23,8 @@
  * os2threads to pthreads wrapper
  */
 
-#ifndef AVCODEC_OS2PTHREADS_H
-#define AVCODEC_OS2PTHREADS_H
+#ifndef COMPAT_OS2THREADS_H
+#define COMPAT_OS2THREADS_H
 
 #define INCL_DOS
 #include <os2.h>
@@ -190,4 +190,4 @@ static av_always_inline int pthread_once(pthread_once_t *once_control, void (*in
 
     return 0;
 }
-#endif /* AVCODEC_OS2PTHREADS_H */
+#endif /* COMPAT_OS2THREADS_H */
diff --git a/compat/tms470/math.h b/compat/tms470/math.h
index 6234cc597b..0a42743a0b 100644
--- a/compat/tms470/math.h
+++ b/compat/tms470/math.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_COMPAT_TMS470_MATH_H
-#define FFMPEG_COMPAT_TMS470_MATH_H
+#ifndef COMPAT_TMS470_MATH_H
+#define COMPAT_TMS470_MATH_H
 
 #include_next <math.h>
 
@@ -27,4 +27,4 @@
 #define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
 #define NAN      (*(const float*)((const unsigned []){ 0x7fc00000 }))
 
-#endif /* FFMPEG_COMPAT_TMS470_MATH_H */
+#endif /* COMPAT_TMS470_MATH_H */
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index c327962735..4ac2a995b8 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
  * w32threads to pthreads wrapper
  */
 
-#ifndef FFMPEG_COMPAT_W32PTHREADS_H
-#define FFMPEG_COMPAT_W32PTHREADS_H
+#ifndef COMPAT_W32PTHREADS_H
+#define 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
@@ -415,4 +415,4 @@ static av_unused void w32thread_init(void)
 
 }
 
-#endif /* FFMPEG_COMPAT_W32PTHREADS_H */
+#endif /* COMPAT_W32PTHREADS_H */
diff --git a/libavcodec/aacps.h b/libavcodec/aacps.h
index 54f9d99177..61edce3549 100644
--- a/libavcodec/aacps.h
+++ b/libavcodec/aacps.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PS_H
-#define AVCODEC_PS_H
+#ifndef AVCODEC_AACPS_H
+#define AVCODEC_AACPS_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ void AAC_RENAME(ff_ps_ctx_init)(PSContext *ps);
 int AAC_RENAME(ff_ps_read_data)(AVCodecContext *avctx, GetBitContext *gb, PSContext *ps, int bits_left);
 int AAC_RENAME(ff_ps_apply)(AVCodecContext *avctx, PSContext *ps, INTFLOAT L[2][38][64], INTFLOAT R[2][38][64], int top);
 
-#endif /* AVCODEC_PS_H */
+#endif /* AVCODEC_AACPS_H */
diff --git a/libavcodec/aacps_fixed_tablegen.h b/libavcodec/aacps_fixed_tablegen.h
index 01f2eced64..8b82deb596 100644
--- a/libavcodec/aacps_fixed_tablegen.h
+++ b/libavcodec/aacps_fixed_tablegen.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef AACPS_FIXED_TABLEGEN_H
-#define AACPS_FIXED_TABLEGEN_H
+#ifndef AVCODEC_AACPS_FIXED_TABLEGEN_H
+#define AVCODEC_AACPS_FIXED_TABLEGEN_H
 
 #include <math.h>
 #include <stdint.h>
@@ -400,4 +400,4 @@ static void ps_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* AACPS_FIXED_TABLEGEN_H */
+#endif /* AVCODEC_AACPS_FIXED_TABLEGEN_H */
diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h
index 0bd51ccf57..0ac4f68d68 100644
--- a/libavcodec/aacps_tablegen.h
+++ b/libavcodec/aacps_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AACPS_TABLEGEN_H
-#define AACPS_TABLEGEN_H
+#ifndef AVCODEC_AACPS_TABLEGEN_H
+#define AVCODEC_AACPS_TABLEGEN_H
 
 #include <math.h>
 #include <stdint.h>
@@ -214,4 +214,4 @@ static av_cold void ps_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* AACPS_TABLEGEN_H */
+#endif /* AVCODEC_AACPS_TABLEGEN_H */
diff --git a/libavcodec/aacpsdsp.h b/libavcodec/aacpsdsp.h
index c194bbe3ae..ad9bbb81bd 100644
--- a/libavcodec/aacpsdsp.h
+++ b/libavcodec/aacpsdsp.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBAVCODEC_AACPSDSP_H
-#define LIBAVCODEC_AACPSDSP_H
+#ifndef AVCODEC_AACPSDSP_H
+#define AVCODEC_AACPSDSP_H
 
 #include "aac_defines.h"
 
@@ -54,4 +54,4 @@ void ff_psdsp_init_arm(PSDSPContext *s);
 void ff_psdsp_init_mips(PSDSPContext *s);
 void ff_psdsp_init_x86(PSDSPContext *s);
 
-#endif /* LIBAVCODEC_AACPSDSP_H */
+#endif /* AVCODEC_AACPSDSP_H */
diff --git a/libavcodec/bswapdsp.h b/libavcodec/bswapdsp.h
index f167d77fea..4d19092254 100644
--- a/libavcodec/bswapdsp.h
+++ b/libavcodec/bswapdsp.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_BSWAP_BUF_H
-#define AVCODEC_BSWAP_BUF_H
+#ifndef AVCODEC_BSWAPDSP_H
+#define AVCODEC_BSWAPDSP_H
 
 #include <stdint.h>
 
@@ -29,4 +29,4 @@ typedef struct BswapDSPContext {
 void ff_bswapdsp_init(BswapDSPContext *c);
 void ff_bswapdsp_init_x86(BswapDSPContext *c);
 
-#endif /* AVCODEC_BSWAP_BUF_H */
+#endif /* AVCODEC_BSWAPDSP_H */
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index 9e3ab86a82..22c93992f2 100644
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DXVA_H
-#define AVCODEC_DXVA_H
+#ifndef AVCODEC_DXVA2_H
+#define AVCODEC_DXVA2_H
 
 /**
  * @file
@@ -90,4 +90,4 @@ struct dxva_context {
  * @}
  */
 
-#endif /* AVCODEC_DXVA_H */
+#endif /* AVCODEC_DXVA2_H */
diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h
index c2499e5bf7..ad89f8291d 100644
--- a/libavcodec/dxva2_internal.h
+++ b/libavcodec/dxva2_internal.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DXVA_INTERNAL_H
-#define AVCODEC_DXVA_INTERNAL_H
+#ifndef AVCODEC_DXVA2_INTERNAL_H
+#define AVCODEC_DXVA2_INTERNAL_H
 
 #define COBJMACROS
 
@@ -118,4 +118,4 @@ int ff_dxva2_common_end_frame(AVCodecContext *, AVFrame *,
                                                   DECODER_BUFFER_DESC *bs,
                                                   DECODER_BUFFER_DESC *slice));
 
-#endif /* AVCODEC_DXVA_INTERNAL_H */
+#endif /* AVCODEC_DXVA2_INTERNAL_H */
diff --git a/libavcodec/g729postfilter.h b/libavcodec/g729postfilter.h
index 89e3e40cea..5c2aaf235b 100644
--- a/libavcodec/g729postfilter.h
+++ b/libavcodec/g729postfilter.h
@@ -18,8 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_G729POSTFILTER_H
-#define FFMPEG_G729POSTFILTER_H
+#ifndef AVCODEC_G729POSTFILTER_H
+#define AVCODEC_G729POSTFILTER_H
 
 #include <stdint.h>
 #include "audiodsp.h"
@@ -113,4 +113,4 @@ void ff_g729_postfilter(AudioDSPContext *adsp, int16_t* ht_prev_data, int* voici
 int16_t ff_g729_adaptive_gain_control(int gain_before, int gain_after, int16_t *speech,
                                    int subframe_size, int16_t gain_prev);
 
-#endif // FFMPEG_G729POSTFILTER_H
+#endif // AVCODEC_G729POSTFILTER_H
diff --git a/libavcodec/gif.h b/libavcodec/gif.h
index b4cf66546c..9f35778857 100644
--- a/libavcodec/gif.h
+++ b/libavcodec/gif.h
@@ -26,8 +26,8 @@
  * GIF format definitions.
  */
 
-#ifndef AVCODEC_GIFDEFS_H
-#define AVCODEC_GIFDEFS_H
+#ifndef AVCODEC_GIF_H
+#define AVCODEC_GIF_H
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ static const uint8_t gif89a_sig[6] = "GIF89a";
 #define GIF_APP_EXT_LABEL           0xff
 #define NETSCAPE_EXT_STR            "NETSCAPE2.0"
 
-#endif /* AVCODEC_GIFDEFS_H */
+#endif /* AVCODEC_GIF_H */
diff --git a/libavcodec/lossless_audiodsp.h b/libavcodec/lossless_audiodsp.h
index 9ce2e63d45..79ca30d470 100644
--- a/libavcodec/lossless_audiodsp.h
+++ b/libavcodec/lossless_audiodsp.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_LLAUDDSP_H
-#define AVCODEC_LLAUDDSP_H
+#ifndef AVCODEC_LOSSLESS_AUDIODSP_H
+#define AVCODEC_LOSSLESS_AUDIODSP_H
 
 #include <stdint.h>
 
@@ -43,4 +43,4 @@ void ff_llauddsp_init_arm(LLAudDSPContext *c);
 void ff_llauddsp_init_ppc(LLAudDSPContext *c);
 void ff_llauddsp_init_x86(LLAudDSPContext *c);
 
-#endif /* AVCODEC_LLAUDDSP_H */
+#endif /* AVCODEC_LOSSLESS_AUDIODSP_H */
diff --git a/libavcodec/mips/aacdec_mips.h b/libavcodec/mips/aacdec_mips.h
index 054a9fba62..c4f6438570 100644
--- a/libavcodec/mips/aacdec_mips.h
+++ b/libavcodec/mips/aacdec_mips.h
@@ -54,8 +54,8 @@
  * Reference: libavcodec/aacdec.c
  */
 
-#ifndef AVCODEC_MIPS_AACDEC_FLOAT_H
-#define AVCODEC_MIPS_AACDEC_FLOAT_H
+#ifndef AVCODEC_MIPS_AACDEC_MIPS_H
+#define AVCODEC_MIPS_AACDEC_MIPS_H
 
 #include "libavcodec/aac.h"
 #include "libavutil/mips/asmdefs.h"
@@ -248,4 +248,4 @@ static inline float *VMUL4S_mips(float *dst, const float *v, unsigned idx,
 #define VMUL4S VMUL4S_mips
 #endif /* HAVE_INLINE_ASM && HAVE_MIPSFPU */
 
-#endif /* AVCODEC_MIPS_AACDEC_FLOAT_H */
+#endif /* AVCODEC_MIPS_AACDEC_MIPS_H */
diff --git a/libavcodec/mips/aacsbr_mips.h b/libavcodec/mips/aacsbr_mips.h
index da8389f484..13e55d26ea 100644
--- a/libavcodec/mips/aacsbr_mips.h
+++ b/libavcodec/mips/aacsbr_mips.h
@@ -51,8 +51,8 @@
  * Reference: libavcodec/aacsbr.c
  */
 
-#ifndef AVCODEC_MIPS_AACSBR_FLOAT_H
-#define AVCODEC_MIPS_AACSBR_FLOAT_H
+#ifndef AVCODEC_MIPS_AACSBR_MIPS_H
+#define AVCODEC_MIPS_AACSBR_MIPS_H
 
 #include "libavcodec/aac.h"
 #include "libavcodec/sbr.h"
@@ -491,4 +491,4 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct,
 #endif /* HAVE_MIPSFPU */
 #endif /* HAVE_INLINE_ASM */
 
-#endif /* AVCODEC_MIPS_AACSBR_FLOAT_H */
+#endif /* AVCODEC_MIPS_AACSBR_MIPS_H */
diff --git a/libavcodec/mips/amrwbdec_mips.h b/libavcodec/mips/amrwbdec_mips.h
index b3355fb45b..ec46f95224 100644
--- a/libavcodec/mips/amrwbdec_mips.h
+++ b/libavcodec/mips/amrwbdec_mips.h
@@ -49,8 +49,8 @@
  * @file
  * Reference: libavcodec/amrwbdec.c
  */
-#ifndef AVCODEC_AMRWBDEC_MIPS_H
-#define AVCODEC_AMRWBDEC_MIPS_H
+#ifndef AVCODEC_MIPS_AMRWBDEC_MIPS_H
+#define AVCODEC_MIPS_AMRWBDEC_MIPS_H
 #include "config.h"
 
 #if HAVE_MIPSFPU && HAVE_INLINE_ASM
@@ -59,4 +59,4 @@ void ff_hb_fir_filter_mips(float *out, const float fir_coef[],
 #define hb_fir_filter ff_hb_fir_filter_mips
 #endif
 
-#endif /* AVCODEC_AMRWBDEC_MIPS_H  */
+#endif /* AVCODEC_MIPS_AMRWBDEC_MIPS_H  */
diff --git a/libavcodec/mips/h264chroma_mips.h b/libavcodec/mips/h264chroma_mips.h
index 7a373b8395..0ef6c74691 100644
--- a/libavcodec/mips/h264chroma_mips.h
+++ b/libavcodec/mips/h264chroma_mips.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef H264_CHROMA_MIPS_H
-#define H264_CHROMA_MIPS_H
+#ifndef AVCODEC_MIPS_H264CHROMA_MIPS_H
+#define AVCODEC_MIPS_H264CHROMA_MIPS_H
 
 #include "libavcodec/h264.h"
 void ff_put_h264_chroma_mc8_msa(uint8_t *dst, uint8_t *src, int stride,
@@ -44,4 +44,4 @@ void ff_put_h264_chroma_mc4_mmi(uint8_t *dst, uint8_t *src, int stride,
 void ff_avg_h264_chroma_mc4_mmi(uint8_t *dst, uint8_t *src, int stride,
         int h, int x, int y);
 
-#endif /* H264_CHROMA_MIPS_H */
+#endif /* AVCODEC_MIPS_H264CHROMA_MIPS_H */
diff --git a/libavcodec/mips/h264dsp_mips.h b/libavcodec/mips/h264dsp_mips.h
index 3fdbf4fb5e..2fdfd11d95 100644
--- a/libavcodec/mips/h264dsp_mips.h
+++ b/libavcodec/mips/h264dsp_mips.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef H264_DSP_MIPS_H
-#define H264_DSP_MIPS_H
+#ifndef AVCODEC_MIPS_H264DSP_MIPS_H
+#define AVCODEC_MIPS_H264DSP_MIPS_H
 
 #include "libavcodec/h264.h"
 #include "constants.h"
@@ -574,4 +574,4 @@ void ff_avg_h264_qpel4_mc23_mmi(uint8_t *dst, const uint8_t *src,
 void ff_avg_h264_qpel4_mc33_mmi(uint8_t *dst, const uint8_t *src,
         ptrdiff_t dst_stride);
 
-#endif  // #ifndef H264_DSP_MIPS_H
+#endif  // #ifndef AVCODEC_MIPS_H264DSP_MIPS_H
diff --git a/libavcodec/mips/h264pred_mips.h b/libavcodec/mips/h264pred_mips.h
index d7d12c5a20..136e291252 100644
--- a/libavcodec/mips/h264pred_mips.h
+++ b/libavcodec/mips/h264pred_mips.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef H264_PRED_MIPS_H
-#define H264_PRED_MIPS_H
+#ifndef AVCODEC_MIPS_H264PRED_MIPS_H
+#define AVCODEC_MIPS_H264PRED_MIPS_H
 
 #include "constants.h"
 #include "libavcodec/h264pred.h"
@@ -45,4 +45,4 @@ void ff_pred8x8_dc_8_mmi(uint8_t *src, ptrdiff_t stride);
 void ff_pred8x16_vertical_8_mmi(uint8_t *src, ptrdiff_t stride);
 void ff_pred8x16_horizontal_8_mmi(uint8_t *src, ptrdiff_t stride);
 
-#endif  /* H264_PRED_MIPS_H */
+#endif  /* AVCODEC_MIPS_H264PRED_MIPS_H */
diff --git a/libavcodec/mips/lsp_mips.h b/libavcodec/mips/lsp_mips.h
index 9d7521865b..1e899bcd7c 100644
--- a/libavcodec/mips/lsp_mips.h
+++ b/libavcodec/mips/lsp_mips.h
@@ -51,8 +51,8 @@
  * @file
  * Reference: libavcodec/lsp.c
  */
-#ifndef AVCODEC_LSP_MIPS_H
-#define AVCODEC_LSP_MIPS_H
+#ifndef AVCODEC_MIPS_LSP_MIPS_H
+#define AVCODEC_MIPS_LSP_MIPS_H
 
 #if HAVE_MIPSFPU && HAVE_INLINE_ASM
 #include "libavutil/mips/asmdefs.h"
@@ -108,4 +108,4 @@ static av_always_inline void ff_lsp2polyf_mips(const double *lsp, double *f, int
 }
 #define ff_lsp2polyf ff_lsp2polyf_mips
 #endif /* HAVE_MIPSFPU && HAVE_INLINE_ASM */
-#endif /* AVCODEC_LSP_MIPS_H */
+#endif /* AVCODEC_MIPS_LSP_MIPS_H */
diff --git a/libavcodec/mips/mpegvideo_mips.h b/libavcodec/mips/mpegvideo_mips.h
index decacd4c62..760d7b3295 100644
--- a/libavcodec/mips/mpegvideo_mips.h
+++ b/libavcodec/mips/mpegvideo_mips.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MPEGVIDEO_MIPS_H
-#define MPEGVIDEO_MIPS_H
+#ifndef AVCODEC_MIPS_MPEGVIDEO_MIPS_H
+#define AVCODEC_MIPS_MPEGVIDEO_MIPS_H
 
 #include "libavcodec/mpegvideo.h"
 
@@ -35,4 +35,4 @@ void ff_dct_unquantize_mpeg2_intra_mmi(MpegEncContext *s, int16_t *block,
         int n, int qscale);
 void ff_denoise_dct_mmi(MpegEncContext *s, int16_t *block);
 
-#endif /* MPEGVIDEO_MIPS_H */
+#endif /* AVCODEC_MIPS_MPEGVIDEO_MIPS_H */
diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h
index 2d3c02ae87..3b3a8d7341 100644
--- a/libavcodec/motion_est.h
+++ b/libavcodec/motion_est.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_MOTIONEST_H
-#define AVCODEC_MOTIONEST_H
+#ifndef AVCODEC_MOTION_EST_H
+#define AVCODEC_MOTION_EST_H
 
 #include <stdint.h>
 
@@ -132,4 +132,4 @@ void ff_fix_long_mvs(struct MpegEncContext *s, uint8_t *field_select_table,
                      int field_select, int16_t (*mv_table)[2], int f_code,
                      int type, int truncate);
 
-#endif /* AVCODEC_MOTIONEST_H */
+#endif /* AVCODEC_MOTION_EST_H */
diff --git a/libavcodec/on2avcdata.h b/libavcodec/on2avcdata.h
index 7f498e58e4..95d88e0252 100644
--- a/libavcodec/on2avcdata.h
+++ b/libavcodec/on2avcdata.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ON2AVC_DATA_H
-#define AVCODEC_ON2AVC_DATA_H
+#ifndef AVCODEC_ON2AVCDATA_H
+#define AVCODEC_ON2AVCDATA_H
 
 #include <stdint.h>
 
@@ -79,4 +79,4 @@ extern const float ff_on2avc_ctab_2[2048];
 extern const float ff_on2avc_ctab_3[2048];
 extern const float ff_on2avc_ctab_4[2048];
 
-#endif /* AVCODEC_ON2AVC_DATA_H */
+#endif /* AVCODEC_ON2AVCDATA_H */
diff --git a/libavcodec/tscc2data.h b/libavcodec/tscc2data.h
index 4586da77a5..7806267545 100644
--- a/libavcodec/tscc2data.h
+++ b/libavcodec/tscc2data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_TSCC2_DATA_H
-#define AVCODEC_TSCC2_DATA_H
+#ifndef AVCODEC_TSCC2DATA_H
+#define AVCODEC_TSCC2DATA_H
 
 #include <stdint.h>
 
@@ -932,4 +932,4 @@ static const uint8_t *tscc2_ac_vlc_bits[NUM_VLC_SETS] = {
     ac_vlc_descC_bits,
 };
 
-#endif /* AVCODEC_TSCC2_DATA_H */
+#endif /* AVCODEC_TSCC2DATA_H */
diff --git a/libavcodec/vorbis_parser.h b/libavcodec/vorbis_parser.h
index 06e48bd3b0..81fda3b084 100644
--- a/libavcodec/vorbis_parser.h
+++ b/libavcodec/vorbis_parser.h
@@ -24,8 +24,8 @@
  * Determines the duration for each packet.
  */
 
-#ifndef AVCODEC_VORBIS_PARSE_H
-#define AVCODEC_VORBIS_PARSE_H
+#ifndef AVCODEC_VORBIS_PARSER_H
+#define AVCODEC_VORBIS_PARSER_H
 
 #include <stdint.h>
 
@@ -75,4 +75,4 @@ int av_vorbis_parse_frame(AVVorbisParseContext *s, const uint8_t *buf,
 
 void av_vorbis_parse_reset(AVVorbisParseContext *s);
 
-#endif /* AVCODEC_VORBIS_PARSE_H */
+#endif /* AVCODEC_VORBIS_PARSER_H */
diff --git a/libavcodec/vorbis_parser_internal.h b/libavcodec/vorbis_parser_internal.h
index 98e48524a4..691a842385 100644
--- a/libavcodec/vorbis_parser_internal.h
+++ b/libavcodec/vorbis_parser_internal.h
@@ -25,8 +25,8 @@
  * Determines the duration for each packet.
  */
 
-#ifndef AVCODEC_VORBIS_PARSER_H
-#define AVCODEC_VORBIS_PARSER_H
+#ifndef AVCODEC_VORBIS_PARSER_INTERNAL_H
+#define AVCODEC_VORBIS_PARSER_INTERNAL_H
 
 #include "avcodec.h"
 #include "vorbis_parser.h"
@@ -43,4 +43,4 @@ struct AVVorbisParseContext {
     int prev_mask;              ///< bitmask used to get the previous mode flag in each packet
 };
 
-#endif /* AVCODEC_VORBIS_PARSER_H */
+#endif /* AVCODEC_VORBIS_PARSER_INTERNAL_H */
diff --git a/libavcodec/x86/diracdsp_mmx.h b/libavcodec/x86/diracdsp_mmx.h
index 89858544f3..d15dc9137d 100644
--- a/libavcodec/x86/diracdsp_mmx.h
+++ b/libavcodec/x86/diracdsp_mmx.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_X86_DIRACDSP_H
-#define AVCODEC_X86_DIRACDSP_H
+#ifndef AVCODEC_X86_DIRACDSP_MMX_H
+#define AVCODEC_X86_DIRACDSP_MMX_H
 
 #include "libavcodec/diracdsp.h"
 
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
index b17da10973..f26eaf9a64 100644
--- a/libavdevice/dshow_capture.h
+++ b/libavdevice/dshow_capture.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_DSHOW_H
-#define AVDEVICE_DSHOW_H
+#ifndef AVDEVICE_DSHOW_CAPTURE_H
+#define AVDEVICE_DSHOW_CAPTURE_H
 
 #define DSHOWDEBUG 0
 
@@ -349,4 +349,4 @@ HRESULT dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2,
 
 void dshow_show_filter_properties(IBaseFilter *pFilter, AVFormatContext *avctx);
 
-#endif /* AVDEVICE_DSHOW_H */
+#endif /* AVDEVICE_DSHOW_CAPTURE_H */
diff --git a/libavdevice/opengl_enc_shaders.h b/libavdevice/opengl_enc_shaders.h
index ed8b3d3041..67ee0ae7b4 100644
--- a/libavdevice/opengl_enc_shaders.h
+++ b/libavdevice/opengl_enc_shaders.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_OPENGL_SHADERS_H
-#define AVDEVICE_OPENGL_SHADERS_H
+#ifndef AVDEVICE_OPENGL_ENC_SHADERS_H
+#define AVDEVICE_OPENGL_ENC_SHADERS_H
 
 #include "libavutil/pixfmt.h"
 
@@ -185,4 +185,4 @@ static const char * const FF_OPENGL_FRAGMENT_SHADER_GRAY =
         "gl_FragColor = vec4(c, c, c, 1.0);"
     "}";
 
-#endif /* AVDEVICE_OPENGL_SHADERS_H */
+#endif /* AVDEVICE_OPENGL_ENC_SHADERS_H */
diff --git a/libavfilter/af_volume.h b/libavfilter/af_volume.h
index aff75267fe..af46e34ff6 100644
--- a/libavfilter/af_volume.h
+++ b/libavfilter/af_volume.h
@@ -21,8 +21,8 @@
  * audio volume filter
  */
 
-#ifndef AVFILTER_AF_VOLUME_H
-#define AVFILTER_AF_VOLUME_H
+#ifndef AVFILTER_VOLUME_H
+#define AVFILTER_VOLUME_H
 
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
@@ -90,4 +90,4 @@ typedef struct VolumeContext {
 
 void ff_volume_init_x86(VolumeContext *vol);
 
-#endif /* AVFILTER_AF_VOLUME_H */
+#endif /* AVFILTER_VOLUME_H */
diff --git a/libavfilter/avf_showcqt.h b/libavfilter/avf_showcqt.h
index a018075ad2..a48b2b04fc 100644
--- a/libavfilter/avf_showcqt.h
+++ b/libavfilter/avf_showcqt.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFILTER_AVF_SHOWCQT_H
-#define AVFILTER_AVF_SHOWCQT_H
+#ifndef AVFILTER_SHOWCQT_H
+#define AVFILTER_SHOWCQT_H
 
 #include "libavcodec/avfft.h"
 #include "avfilter.h"
diff --git a/libavfilter/framepool.h b/libavfilter/framepool.h
index bb6bb10f27..2a6c9e8636 100644
--- a/libavfilter/framepool.h
+++ b/libavfilter/framepool.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_FRAME_POOL_H
-#define AVUTIL_FRAME_POOL_H
+#ifndef AVFILTER_FRAMEPOOL_H
+#define AVFILTER_FRAMEPOOL_H
 
 #include "libavutil/buffer.h"
 #include "libavutil/frame.h"
@@ -81,4 +81,4 @@ int ff_video_frame_pool_get_config(FFVideoFramePool *pool,
 AVFrame *ff_video_frame_pool_get(FFVideoFramePool *pool);
 
 
-#endif /* AVUTIL_FRAME_POOL_H */
+#endif /* AVFILTER_FRAMEPOOL_H */
diff --git a/libavfilter/opencl_allkernels.h b/libavfilter/opencl_allkernels.h
index aca02e0456..57b650d27b 100644
--- a/libavfilter/opencl_allkernels.h
+++ b/libavfilter/opencl_allkernels.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFILTER_OPENCL_ALLKERNEL_H
-#define AVFILTER_OPENCL_ALLKERNEL_H
+#ifndef AVFILTER_OPENCL_ALLKERNELS_H
+#define AVFILTER_OPENCL_ALLKERNELS_H
 
 #include "avfilter.h"
 #include "config.h"
 
 void ff_opencl_register_filter_kernel_code_all(void);
 
-#endif /* AVFILTER_OPENCL_ALLKERNEL_H */
+#endif /* AVFILTER_OPENCL_ALLKERNELS_H */
diff --git a/libavfilter/psnr.h b/libavfilter/psnr.h
index efe94da23c..bbc4541135 100644
--- a/libavfilter/psnr.h
+++ b/libavfilter/psnr.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBAVFILTER_PSNR_H
-#define LIBAVFILTER_PSNR_H
+#ifndef AVFILTER_PSNR_H
+#define AVFILTER_PSNR_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -30,4 +30,4 @@ typedef struct PSNRDSPContext {
 
 void ff_psnr_init_x86(PSNRDSPContext *dsp, int bpp);
 
-#endif /* LIBAVFILTER_PSNR_H */
+#endif /* AVFILTER_PSNR_H */
diff --git a/libavfilter/ssim.h b/libavfilter/ssim.h
index cd3a6eef4b..ac0395a22a 100644
--- a/libavfilter/ssim.h
+++ b/libavfilter/ssim.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBAVFILTER_SSIM_H
-#define LIBAVFILTER_SSIM_H
+#ifndef AVFILTER_SSIM_H
+#define AVFILTER_SSIM_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -33,4 +33,4 @@ typedef struct SSIMDSPContext {
 
 void ff_ssim_init_x86(SSIMDSPContext *dsp);
 
-#endif /* LIBAVFILTER_SSIM_H */
+#endif /* AVFILTER_SSIM_H */
diff --git a/libavfilter/stereo3d.h b/libavfilter/stereo3d.h
index e7a84568ee..54611d1286 100644
--- a/libavfilter/stereo3d.h
+++ b/libavfilter/stereo3d.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBAVFILTER_STEREO3D_H
-#define LIBAVFILTER_STEREO3D_H
+#ifndef AVFILTER_STEREO3D_H
+#define AVFILTER_STEREO3D_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -33,4 +33,4 @@ typedef struct Stereo3DDSPContext {
 
 void ff_stereo3d_init_x86(Stereo3DDSPContext *dsp);
 
-#endif /* LIBAVFILTER_STEREO3D_H */
+#endif /* AVFILTER_STEREO3D_H */
diff --git a/libavfilter/vf_hqdn3d.h b/libavfilter/vf_hqdn3d.h
index be55400f01..03a79a108c 100644
--- a/libavfilter/vf_hqdn3d.h
+++ b/libavfilter/vf_hqdn3d.h
@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef AVFILTER_VF_HQDN3D_H
-#define AVFILTER_VF_HQDN3D_H
+#ifndef AVFILTER_HQDN3D_H
+#define AVFILTER_HQDN3D_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -46,4 +46,4 @@ typedef struct HQDN3DContext {
 
 void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d);
 
-#endif /* AVFILTER_VF_HQDN3D_H */
+#endif /* AVFILTER_HQDN3D_H */
diff --git a/libavutil/mips/libm_mips.h b/libavutil/mips/libm_mips.h
index 8853bbc751..757867bce9 100644
--- a/libavutil/mips/libm_mips.h
+++ b/libavutil/mips/libm_mips.h
@@ -50,8 +50,8 @@
  * MIPS optimization for some libm functions
  */
 
-#ifndef AVUTIL_LIBM_MIPS_H
-#define AVUTIL_LIBM_MIPS_H
+#ifndef AVUTIL_MIPS_LIBM_MIPS_H
+#define AVUTIL_MIPS_LIBM_MIPS_H
 
 static av_always_inline av_const long int lrintf_mips(float x)
 {
@@ -70,4 +70,4 @@ static av_always_inline av_const long int lrintf_mips(float x)
 #define lrintf(x)   lrintf_mips(x)
 
 #define HAVE_LRINTF 1
-#endif /* AVUTIL_LIBM_MIPS_H */
+#endif /* AVUTIL_MIPS_LIBM_MIPS_H */
diff --git a/libavutil/opencl.h b/libavutil/opencl.h
index 168461dc34..b709927c42 100644
--- a/libavutil/opencl.h
+++ b/libavutil/opencl.h
@@ -29,8 +29,8 @@
  * change without prior notice.
  */
 
-#ifndef LIBAVUTIL_OPENCL_H
-#define LIBAVUTIL_OPENCL_H
+#ifndef AVUTIL_OPENCL_H
+#define AVUTIL_OPENCL_H
 
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS 1
 #ifdef __APPLE__
@@ -289,4 +289,4 @@ void av_opencl_uninit(void);
 int64_t av_opencl_benchmark(AVOpenCLDeviceNode *device, cl_platform_id platform,
                             int64_t (*benchmark)(AVOpenCLExternalEnv *ext_opencl_env));
 
-#endif /* LIBAVUTIL_OPENCL_H */
+#endif /* AVUTIL_OPENCL_H */
diff --git a/libpostproc/version.h b/libpostproc/version.h
index db557a5b81..8f62582163 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef POSTPROC_POSTPROCESS_VERSION_H
-#define POSTPROC_POSTPROCESS_VERSION_H
+#ifndef POSTPROC_VERSION_H
+#define POSTPROC_VERSION_H
 
 /**
  * @file
@@ -46,4 +46,4 @@
 #define FF_API_QP_TYPE     (LIBPOSTPROC_VERSION_MAJOR < 55)
 #endif
 
-#endif /* POSTPROC_POSTPROCESS_VERSION_H */
+#endif /* POSTPROC_VERSION_H */
diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h
index 2e983df286..1ca30c2a65 100644
--- a/libswresample/audioconvert.h
+++ b/libswresample/audioconvert.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWR_AUDIOCONVERT_H
-#define SWR_AUDIOCONVERT_H
+#ifndef SWRESAMPLE_AUDIOCONVERT_H
+#define SWRESAMPLE_AUDIOCONVERT_H
 
 /**
  * @file
@@ -75,4 +75,4 @@ void swri_audio_convert_free(AudioConvert **ctx);
  */
 int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len);
 
-#endif /* AUDIOCONVERT_H */
+#endif /* SWRESAMPLE_AUDIOCONVERT_H */
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index 5c46ddaf38..5d61de47af 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWR_INTERNAL_H
-#define SWR_INTERNAL_H
+#ifndef SWRESAMPLE_SWRESAMPLE_INTERNAL_H
+#define SWRESAMPLE_SWRESAMPLE_INTERNAL_H
 
 #include "swresample.h"
 #include "libavutil/channel_layout.h"
diff --git a/libswresample/version.h b/libswresample/version.h
index 8f6ecb418a..830f00e430 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SWR_VERSION_H
-#define SWR_VERSION_H
+#ifndef SWRESAMPLE_VERSION_H
+#define SWRESAMPLE_VERSION_H
 
 /**
  * @file
@@ -42,4 +42,4 @@
 
 #define LIBSWRESAMPLE_IDENT        "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
 
-#endif /* SWR_VERSION_H */
+#endif /* SWRESAMPLE_VERSION_H */
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 98c0216464..5c07f89b75 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef CHECKASM_H
-#define CHECKASM_H
+#ifndef TESTS_CHECKASM_CHECKASM_H
+#define TESTS_CHECKASM_CHECKASM_H
 
 #include <stdint.h>
 #include "config.h"