multiple inclusion guard cleanup

Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.

51 files changed, 97 insertions, 76 deletions

diff --git a/cmdutils.h b/cmdutils.h
index c99c8653fa..3bb1cd616b 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 LIBAV_CMDUTILS_H
+#define LIBAV_CMDUTILS_H
 
 #include <stdint.h>
 
@@ -295,4 +295,4 @@ extern AVFilter ffsink;
 int get_filtered_video_frame(AVFilterContext *sink, AVFrame *frame,
                              AVFilterBufferRef **picref, AVRational *pts_tb);
 
-#endif /* FFMPEG_CMDUTILS_H */
+#endif /* LIBAV_CMDUTILS_H */
diff --git a/ffserver.h b/ffserver.h
index 868b83bca4..43bc79c2c6 100644
--- a/ffserver.h
+++ b/ffserver.h
@@ -18,11 +18,12 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_FFSERVER_H
-#define FFMPEG_FFSERVER_H
+
+#ifndef LIBAV_FFSERVER_H
+#define LIBAV_FFSERVER_H
 
 /* interface between ffserver and modules */
 
 void ffserver_module_init(void);
 
-#endif /* FFMPEG_FFSERVER_H */
+#endif /* LIBAV_FFSERVER_H */
diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h
index 98895694a8..4486e1a9fc 100644
--- a/libavcodec/aac_tablegen.h
+++ b/libavcodec/aac_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AAC_TABLEGEN_H
-#define AAC_TABLEGEN_H
+#ifndef AVCODEC_AAC_TABLEGEN_H
+#define AVCODEC_AAC_TABLEGEN_H
 
 #include "aac_tablegen_decl.h"
 
@@ -40,4 +40,4 @@ void ff_aac_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* AAC_TABLEGEN_H */
+#endif /* AVCODEC_AAC_TABLEGEN_H */
diff --git a/libavcodec/aac_tablegen_decl.h b/libavcodec/aac_tablegen_decl.h
index ce4ecb5bf1..496ca0c677 100644
--- a/libavcodec/aac_tablegen_decl.h
+++ b/libavcodec/aac_tablegen_decl.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AAC_TABLEGEN_DECL_H
-#define AAC_TABLEGEN_DECL_H
+#ifndef AVCODEC_AAC_TABLEGEN_DECL_H
+#define AVCODEC_AAC_TABLEGEN_DECL_H
 
 #if CONFIG_HARDCODED_TABLES
 #define ff_aac_tableinit()
@@ -31,4 +31,4 @@ void ff_aac_tableinit(void);
 extern       float ff_aac_pow2sf_tab[428];
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* AAC_TABLEGEN_DECL_H */
+#endif /* AVCODEC_AAC_TABLEGEN_DECL_H */
diff --git a/libavcodec/amrwbdata.h b/libavcodec/amrwbdata.h
index f4db99e208..5421c23afb 100644
--- a/libavcodec/amrwbdata.h
+++ b/libavcodec/amrwbdata.h
@@ -1887,4 +1887,4 @@ static const uint16_t cf_sizes_wb[] = {
     40 /// SID/comfort noise frame
 };
 
-#endif
+#endif /* AVCODEC_AMRWBDATA_H */
diff --git a/libavcodec/arm/asm-offsets.h b/libavcodec/arm/asm-offsets.h
index 43c16301c0..110d33dbb5 100644
--- a/libavcodec/arm/asm-offsets.h
+++ b/libavcodec/arm/asm-offsets.h
@@ -36,4 +36,4 @@
 #define H263_AIC                 0xf0
 #define INTER_SCANTAB_RASTER_END 0x138
 
-#endif
+#endif /* AVCODEC_ARM_ASM_OFFSETS_H */
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h
index 14d9836114..6d7e6a6d16 100644
--- a/libavcodec/arm/dsputil_arm.h
+++ b/libavcodec/arm/dsputil_arm.h
@@ -30,4 +30,4 @@ void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
 void ff_dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx);
 
-#endif
+#endif /* AVCODEC_ARM_DSPUTIL_H */
diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/arm/mpegvideo_arm.h
index 0812ca1657..a36da6112b 100644
--- a/libavcodec/arm/mpegvideo_arm.h
+++ b/libavcodec/arm/mpegvideo_arm.h
@@ -24,4 +24,4 @@
 void MPV_common_init_iwmmxt(MpegEncContext *s);
 void MPV_common_init_armv5te(MpegEncContext *s);
 
-#endif
+#endif /* AVCODEC_ARM_MPEGVIDEO_H */
diff --git a/libavcodec/arm/vp56_arith.h b/libavcodec/arm/vp56_arith.h
index f5dbd1d4c7..0591d614a9 100644
--- a/libavcodec/arm/vp56_arith.h
+++ b/libavcodec/arm/vp56_arith.h
@@ -89,4 +89,4 @@ static inline int vp56_rac_get_prob_branchy_armv6(VP56RangeCoder *c, int pr)
 
 #endif
 
-#endif
+#endif /* AVCODEC_ARM_VP56_ARITH_H */
diff --git a/libavcodec/arm/vp8.h b/libavcodec/arm/vp8.h
index 35cdd8b2bf..76a0397a8d 100644
--- a/libavcodec/arm/vp8.h
+++ b/libavcodec/arm/vp8.h
@@ -26,4 +26,4 @@ int ff_decode_block_coeffs_armv6(VP56RangeCoder *rc, DCTELEM block[16],
                                  int i, uint8_t *token_prob, int16_t qmul[2]);
 #endif
 
-#endif
+#endif /* AVCODEC_ARM_VP8_H */
diff --git a/libavcodec/cavsdsp.h b/libavcodec/cavsdsp.h
index de2f530d83..b1133b7264 100644
--- a/libavcodec/cavsdsp.h
+++ b/libavcodec/cavsdsp.h
@@ -38,4 +38,4 @@ typedef struct CAVSDSPContext {
 void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx);
 void ff_cavsdsp_init_mmx(CAVSDSPContext* c, AVCodecContext *avctx);
 
-#endif
+#endif /* AVCODEC_CAVSDSP_H */
diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h
index 977450c124..01963a3f9d 100644
--- a/libavcodec/cbrt_tablegen.h
+++ b/libavcodec/cbrt_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CBRT_TABLEGEN_H
-#define CBRT_TABLEGEN_H
+#ifndef AVCODEC_CBRT_TABLEGEN_H
+#define AVCODEC_CBRT_TABLEGEN_H
 
 #include <stdint.h>
 #include <math.h>
@@ -48,4 +48,4 @@ static void cbrt_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* CBRT_TABLEGEN_H */
+#endif /* AVCODEC_CBRT_TABLEGEN_H */
diff --git a/libavcodec/cga_data.h b/libavcodec/cga_data.h
index 60f572f9b6..2149cfd2f1 100644
--- a/libavcodec/cga_data.h
+++ b/libavcodec/cga_data.h
@@ -45,4 +45,4 @@ extern const uint32_t ff_ega_palette[64];
  */
 void ff_draw_pc_font(uint8_t *dst, int linesize, const uint8_t *font, int font_height, int ch, int fg, int bg);
 
-#endif
+#endif /* AVCODEC_CGA_DATA_H */
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index faddaa3d7b..c898856279 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -49,4 +49,4 @@ void ff_dct_end (DCTContext *s);
 
 void ff_dct_init_mmx(DCTContext *s);
 
-#endif
+#endif /* AVCODEC_DCT_H */
diff --git a/libavcodec/dctref.h b/libavcodec/dctref.h
index ffd3533439..ba89abd752 100644
--- a/libavcodec/dctref.h
+++ b/libavcodec/dctref.h
@@ -28,4 +28,4 @@ void ff_ref_fdct(DCTELEM *block);
 void ff_ref_idct(DCTELEM *block);
 void ff_ref_dct_init(void);
 
-#endif
+#endif /* AVCODEC_DCTREF_H */
diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h
index 0810f8e7a5..4fa8d91374 100644
--- a/libavcodec/dv_tablegen.h
+++ b/libavcodec/dv_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DV_TABLEGEN_H
-#define DV_TABLEGEN_H
+#ifndef AVCODEC_DV_TABLEGEN_H
+#define AVCODEC_DV_TABLEGEN_H
 
 #include <stdint.h>
 #include "dv_vlc_data.h"
@@ -93,4 +93,4 @@ static void dv_vlc_map_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* DV_TABLEGEN_H */
+#endif /* AVCODEC_DV_TABLEGEN_H */
diff --git a/libavcodec/flv.h b/libavcodec/flv.h
index 84111175c6..3d9a2d5232 100644
--- a/libavcodec/flv.h
+++ b/libavcodec/flv.h
@@ -30,5 +30,4 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, in
 int ff_flv_decode_picture_header(MpegEncContext *s);
 void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last);
 
-#endif
-
+#endif /* AVCODEC_FLV_H */
diff --git a/libavcodec/gsmdec_data.h b/libavcodec/gsmdec_data.h
index 32cd01ea7a..b78daa7335 100644
--- a/libavcodec/gsmdec_data.h
+++ b/libavcodec/gsmdec_data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GSMDEC_DATA
-#define GSMDEC_DATA
+#ifndef AVCODEC_GSMDEC_DATA
+#define AVCODEC_GSMDEC_DATA
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ typedef struct {
 extern const uint16_t ff_gsm_long_term_gain_tab[4];
 extern const int16_t ff_gsm_dequant_tab[64][8];
 
-#endif
+#endif /* AVCODEC_GSMDEC_DATA */
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index cdbe44eb90..1dc300709e 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -248,4 +248,5 @@ static inline void memsetw(short *tab, int val, int n)
     for(i=0;i<n;i++)
         tab[i] = val;
 }
-#endif
+
+#endif /* AVCODEC_H263_H */
diff --git a/libavcodec/kbdwin.h b/libavcodec/kbdwin.h
index 5ac2b8ca5a..89b569aa7c 100644
--- a/libavcodec/kbdwin.h
+++ b/libavcodec/kbdwin.h
@@ -32,4 +32,4 @@
  */
 void ff_kbd_window_init(float *window, float alpha, int n);
 
-#endif
+#endif /* AVCODEC_KBDWIN_H */
diff --git a/libavcodec/motionpixels_tablegen.h b/libavcodec/motionpixels_tablegen.h
index 9516dfe579..cbf56c8694 100644
--- a/libavcodec/motionpixels_tablegen.h
+++ b/libavcodec/motionpixels_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MOTIONPIXELS_TABLEGEN_H
-#define MOTIONPIXELS_TABLEGEN_H
+#ifndef AVCODEC_MOTIONPIXELS_TABLEGEN_H
+#define AVCODEC_MOTIONPIXELS_TABLEGEN_H
 
 #include <stdint.h>
 
@@ -88,4 +88,4 @@ static void motionpixels_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* MOTIONPIXELS_TABLEGEN_H */
+#endif /* AVCODEC_MOTIONPIXELS_TABLEGEN_H */
diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 015193e13b..d34e73149c 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -196,4 +196,4 @@ static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int *di
 
     return ret;
 }
-#endif
+#endif /* AVCODEC_MPEG4VIDEO_H */
diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h
index 2264b739d2..a222f2c423 100644
--- a/libavcodec/mpegaudio_tablegen.h
+++ b/libavcodec/mpegaudio_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MPEGAUDIO_TABLEGEN_H
-#define MPEGAUDIO_TABLEGEN_H
+#ifndef AVCODEC_MPEGAUDIO_TABLEGEN_H
+#define AVCODEC_MPEGAUDIO_TABLEGEN_H
 
 #include <stdint.h>
 #include <math.h>
@@ -68,4 +68,4 @@ static void mpegaudio_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* MPEGAUDIO_TABLEGEN_H */
+#endif /* AVCODEC_MPEGAUDIO_TABLEGEN_H */
diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h
index 597e2533f5..a47019cc4b 100644
--- a/libavcodec/mpegaudiodsp.h
+++ b/libavcodec/mpegaudiodsp.h
@@ -60,4 +60,4 @@ void ff_mpadsp_apply_window_fixed(int32_t *synth_buf, int32_t *window,
                                   int *dither_state, int16_t *samples,
                                   int incr);
 
-#endif
+#endif /* AVCODEC_MPEGAUDIODSP_H */
diff --git a/libavcodec/msgsmdec.h b/libavcodec/msgsmdec.h
index cf58baaa47..76c87f1bd9 100644
--- a/libavcodec/msgsmdec.h
+++ b/libavcodec/msgsmdec.h
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MSGSMDEC_H
-#define MSGSMDEC_H
+#ifndef AVCODEC_MSGSMDEC_H
+#define AVCODEC_MSGSMDEC_H
 
 #include "avcodec.h"
 
 int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,
                           const uint8_t *buf);
 
-#endif
+#endif /* AVCODEC_MSGSMDEC_H */
diff --git a/libavcodec/nellymoser.h b/libavcodec/nellymoser.h
index 88d9aa6245..027fc7ed23 100644
--- a/libavcodec/nellymoser.h
+++ b/libavcodec/nellymoser.h
@@ -54,4 +54,4 @@ extern const int16_t  ff_nelly_delta_table[32];
 
 void ff_nelly_get_sample_bits(const float *buf, int *bits);
 
-#endif
+#endif /* AVCODEC_NELLYMOSER_H */
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index e754bb93d8..70de27d192 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -13,4 +13,4 @@
 #include "libavutil/opt.h"
 #endif
 
-#endif
+#endif /* AVCODEC_OPT_H */
diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h
index 838052e0d6..79d6561646 100644
--- a/libavcodec/pcm_tablegen.h
+++ b/libavcodec/pcm_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PCM_TABLEGEN_H
-#define PCM_TABLEGEN_H
+#ifndef AVCODEC_PCM_TABLEGEN_H
+#define AVCODEC_PCM_TABLEGEN_H
 
 #include <stdint.h>
 #include "libavutil/attributes.h"
@@ -116,4 +116,4 @@ static void pcm_ulaw_tableinit(void)
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* PCM_TABLEGEN_H */
+#endif /* AVCODEC_PCM_TABLEGEN_H */
diff --git a/libavcodec/qdm2_tablegen.h b/libavcodec/qdm2_tablegen.h
index 769d53bb26..b2bb294f58 100644
--- a/libavcodec/qdm2_tablegen.h
+++ b/libavcodec/qdm2_tablegen.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef QDM2_TABLEGEN_H
-#define QDM2_TABLEGEN_H
+#ifndef AVCODEC_QDM2_TABLEGEN_H
+#define AVCODEC_QDM2_TABLEGEN_H
 
 #include <stdint.h>
 #include <math.h>
@@ -99,4 +99,4 @@ static av_cold void init_noise_samples(void) {
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* QDM2_TABLEGEN_H */
+#endif /* AVCODEC_QDM2_TABLEGEN_H */
diff --git a/libavcodec/rdft.h b/libavcodec/rdft.h
index 7572c6c76d..8ff620fb59 100644
--- a/libavcodec/rdft.h
+++ b/libavcodec/rdft.h
@@ -71,4 +71,4 @@ void ff_rdft_end(RDFTContext *s);
 void ff_rdft_init_arm(RDFTContext *s);
 
 
-#endif
+#endif /* AVCODEC_RDFT_H */
diff --git a/libavcodec/sh4/dsputil_sh4.h b/libavcodec/sh4/dsputil_sh4.h
index 1a8b7afaed..5abe34557b 100644
--- a/libavcodec/sh4/dsputil_sh4.h
+++ b/libavcodec/sh4/dsputil_sh4.h
@@ -25,4 +25,4 @@
 void idct_sh4(DCTELEM *block);
 void dsputil_init_align(DSPContext* c, AVCodecContext *avctx);
 
-#endif
+#endif /* AVCODEC_SH4_DSPUTIL_SH4_H */
diff --git a/libavcodec/sinewin.h b/libavcodec/sinewin.h
index 2ed386a32d..eefe5bfe7f 100644
--- a/libavcodec/sinewin.h
+++ b/libavcodec/sinewin.h
@@ -56,4 +56,4 @@ extern SINETABLE(4096);
 
 extern SINETABLE_CONST float * const ff_sine_windows[13];
 
-#endif
+#endif /* AVCODEC_SINEWIN_H */
diff --git a/libavcodec/sinewin_tablegen.h b/libavcodec/sinewin_tablegen.h
index 91c26c1551..720f1ab6b8 100644
--- a/libavcodec/sinewin_tablegen.h
+++ b/libavcodec/sinewin_tablegen.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_SINEWIN_TABLEGEN_H
+#define AVCODEC_SINEWIN_TABLEGEN_H
+
 #include <assert.h>
 // do not use libavutil/libm.h since this is compiled both
 // for the host and the target and config.h is only valid for the target
@@ -58,3 +61,5 @@ av_cold void ff_init_ff_sine_windows(int index) {
     ff_sine_window_init(ff_sine_windows[index], 1 << index);
 #endif
 }
+
+#endif /* AVCODEC_SINEWIN_TABLEGEN_H */
diff --git a/libavcodec/sparc/dsputil_vis.h b/libavcodec/sparc/dsputil_vis.h
index b590e59361..4be86e25e0 100644
--- a/libavcodec/sparc/dsputil_vis.h
+++ b/libavcodec/sparc/dsputil_vis.h
@@ -26,4 +26,4 @@ void ff_simple_idct_put_vis(uint8_t *dest, int line_size, DCTELEM *data);
 void ff_simple_idct_add_vis(uint8_t *dest, int line_size, DCTELEM *data);
 void ff_simple_idct_vis(DCTELEM *data);
 
-#endif
+#endif /* AVCODEC_SPARC_DSPUTIL_VIS_H */
diff --git a/libavcodec/targa.h b/libavcodec/targa.h
index d7c3f451a1..f4ef5537b1 100644
--- a/libavcodec/targa.h
+++ b/libavcodec/targa.h
@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_TARGA_H
+#define AVCODEC_TARGA_H
+
 /**
  * @file
  * targa file common definitions
@@ -34,3 +37,5 @@ enum TargaCompr {
     TGA_BW     = 3, // black & white or grayscale
     TGA_RLE    = 8, // flag pointing that data is RLE-coded
 };
+
+#endif /* AVCODEC_TARGA_H */
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h
index 3a6eee52d4..5a96cd436c 100644
--- a/libavcodec/vp8.h
+++ b/libavcodec/vp8.h
@@ -239,4 +239,4 @@ typedef struct {
     AVFrame frames[5];
 } VP8Context;
 
-#endif
+#endif /* AVCODEC_VP8_H */
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h
index 6d1c070a05..4ea4581bc9 100644
--- a/libavcodec/vp8data.h
+++ b/libavcodec/vp8data.h
@@ -685,4 +685,4 @@ static const uint8_t vp8_mv_default_prob[2][19] = {
       128, 130, 130,  74, 148, 180, 203, 236, 254, 254 }
 };
 
-#endif
+#endif /* AVCODEC_VP8DATA_H */
diff --git a/libavcodec/x86/fft.h b/libavcodec/x86/fft.h
index e6eace235d..c6379050d9 100644
--- a/libavcodec/x86/fft.h
+++ b/libavcodec/x86/fft.h
@@ -36,4 +36,4 @@ void ff_imdct_half_sse(FFTContext *s, FFTSample *output, const FFTSample *input)
 void ff_imdct_half_avx(FFTContext *s, FFTSample *output, const FFTSample *input);
 void ff_dct32_float_sse(FFTSample *out, const FFTSample *in);
 
-#endif
+#endif /* AVCODEC_X86_FFT_H */
diff --git a/libavcodec/xvmc_internal.h b/libavcodec/xvmc_internal.h
index 7a4e908df9..3c6aed8361 100644
--- a/libavcodec/xvmc_internal.h
+++ b/libavcodec/xvmc_internal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_INTERNAL_XVMC_H
-#define AVCODEC_INTERNAL_XVMC_H
+#ifndef AVCODEC_XVMC_INTERNAL_H
+#define AVCODEC_XVMC_INTERNAL_H
 
 #include "avcodec.h"
 #include "mpegvideo.h"
@@ -30,4 +30,4 @@ int  ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
 void ff_xvmc_field_end(MpegEncContext *s);
 void ff_xvmc_decode_mb(MpegEncContext *s);
 
-#endif /* AVCODEC_INTERNAL_XVMC_H */
+#endif /* AVCODEC_XVMC_INTERNAL_H */
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index c126cae093..33e93e27fc 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -859,4 +859,4 @@ static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index,
                         &f->output_pads, &f->outputs, p);
 }
 
-#endif  /* AVFILTER_AVFILTER_H */
+#endif /* AVFILTER_AVFILTER_H */
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index 801e50176f..a0f6b2e01f 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -120,4 +120,4 @@ int avfilter_graph_parse(AVFilterGraph *graph, const char *filters,
                          AVFilterInOut *inputs, AVFilterInOut *outputs,
                          AVClass *log_ctx);
 
-#endif  /* AVFILTER_AVFILTERGRAPH_H */
+#endif /* AVFILTER_AVFILTERGRAPH_H */
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 0406a0d27e..64b3f3b865 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -52,4 +52,4 @@ int ff_avfilter_graph_config_formats(AVFilterGraph *graphctx, AVClass *log_ctx);
 /** default handler for freeing audio/video buffer when there are no references left */
 void ff_avfilter_default_free_buffer(AVFilterBuffer *buf);
 
-#endif  /* AVFILTER_INTERNAL_H */
+#endif /* AVFILTER_INTERNAL_H */
diff --git a/libavfilter/vsrc_buffer.h b/libavfilter/vsrc_buffer.h
index c7fc3824e0..6867f81e1c 100644
--- a/libavfilter/vsrc_buffer.h
+++ b/libavfilter/vsrc_buffer.h
@@ -19,9 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFILTER_VSRC_BUFFER_H
+#define AVFILTER_VSRC_BUFFER_H
+
 #include "libavcodec/avcodec.h" /* AVFrame */
 #include "avfilter.h"
 
 int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame,
                              int64_t pts, AVRational pixel_aspect);
 
+#endif /* AVFILTER_VSRC_BUFFER_H */
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h
index 6630aaf61d..1369c43891 100644
--- a/libavformat/avio_internal.h
+++ b/libavformat/avio_internal.h
@@ -98,4 +98,4 @@ int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size);
  */
 int ffio_fdopen(AVIOContext **s, URLContext *h);
 
-#endif // AVFORMAT_AVIO_INTERNAL_H
+#endif /* AVFORMAT_AVIO_INTERNAL_H */
diff --git a/libavformat/ffmeta.h b/libavformat/ffmeta.h
index bce272a087..a5380ca13d 100644
--- a/libavformat/ffmeta.h
+++ b/libavformat/ffmeta.h
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_META_H
-#define AVFORMAT_META_H
+#ifndef AVFORMAT_FFMETA_H
+#define AVFORMAT_FFMETA_H
 
 #define ID_STRING  ";FFMETADATA"
 #define ID_CHAPTER "[CHAPTER]"
 #define ID_STREAM  "[STREAM]"
 
-#endif /* AVFORMAT_META_H */
+#endif /* AVFORMAT_FFMETA_H */
diff --git a/libavformat/mms.h b/libavformat/mms.h
index 12e9ef0962..36e772c7f9 100644
--- a/libavformat/mms.h
+++ b/libavformat/mms.h
@@ -60,4 +60,5 @@ typedef struct {
 int ff_mms_asf_header_parser(MMSContext * mms);
 int ff_mms_read_data(MMSContext *mms, uint8_t *buf, const int size);
 int ff_mms_read_header(MMSContext * mms, uint8_t * buf, const int size);
-#endif
+
+#endif /* AVFORMAT_MMS_H */
diff --git a/libavformat/spdif.h b/libavformat/spdif.h
index dedb4e8832..b2a6b63be4 100644
--- a/libavformat/spdif.h
+++ b/libavformat/spdif.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFORMAT_SPDIF_H
+#define AVFORMAT_SPDIF_H
+
 #include <stdint.h>
 
 #define SYNCWORD1 0xF872
@@ -55,3 +58,5 @@ static const uint16_t spdif_mpeg_pkt_offset[2][3] = {
 };
 
 void ff_spdif_bswap_buf16(uint16_t *dst, const uint16_t *src, int w);
+
+#endif /* AVFORMAT_SPDIF_H */
diff --git a/libavformat/url.h b/libavformat/url.h
index c5732c64c6..caafe07cce 100644
--- a/libavformat/url.h
+++ b/libavformat/url.h
@@ -173,4 +173,4 @@ int ffurl_register_protocol(URLProtocol *protocol, int size);
 int ff_udp_set_remote_url(URLContext *h, const char *uri);
 int ff_udp_get_local_port(URLContext *h);
 
-#endif //AVFORMAT_URL_H
+#endif /* AVFORMAT_URL_H */
diff --git a/libavformat/version.h b/libavformat/version.h
index 22b5dc9791..63f419125b 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -69,4 +69,4 @@
 #define FF_API_SDP_CREATE              (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif
 
-#endif //AVFORMAT_VERSION_H
+#endif /* AVFORMAT_VERSION_H */
diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index 87333132fd..b223d26e8d 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -63,4 +63,4 @@
 #define av_assert2(cond) ((void)0)
 #endif
 
-#endif
+#endif /* AVUTIL_AVASSERT_H */
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 11ba368678..777cdc01d1 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -51,4 +51,4 @@ int ff_get_cpu_flags_arm(void);
 int ff_get_cpu_flags_ppc(void);
 int ff_get_cpu_flags_x86(void);
 
-#endif  /* AVUTIL_CPU_H */
+#endif /* AVUTIL_CPU_H */