diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index 6d5402a568a9b4e05f4657514e85728c0d07ef47..fe2afdafab12fbdd4f4f67a1cd3aec2304a0af25 100644
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@@ -51,4 +51,4 @@
 
 #endif
 
-#endif
+#endif // AVCODEC_ARM_MATHOPS_H
diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h
index 5229f2f615149af053a8b3ba0c6997b2b605992a..ebff3323e7ce67cbe40af032aea1cff945eabc02 100644
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = {
 /* joint stereo related tables */
 static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};
 
-#endif
+#endif // AVCODEC_ATRAC3DATA_H
diff --git a/libavcodec/bethsoftvideo.h b/libavcodec/bethsoftvideo.h
index 038e9c5e4d2a3d2e5fd062dbbf6eaf319ab2b351..c1f09550d7fa6de4fc40407fdb18c4f0e727713a 100644
--- a/libavcodec/bethsoftvideo.h
+++ b/libavcodec/bethsoftvideo.h
@@ -12,4 +12,4 @@ enum BethsoftVidBlockType
     EOF_BLOCK           = 0x14,
 };
 
-#endif
+#endif // AVCODEC_BETHSOFTVIDEO_H
diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index 702ad0b8937150e0e6eb809a5f0f95ed58b57559..a92108f94d848cd6b81c91695b5519a68b3a96d7 100644
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@@ -35,4 +35,4 @@ typedef enum {
     BMP_BITFIELDS   =3,
 } BiCompression;
 
-#endif
+#endif // AVCODEC_BMP_H
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index c9d41465ecb8ea0d3136ca6c8048704ecaf465ea..21cc45823c8cf46356e36d4ef9a04766e0f6695f 100644
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -518,4 +518,4 @@ static const int_fast8_t top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 static const int_fast8_t left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 static const int_fast8_t top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
 
-#endif
+#endif // AVCODEC_CAVSDATA_H
diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index 1c22e8a1c0081cb8db7820c50b4be81c94ec05a6..5d18010a0a20f2104deb519e08902ab649be4655 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -563,4 +563,4 @@ static const float* cplscales[5] = {
     cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };
 
-#endif
+#endif // AVCODEC_COOKDATA_H
diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index f4da56a8e6b9f935ebf5ff63d0ef89b1f34099fa..8955cb18874b4759a5cef41d5ced9d8a8d737b0b 100644
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -31,4 +31,4 @@
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
 
-#endif
+#endif // AVCODEC_DCA_H
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index 6686277ec3f67e10e2ce006067d735202bd55468..e6e38b10aeaebd088701fcedc5bfc312c1f26483 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
 
 */
 
-#endif
+#endif // AVCODEC_DCADATA_H
diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index 159520874ba3ea35b0bfcd504610dc105fca6a22..c162705eaea50959cefe8b483eb4c977c352fd69 100644
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -1073,4 +1073,4 @@ static const uint8_t* bitalloc_bits[10][8] = {
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
 
-#endif
+#endif // AVCODEC_DCAHUFF_H
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index a17cbfd747079337d92dfa66e3c4ec6c22b20d6a..eea66fc7512fd9bb0e30fb77b3e059de9c838a64 100644
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -110,4 +110,4 @@ static const uint8_t dnxhd_1238_run[62] = {
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
 };
 
-#endif
+#endif  // AVCODEC_DNXHDDATA_H
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index f493da1be7bbf30ab26caedc5574f541c7b84539..19a9501db5cfb1b20768d7fed7c9e1020e5cd0f3 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -2729,4 +2729,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
     return 3;
 }
 
-#endif
+#endif // AVCODEC_DVDATA_H
diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h
index 08dac0b16f9c95f4c99ea7e69de88021fd5f3cc4..48e1ee1ada1a5b3caa087292bc23225ff523bb1e 100644
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@@ -52,4 +52,4 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int num_steps, int *closest_cb,
                   AVRandomState *rand_state);
 
-#endif
+#endif // AVCODEC_ELBG_H
diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h
index 0fbbb58c14c925753ae8bbfe40248463cefd4d81..b859bd21596bdf283496a15875b9e96c61b544b1 100644
--- a/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@@ -37,4 +37,4 @@
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
 
-#endif
+#endif // AVCODEC_FAANDCT_H
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index 5c34c30929d513fb6129354b5cfa0939914fe614..be2d34b75b93202f320e572ba33e6d69eae4e804 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -484,4 +484,4 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit
     set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
 }
 
-#endif
+#endif // AVCODEC_GOLOMB_H
diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index 7f86bc4383698e79e740a31a4d91c1c9235fb49f..5f996dee63a334460c9dce0edab057dc4cffcd85 100644
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -48,4 +48,4 @@ typedef struct H261Context{
 
 #define MB_TYPE_H261_FIL 0x800000
 
-#endif
+#endif AVCODEC_H261_H
diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index 1831c894acb80d9f557f0137046002af2128b963..35734ed3349d8156b43cde9782822c255fbb91cc 100644
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_level,
 };
 
-#endif
+#endif // AVCODEC_H261DATA_H
diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h
index da25d4b75b1ecb13aa75de133c2ce40fd162c7a1..db6c8a4c7754511b55fb1a3ac254f20c74c9c8ca 100644
--- a/libavcodec/h263_parser.h
+++ b/libavcodec/h263_parser.h
@@ -26,4 +26,4 @@
 
 int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#endif
+#endif // AVCODEC_H263_PARSER_H
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index ebe4e56d2eaefa3615109986db816c93d48e8b07..69f7670ccea1714a9150ba35557e00ff1a5a2705 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -311,4 +311,4 @@ const uint8_t ff_h263_loop_filter_strength[32]={
     0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
 };
 
-#endif
+#endif // AVCODEC_H263DATA_H
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 6a15aa239fe594da518bff9841c22b4af2d51ef2..ea0f23ac26895ca42c539ff5a570a8ddfe57ddb5 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -1329,4 +1329,4 @@ static const int cabac_context_init_PB[3][460][2] =
     }
 };
 
-#endif
+#endif // AVCODEC_H264DATA_H
diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h
index 9cd616879f9fcbec128f2f35be1bfb25a951233e..3d8c002d975b2552cf3ad3a5a92f553b58129ebe 100644
--- a/libavcodec/i386/mathops.h
+++ b/libavcodec/i386/mathops.h
@@ -42,4 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
      rt; })
 
-#endif
+#endif // AVCODEC_X86_MATHOPS_H
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 5e22123e6c1e7da57b8647f39f366362d1a3e417..29c6b81a1b4f7d3ebc9fbce9d44ff1856588d25d 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -167,4 +167,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = {
     }
 };
 
-#endif
+#endif // AVCODEC_IMCDATA_H
diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h
index bfc6e8a95942eb71f3575b31231f91cf85b452b2..84c19c1dcffdeefe892476b6e8310ec818eb97c3 100644
--- a/libavcodec/indeo2data.h
+++ b/libavcodec/indeo2data.h
@@ -138,4 +138,4 @@ static const uint8_t ir2_luma_table[256] = {
  0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
 };
 
-#endif
+#endif // AVCODEC_INDEO2DATA_H
diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h
index e071da4ae63262e5b63e3a05febe5ed57c84ab6f..eee688a5f4c1d5a7faf7b9663a49eea9963942e4 100644
--- a/libavcodec/indeo3data.h
+++ b/libavcodec/indeo3data.h
@@ -2339,4 +2339,4 @@ static const uint32_t correctionhighorder[] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
-#endif
+#endif // AVCODEC_INDEO3DATA_H
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h
index ef49c39f4c211d7177e3ef7bbe1334215ae6a067..61dfa0d38330fe66427fba9808efdaab8cbb66a0 100644
--- a/libavcodec/mpcdata.h
+++ b/libavcodec/mpcdata.h
@@ -210,4 +210,4 @@ static const float mpc7_SCF[128] = {
     0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };
 
-#endif
+#endif // AVCODEC_MPCDATA_H
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index bd5c9ed9bf399a56133799482718b4b3e6902ce5..72ef559792f9faaf4a2d691ce5e2c183bc96b396 100644
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -479,4 +479,4 @@ static const uint8_t svcd_scan_offset_placeholder[14]={
     0xff, 0xff, 0xff,
 };
 
-#endif
+#endif // AVCODEC_MPEG12DATA_H
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index eb8c625649dba19a2afcacd2534c86f2ab7b5078..966dcb0df14f1c21fc5cbe4cb67619427295a973 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -429,4 +429,4 @@ static const uint8_t mpeg4_dc_threshold[8]={
     99, 13, 15, 17, 19, 21, 23, 0
 };
 
-#endif
+#endif // AVCODEC_MPEG4DATA_H
diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h
index 4057f52d316057f2ca502078400fb9b7e750e1f5..f3b43de2c5c4955baf245aafe98460d6cab071c0 100644
--- a/libavcodec/mpegaudiodectab.h
+++ b/libavcodec/mpegaudiodectab.h
@@ -603,4 +603,4 @@ static const float ci_table[8] = {
     -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037,
 };
 
-#endif
+#endif // AVCODEC_MPEGAUDIODECTAB_H
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h
index 7bce7280b4b1dfd9d9a2c45d4f44db96711d93ad..63e93dd3c7e5321950f0b5f35deeb17ced31fe06 100644
--- a/libavcodec/mpegaudiotab.h
+++ b/libavcodec/mpegaudiotab.h
@@ -115,4 +115,4 @@ static const float fixed_smr[SBLIMIT] =  {
 
 static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
 
-#endif
+#endif // AVCODEC_MPEGAUDIOTAB_H
diff --git a/libavcodec/msmpeg4tab.h b/libavcodec/msmpeg4tab.h
index b9bfcec440845ee5864ab568129b3801cca8012a..6a1c3c38cd31defe472fa6d297d60f926fa1eb22 100644
--- a/libavcodec/msmpeg4tab.h
+++ b/libavcodec/msmpeg4tab.h
@@ -2020,4 +2020,4 @@ static const uint8_t wmv2_scantableB[64]={
 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B,
 };
 
-#endif
+#endif // AVCODEC_MSMPEG4TAB_H
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index e339231a4d14b4d31d9716905359686cadce14b5..92483fb6f218cb5d572af5e708cdeed2211f8505 100644
--- a/libavcodec/ppc/mathops.h
+++ b/libavcodec/ppc/mathops.h
@@ -35,4 +35,4 @@
          __rt; })
 #endif
 
-#endif
+#endif // AVCODEC_PPC_MATHOPS_H
diff --git a/libavcodec/ppc/types_altivec.h b/libavcodec/ppc/types_altivec.h
index ca15609a2f3456c8c90ba8621aad1bb1f1058e65..d8430097a6ace133ca7fc1641473582f63486bb0 100644
--- a/libavcodec/ppc/types_altivec.h
+++ b/libavcodec/ppc/types_altivec.h
@@ -43,4 +43,4 @@
 #define zero_u32v (vec_u32_t) zerov
 #define zero_s32v (vec_s32_t) zerov
 
-#endif
+#endif // AVCODEC_TYPES_ALTIVEC_H
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 4f8bbf588081bc6992374e329b8451a657783620..298928ad4395d1d429a6b23df006713a6fd723e8 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -139,4 +139,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
 #endif
 }
 
-#endif
+#endif // AVCODEC_RANGECODER_H
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 8ce9297b226be14c187063ab29bf09c0358f6db7..41c4ed17953e073d2e5d3875d8ab146ab50b0ef7 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -70,4 +70,4 @@ void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay);
 
 void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay);
 
-#endif
+#endif // AVCODEC_ROQVIDEO_H
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index 7bc245504f884d853a6dfed04a65e0c12584dffe..43f4ad2fe11c3b6b705ffcaaed21fb040606e3e7 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -43,4 +43,4 @@ void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif
+#endif // AVCODEC_SIMPLE_IDCT_H
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h
index 16c1b447514fd9fa556b38c4b4309c0faca48004..22c292672fde167fe07b80f392f646d4eb5998d1 100644
--- a/libavcodec/sparc/vis.h
+++ b/libavcodec/sparc/vis.h
@@ -329,4 +329,4 @@ static inline void vis_alignaddrl_g0(void *_ptr)
 
 #define vis_pdist(rs1,rs2,rd)           vis_dd2d(0x3e, rs1, rs2, rd)
 
-#endif
+#endif // AVCODEC_VIS_H
diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h
index 735bfade52d325b99669f856fa3616403d8d0cae..a0e74952d9996f9b99b7c30245c10b35810cd1d5 100644
--- a/libavcodec/svq1_cb.h
+++ b/libavcodec/svq1_cb.h
@@ -1585,4 +1585,4 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = {
  }
 };
 
-#endif
+#endif // AVCODEC_SVQ1_CB_H
diff --git a/libavcodec/ulti_cb.h b/libavcodec/ulti_cb.h
index ffaa9a1e5ea6a7ff7a26e12169f5730994ac6a85..43e4e125ecab199be5ecbd3a34855fc192136c87 100644
--- a/libavcodec/ulti_cb.h
+++ b/libavcodec/ulti_cb.h
@@ -4121,4 +4121,4 @@ static const unsigned char ulti_codebook[16384]={
     0x3D, 0x3E, 0x3E, 0x3F
 };
 
-#endif
+#endif // AVCODEC_ULTI_CB_H
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index f8982659050b81735eb99743b38ca5d93e1829ae..c57dfff56a6789cb2f7301da85c440cf6e96310f 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -304,4 +304,4 @@ typedef struct VC1Context{
     int bi_type;
 } VC1Context;
 
-#endif
+#endif // AVCODEC_VC1_H
diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h
index 3a2713b347805389159da1743b8a17979b4e0e1a..48d350cd900ab6ff7531945c0ddba59e0695dc86 100644
--- a/libavcodec/vc1acdata.h
+++ b/libavcodec/vc1acdata.h
@@ -589,4 +589,4 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = {
 }
 };
 
-#endif
+#endif // AVCODEC_VC1ACDATA_H
diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h
index 82ca514df0fccbd5b66d960b1e192bdc5f29fd8e..dcdaa58b01daf7a7ac8148e52415a3a526f8a606 100644
--- a/libavcodec/vorbis_enc_data.h
+++ b/libavcodec/vorbis_enc_data.h
@@ -502,4 +502,4 @@ static const struct {
     { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
 };
 
-#endif
+#endif // AVCODEC_VORBIS_ENC_DATA_H
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h
index 5d092a9eb3efcaa3f73b922e965b801c74f9906c..8775bcded8256b25cd1200fabe8551d5b73391ad 100644
--- a/libavcodec/wmadata.h
+++ b/libavcodec/wmadata.h
@@ -1438,4 +1438,4 @@ static const CoefVLCTable coef_vlcs[6] = {
     },
 };
 
-#endif
+#endif // AVCODEC_WMADATA_H
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 99d43f59de90fff9c7d9b720e69142bee04452ed..910ff37a10112bc7835933033917481a5b2a1204 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -40,4 +40,4 @@ int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
                           int first_header_size, uint8_t *header_start[3],
                           int header_len[3]);
 
-#endif
+#endif // AVCODEC_XIPH_H
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h
index 0b61c157ff3b0f0188c3142e92fa999aa436686b..a533e868211c8f8bc9ebd0bad8c1ead3ccf63f07 100644
--- a/libavcodec/xvmc_render.h
+++ b/libavcodec/xvmc_render.h
@@ -52,4 +52,4 @@ typedef   struct{
 
 } xvmc_render_state_t;
 
-#endif
+#endif // AVCODEC_XVMC_RENDER_H
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 6df02c24f151c78025e952a829620c6e6390e24c..8387aa50f9afcf91a47b7ef4e45b226c18c358b7 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -286,4 +286,4 @@ static const GUID my_guid = {
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-#endif
+#endif // AVFORMAT_ASF_H
diff --git a/libavformat/dv.h b/libavformat/dv.h
index e7ad3d53b5e676352b76f5a1d9ebce84537ca2d8..0e33a2f21ae3dbf51f67a78afbcd47fa3c79aa59 100644
--- a/libavformat/dv.h
+++ b/libavformat/dv.h
@@ -41,4 +41,4 @@ DVMuxContext* dv_init_mux(AVFormatContext* s);
 int dv_assemble_frame(DVMuxContext *c, AVStream*, const uint8_t*, int, uint8_t**);
 void dv_delete_mux(DVMuxContext*);
 
-#endif
+#endif // AVFORMAT_DV_H
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 178988a994a03410e8493ce4385e1950a1b11af0..b2a3299aafe14f005b440269c4128a294b97c70a 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -67,4 +67,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif
+#endif AVFORMAT_MPEGTS_H
diff --git a/libavformat/nut.h b/libavformat/nut.h
index b18ac2dc0d7a4c85100b2a79966e4d04bf020a35..d8686524b2abb013cdce50f7d2fe462194ec49c3 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -99,4 +99,4 @@ static unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t
     return av_crc(av_crc04C11DB7, checksum, buf, len);
 }
 
-#endif
+#endif AVFORMAT_NUT_H
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h
index 8e3b326059b5dd84e17acac29538bd771f45e646..9e4d87bae6721f649f7786f8c7cc1af5b720c896 100644
--- a/libavformat/rtspcodes.h
+++ b/libavformat/rtspcodes.h
@@ -37,4 +37,4 @@ RTSP_STATUS_SERVICE         =503, /**< Service Unavailable */
 RTSP_STATUS_VERSION         =505, /**< RTSP Version not supported */
 };
 
-#endif
+#endif // AVFORMAT_RTSPCODES_H
diff --git a/libavutil/base64.h b/libavutil/base64.h
index ff755a4cdfb837605e5d659dd0042f22e8973c82..1ee7014152c2f8d9623734c089f2f929aee2ef88 100644
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -37,4 +37,4 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length);
  */
 char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len);
 
-#endif
+#endif // AVUTIL_BASE64_H
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index acf29b2ac53949dc029459c521b414aef9eb49fb..b6e54857450a4e3f8ff7af14a7278474c9d284b9 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -126,4 +126,4 @@ static inline int av_sf2int(SoftFloat v, int frac_bits){
     else           return v.mant >>(-v.exp);
 }
 
-#endif
+#endif // AVUTIL_SOFTFLOAT_H
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index 9ec2f3500d0e5c955b12487b0eacec31783330f9..a4e31d3d6bd5c0ecd230d720ec15031be7e2a8a6 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -185,4 +185,4 @@ static inline void linecpy(void *dest, void *src, int lines, int stride)
         }
 }
 
-#endif
+#endif // POSTPROCESS_INTERNAL_H