diff --git a/cmdutils.h b/cmdutils.h
index 782a377929..3d75cfc5dd 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CMDUTILS_H
-#define CMDUTILS_H
+#ifndef FFMPEG_CMDUTILS_H
+#define FFMPEG_CMDUTILS_H
 
 typedef struct {
     const char *name;
@@ -87,4 +87,4 @@ void show_version(const char *program_name);
  */
 void show_license(void);
 
-#endif /* CMDUTILS_H */
+#endif /* FFMPEG_CMDUTILS_H */
diff --git a/ffserver.h b/ffserver.h
index a1b95e84ad..c76752fa43 100644
--- a/ffserver.h
+++ b/ffserver.h
@@ -18,11 +18,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFSERVER_H
-#define FFSERVER_H
+#ifndef FFMPEG_FFSERVER_H
+#define FFMPEG_FFSERVER_H
 
 /* interface between ffserver and modules */
 
 void ffserver_module_init(void);
 
-#endif
+#endif /* FFMPEG_FFSERVER_H */
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index 622c7eb9dc..e927de02dd 100644
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AAC_AC3_PARSER_H
-#define AAC_AC3_PARSER_H
+#ifndef FFMPEG_AAC_AC3_PARSER_H
+#define FFMPEG_AAC_AC3_PARSER_H
 
 #include <stdint.h>
 #include "avcodec.h"
@@ -40,4 +40,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
                      const uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size);
 
-#endif /* AAC_AC3_PARSER_H */
+#endif /* FFMPEG_AAC_AC3_PARSER_H */
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index ad1075db41..05879371c1 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -24,8 +24,8 @@
  * Common code between AC3 encoder and decoder.
  */
 
-#ifndef AC3_H
-#define AC3_H
+#ifndef FFMPEG_AC3_H
+#define FFMPEG_AC3_H
 
 #include "ac3tab.h"
 
@@ -172,4 +172,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
                                    int deltbae,int deltnseg,
                                    uint8_t *deltoffst, uint8_t *deltlen, uint8_t *deltba);
 
-#endif /* AC3_H */
+#endif /* FFMPEG_AC3_H */
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index c6230341d7..ffac6190f8 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AC3_PARSER_H
-#define AC3_PARSER_H
+#ifndef FFMPEG_AC3_PARSER_H
+#define FFMPEG_AC3_PARSER_H
 
 #include "ac3.h"
 
@@ -44,4 +44,4 @@ typedef enum {
  */
 int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
 
-#endif /* AC3_PARSER_H */
+#endif /* FFMPEG_AC3_PARSER_H */
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index 27626bdd56..145da4ca16 100644
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AC3TAB_H
-#define AC3TAB_H
+#ifndef FFMPEG_AC3TAB_H
+#define FFMPEG_AC3TAB_H
 
 #include "common.h"
 
@@ -40,4 +40,4 @@ extern const int16_t  ff_floortab[8];
 extern const uint16_t ff_fgaintab[8];
 extern const uint8_t  ff_ac3_bndsz[50];
 
-#endif /* AC3TAB_H */
+#endif /* FFMPEG_AC3TAB_H */
diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h
index c0ddde528d..1d0fa6f6a7 100644
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBAVCODEC_ALPHA_ASM_H
-#define LIBAVCODEC_ALPHA_ASM_H
+#ifndef FFMPEG_ASM_H
+#define FFMPEG_ASM_H
 
 #include <inttypes.h>
 
@@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
 #error "Unknown compiler!"
 #endif
 
-#endif /* LIBAVCODEC_ALPHA_ASM_H */
+#endif /* FFMPEG_ASM_H */
diff --git a/libavcodec/alpha/regdef.h b/libavcodec/alpha/regdef.h
index 01e263bac8..aaa15e9945 100644
--- a/libavcodec/alpha/regdef.h
+++ b/libavcodec/alpha/regdef.h
@@ -20,8 +20,8 @@
  */
 
 /* Some BSDs don't seem to have regdef.h... sigh  */
-#ifndef alpha_regdef_h
-#define alpha_regdef_h
+#ifndef FFMPEG_REGDEF_H
+#define FFMPEG_REGDEF_H
 
 #define v0      $0      /* function return value */
 
@@ -63,4 +63,4 @@
 #define sp      $30     /* stack pointer */
 #define zero    $31     /* reads as zero, writes are noops */
 
-#endif /* alpha_regdef_h */
+#endif /* FFMPEG_REGDEF_H */
diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index fe2afdafab..cc097c3fff 100644
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ARM_MATHOPS_H
-#define AVCODEC_ARM_MATHOPS_H
+#ifndef FFMPEG_ARMV4L_MATHOPS_H
+#define FFMPEG_ARMV4L_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(a, b) \
@@ -51,4 +51,4 @@
 
 #endif
 
-#endif // AVCODEC_ARM_MATHOPS_H
+#endif /* FFMPEG_ARMV4L_MATHOPS_H */
diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h
index ebff3323e7..786629d031 100644
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@@ -25,8 +25,8 @@
  * Atrac 3 AKA RealAudio 8 compatible decoder data
  */
 
-#ifndef AVCODEC_ATRAC3DATA_H
-#define AVCODEC_ATRAC3DATA_H
+#ifndef FFMPEG_ATRAC3DATA_H
+#define FFMPEG_ATRAC3DATA_H
 
 #include <stdint.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 // AVCODEC_ATRAC3DATA_H
+#endif /* FFMPEG_ATRAC3DATA_H */
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9dfc728673..16f611973e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H
-#define AVCODEC_H
+#ifndef FFMPEG_AVCODEC_H
+#define FFMPEG_AVCODEC_H
 
 /**
  * @file avcodec.h
@@ -2933,4 +2933,4 @@ int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 #define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */
 
-#endif /* AVCODEC_H */
+#endif /* FFMPEG_AVCODEC_H */
diff --git a/libavcodec/bethsoftvideo.h b/libavcodec/bethsoftvideo.h
index d1e9cb0229..96629cd054 100644
--- a/libavcodec/bethsoftvideo.h
+++ b/libavcodec/bethsoftvideo.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_BETHSOFTVIDEO_H
-#define AVCODEC_BETHSOFTVIDEO_H
+#ifndef FFMPEG_BETHSOFTVIDEO_H
+#define FFMPEG_BETHSOFTVIDEO_H
 
 enum BethsoftVidBlockType
 {
@@ -33,4 +33,4 @@ enum BethsoftVidBlockType
     EOF_BLOCK           = 0x14,
 };
 
-#endif // AVCODEC_BETHSOFTVIDEO_H
+#endif /* FFMPEG_BETHSOFTVIDEO_H */
diff --git a/libavcodec/bfin/dsputil_bfin.h b/libavcodec/bfin/dsputil_bfin.h
index 9dd29476e8..5731f4f53c 100644
--- a/libavcodec/bfin/dsputil_bfin.h
+++ b/libavcodec/bfin/dsputil_bfin.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef DSPUTIL_BFIN_H
-#define DSPUTIL_BFIN_H
+#ifndef FFMPEG_DSPUTIL_BFIN_H
+#define FFMPEG_DSPUTIL_BFIN_H
 
 #define attribute_l1_text  __attribute__ ((l1_text))
 
@@ -65,4 +65,4 @@ static void bfprof (void)
 #define bfprof()
 #endif
 
-#endif
+#endif /* FFMPEG_DSPUTIL_BFIN_H */
diff --git a/libavcodec/bfin/mathops.h b/libavcodec/bfin/mathops.h
index 7bdffbc9b1..ec40f4e681 100644
--- a/libavcodec/bfin/mathops.h
+++ b/libavcodec/bfin/mathops.h
@@ -19,8 +19,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 AVCODEC_BFIN_MATHOPS_H
-#define AVCODEC_BFIN_MATHOPS_H
+#ifndef FFMPEG_BFIN_MATHOPS_H
+#define FFMPEG_BFIN_MATHOPS_H
 
 #ifdef CONFIG_MPEGAUDIO_HP
 #define MULH(X,Y) ({ int xxo;                           \
@@ -49,4 +49,4 @@
        : "=W" (xxo) : "d" (a), "d" (b) : "A1");         \
     xxo; })
 
-#endif /* AVCODEC_BFIN_MATHOPS_H */
+#endif /* FFMPEG_BFIN_MATHOPS_H */
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 9b38853220..ef15f3abf5 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -23,8 +23,8 @@
  * bitstream api header.
  */
 
-#ifndef BITSTREAM_H
-#define BITSTREAM_H
+#ifndef FFMPEG_BITSTREAM_H
+#define FFMPEG_BITSTREAM_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -950,4 +950,4 @@ static inline int decode012(GetBitContext *gb){
         return get_bits1(gb) + 1;
 }
 
-#endif /* BITSTREAM_H */
+#endif /* FFMPEG_BITSTREAM_H */
diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index a92108f94d..cbbd21ce90 100644
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_BMP_H
-#define AVCODEC_BMP_H
+#ifndef FFMPEG_BMP_H
+#define FFMPEG_BMP_H
 
 #include "avcodec.h"
 
@@ -35,4 +35,4 @@ typedef enum {
     BMP_BITFIELDS   =3,
 } BiCompression;
 
-#endif // AVCODEC_BMP_H
+#endif /* FFMPEG_BMP_H */
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 1a1d113ba1..d7f58d7284 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -24,8 +24,8 @@
  * Context Adaptive Binary Arithmetic Coder.
  */
 
-#ifndef CABAC_H
-#define CABAC_H
+#ifndef FFMPEG_CABAC_H
+#define FFMPEG_CABAC_H
 
 #include "bitstream.h"
 
@@ -867,4 +867,4 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
 }
 #endif /* 0 */
 
-#endif /* CABAC_H */
+#endif /* FFMPEG_CABAC_H */
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index b2094d44e4..9afa96e42c 100644
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CAVS_H
-#define CAVS_H
+#ifndef FFMPEG_CAVS_H
+#define FFMPEG_CAVS_H
 
 #include "dsputil.h"
 #include "mpegvideo.h"
@@ -311,4 +311,4 @@ void ff_cavs_init_top_lines(AVSContext *h);
 int ff_cavs_init(AVCodecContext *avctx);
 int ff_cavs_end (AVCodecContext *avctx);
 
-#endif /* CAVS_H */
+#endif /* FFMPEG_CAVS_H */
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index 80b1e0ce0f..a24fb5ddb4 100644
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_CAVSDATA_H
-#define AVCODEC_CAVSDATA_H
+#ifndef FFMPEG_CAVSDATA_H
+#define FFMPEG_CAVSDATA_H
 
 #include "cavs.h"
 
@@ -502,4 +502,4 @@ const int_fast8_t ff_top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 const int_fast8_t ff_left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 const int_fast8_t ff_top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
 
-#endif // AVCODEC_CAVSDATA_H
+#endif /* FFMPEG_CAVSDATA_H */
diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index 751a5a4cdd..38beef41cd 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -25,8 +25,8 @@
  * Cook AKA RealAudio G2 compatible decoderdata
  */
 
-#ifndef AVCODEC_COOKDATA_H
-#define AVCODEC_COOKDATA_H
+#ifndef FFMPEG_COOKDATA_H
+#define FFMPEG_COOKDATA_H
 
 #include <stdint.h>
 
@@ -562,4 +562,4 @@ static const float* cplscales[5] = {
     cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };
 
-#endif // AVCODEC_COOKDATA_H
+#endif /* FFMPEG_COOKDATA_H */
diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index 8955cb1887..e2197a4408 100644
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DCA_H
-#define AVCODEC_DCA_H
+#ifndef FFMPEG_DCA_H
+#define FFMPEG_DCA_H
 
 /** DCA syncwords, also used for bitstream type detection */
 #define DCA_MARKER_RAW_BE 0x7FFE8001
@@ -31,4 +31,4 @@
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
 
-#endif // AVCODEC_DCA_H
+#endif /* FFMPEG_DCA_H */
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index e6e38b10ae..892a88dad2 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -24,8 +24,8 @@
  * @file dcadata.c
  */
 
-#ifndef AVCODEC_DCADATA_H
-#define AVCODEC_DCADATA_H
+#ifndef FFMPEG_DCADATA_H
+#define FFMPEG_DCADATA_H
 
 #include <stdint.h>
 
@@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
 
 */
 
-#endif // AVCODEC_DCADATA_H
+#endif /* FFMPEG_DCADATA_H */
diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index c162705eae..a140f3b8b8 100644
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DCAHUFF_H
-#define AVCODEC_DCAHUFF_H
+#ifndef FFMPEG_DCAHUFF_H
+#define FFMPEG_DCAHUFF_H
 
 #include <stdint.h>
 #include <stdlib.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 // AVCODEC_DCAHUFF_H
+#endif /* FFMPEG_DCAHUFF_H */
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index 7bcf96d056..c402390224 100644
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DNXHDDATA_H
-#define AVCODEC_DNXHDDATA_H
+#ifndef FFMPEG_DNXHDDATA_H
+#define FFMPEG_DNXHDDATA_H
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ extern const CIDEntry ff_dnxhd_cid_table[];
 
 int ff_dnxhd_get_cid_table(int cid);
 
-#endif  // AVCODEC_DNXHDDATA_H
+#endif /* FFMPEG_DNXHDDATA_H */
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index dcccee991b..6cb22fb9e8 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -27,8 +27,8 @@
  * absolutely necessary to call emms_c() between dsp & float/double code
  */
 
-#ifndef DSPUTIL_H
-#define DSPUTIL_H
+#ifndef FFMPEG_DSPUTIL_H
+#define FFMPEG_DSPUTIL_H
 
 #include "avcodec.h"
 
@@ -743,4 +743,4 @@ static inline void copy_block17(uint8_t *dst, uint8_t *src, int dstStride, int s
     }
 }
 
-#endif
+#endif /* FFMPEG_DSPUTIL_H */
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index bd2d41a24b..e072a9d3b8 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -24,8 +24,8 @@
  * Constants for DV codec.
  */
 
-#ifndef AVCODEC_DVDATA_H
-#define AVCODEC_DVDATA_H
+#ifndef FFMPEG_DVDATA_H
+#define FFMPEG_DVDATA_H
 
 #include "avcodec.h"
 #include "rational.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 // AVCODEC_DVDATA_H
+#endif /* FFMPEG_DVDATA_H */
diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h
index 7df9627df1..1b2e45c4ec 100644
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ELBG_H
-#define AVCODEC_ELBG_H
+#ifndef FFMPEG_ELBG_H
+#define FFMPEG_ELBG_H
 
 #include "random.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 // AVCODEC_ELBG_H
+#endif /* FFMPEG_ELBG_H */
diff --git a/libavcodec/eval.h b/libavcodec/eval.h
index 0a1cd87f6d..08c2c70743 100644
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -25,8 +25,8 @@
  * eval header.
  */
 
-#ifndef AVCODEC_EVAL_H
-#define AVCODEC_EVAL_H
+#ifndef FFMPEG_EVAL_H
+#define FFMPEG_EVAL_H
 
 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 /**
@@ -84,4 +84,4 @@ AVEvalExpr * ff_parse(char *s, const char **const_name,
 double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque);
 void ff_eval_free(AVEvalExpr * e);
 
-#endif /* AVCODEC_EVAL_H */
+#endif /* FFMPEG_EVAL_H */
diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h
index a1c27bbe56..b9a4eeb3e5 100644
--- a/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_FAANDCT_H
-#define AVCODEC_FAANDCT_H
+#ifndef FFMPEG_FAANDCT_H
+#define FFMPEG_FAANDCT_H
 
 #include "dsputil.h"
 
@@ -36,4 +36,4 @@
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
 
-#endif // AVCODEC_FAANDCT_H
+#endif /* FFMPEG_FAANDCT_H */
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index ec9dcae80a..f2bc7fda60 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -27,8 +27,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
  */
 
-#ifndef AVCODEC_GOLOMB_H
-#define AVCODEC_GOLOMB_H
+#ifndef FFMPEG_GOLOMB_H
+#define FFMPEG_GOLOMB_H
 
 #include <stdint.h>
 #include "bitstream.h"
@@ -504,4 +504,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 // AVCODEC_GOLOMB_H
+#endif /* FFMPEG_GOLOMB_H */
diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index b5eb539e73..f0ce7c366a 100644
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -25,8 +25,8 @@
  * h261codec.
  */
 
-#ifndef AVCODEC_H261_H
-#define AVCODEC_H261_H
+#ifndef FFMPEG_H261_H
+#define FFMPEG_H261_H
 
 #include "mpegvideo.h"
 
@@ -48,4 +48,4 @@ typedef struct H261Context{
 
 #define MB_TYPE_H261_FIL 0x800000
 
-#endif /* AVCODEC_H261_H */
+#endif /* FFMPEG_H261_H */
diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index 35734ed334..a86b6df98a 100644
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -24,8 +24,8 @@
  * H.261 tables.
  */
 
-#ifndef AVCODEC_H261DATA_H
-#define AVCODEC_H261DATA_H
+#ifndef FFMPEG_H261DATA_H
+#define FFMPEG_H261DATA_H
 
 #include <stdint.h>
 #include "h261.h"
@@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_level,
 };
 
-#endif // AVCODEC_H261DATA_H
+#endif /* FFMPEG_H261DATA_H */
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 2df3be5ab0..47b168b54a 100644
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H263_H
-#define AVCODEC_H263_H
+#ifndef FFMPEG_H263_H
+#define FFMPEG_H263_H
 
 #include "config.h"
 #include "msmpeg4.h"
@@ -43,4 +43,4 @@
                                  ENABLE_WMV_ENCODER)
 #define ENABLE_ANY_H263 (ENABLE_ANY_H263_DECODER || ENABLE_ANY_H263_ENCODER)
 
-#endif /* AVCODEC_H263_H */
+#endif /* FFMPEG_H263_H */
diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h
index db6c8a4c77..dc50774517 100644
--- a/libavcodec/h263_parser.h
+++ b/libavcodec/h263_parser.h
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H263_PARSER_H
-#define AVCODEC_H263_PARSER_H
+#ifndef FFMPEG_H263_PARSER_H
+#define FFMPEG_H263_PARSER_H
 
 #include "parser.h"
 
 int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#endif // AVCODEC_H263_PARSER_H
+#endif /* FFMPEG_H263_PARSER_H */
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index 69f7670cce..b6c1c163cc 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -26,8 +26,8 @@
  * H.263 tables.
  */
 
-#ifndef AVCODEC_H263DATA_H
-#define AVCODEC_H263DATA_H
+#ifndef FFMPEG_H263DATA_H
+#define FFMPEG_H263DATA_H
 
 #include <stdint.h>
 #include "mpegvideo.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 // AVCODEC_H263DATA_H
+#endif /* FFMPEG_H263DATA_H */
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index d85fcb7674..6d0486b62c 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264_H
-#define H264_H
+#ifndef FFMPEG_H264_H
+#define FFMPEG_H264_H
 
 #include "dsputil.h"
 #include "cabac.h"
@@ -416,4 +416,4 @@ typedef struct H264Context{
 
 }H264Context;
 
-#endif /* H264_H */
+#endif /* FFMPEG_H264_H */
diff --git a/libavcodec/h264_parser.h b/libavcodec/h264_parser.h
index 40b5500c56..0bb286ffea 100644
--- a/libavcodec/h264_parser.h
+++ b/libavcodec/h264_parser.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264_PARSER_H
-#define H264_PARSER_H
+#ifndef FFMPEG_H264_PARSER_H
+#define FFMPEG_H264_PARSER_H
 
 #include "h264.h"
 
@@ -36,4 +36,4 @@
  */
 int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size);
 
-#endif /* H264_PARSER_H */
+#endif /* FFMPEG_H264_PARSER_H */
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 0165e7a789..79fc5da0ef 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_H264DATA_H
-#define AVCODEC_H264DATA_H
+#ifndef FFMPEG_H264DATA_H
+#define FFMPEG_H264DATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -1305,4 +1305,4 @@ static const int8_t cabac_context_init_PB[3][460][2] =
     }
 };
 
-#endif // AVCODEC_H264DATA_H
+#endif /* FFMPEG_H264DATA_H */
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index 68a0db5ef2..33839d1a07 100644
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264PRED_H
-#define H264PRED_H
+#ifndef FFMPEG_H264PRED_H
+#define FFMPEG_H264PRED_H
 
 #include "common.h"
 
@@ -73,4 +73,4 @@ typedef struct H264PredContext{
 
 void ff_h264_pred_init(H264PredContext *h, int codec_id);
 
-#endif /* H264PRED_H */
+#endif /* FFMPEG_H264PRED_H */
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index ec3c0c9ab1..41d6d5ad49 100644
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_HUFFMAN_H
-#define AVCODEC_HUFFMAN_H
+#ifndef FFMPEG_HUFFMAN_H
+#define FFMPEG_HUFFMAN_H
 
 #include "avcodec.h"
 
@@ -35,4 +35,4 @@ typedef int (*huff_cmp_t)(const void *va, const void *vb);
 int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
                        Node *nodes, huff_cmp_t cmp, int hnode_first);
 
-#endif /* AVCODEC_HUFFMAN_H */
+#endif /* FFMPEG_HUFFMAN_H */
diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h
index 3d8c002d97..51d59396e1 100644
--- a/libavcodec/i386/mathops.h
+++ b/libavcodec/i386/mathops.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_X86_MATHOPS_H
-#define AVCODEC_X86_MATHOPS_H
+#ifndef FFMPEG_I386_MATHOPS_H
+#define FFMPEG_I386_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
@@ -42,4 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
      rt; })
 
-#endif // AVCODEC_X86_MATHOPS_H
+#endif /* FFMPEG_I386_MATHOPS_H */
diff --git a/libavcodec/i386/mmx.h b/libavcodec/i386/mmx.h
index 41aae6c21b..102abd2312 100644
--- a/libavcodec/i386/mmx.h
+++ b/libavcodec/i386/mmx.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 AVCODEC_I386MMX_H
-#define AVCODEC_I386MMX_H
+#ifndef FFMPEG_MMX_H
+#define FFMPEG_MMX_H
 
 /*
  * The type of an value that fits in an MMX register (note that long
@@ -280,4 +280,4 @@ typedef        union {
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)
 
 
-#endif /* AVCODEC_I386MMX_H */
+#endif /* FFMPEG_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_mmx.h b/libavcodec/i386/vp3dsp_mmx.h
index b1339434ab..7c2bc601be 100644
--- a/libavcodec/i386/vp3dsp_mmx.h
+++ b/libavcodec/i386/vp3dsp_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP3DSP_MMX_H
-#define VP3DSP_MMX_H
+#ifndef FFMPEG_VP3DSP_MMX_H
+#define FFMPEG_VP3DSP_MMX_H
 
 #include "dsputil.h"
 
@@ -29,4 +29,4 @@ void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_dsp_init_mmx(void);
 
-#endif /* VP3DSP_MMX_H */
+#endif /* FFMPEG_VP3DSP_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h
index 743c20fdb1..d02918f459 100644
--- a/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP3DSP_SSE2_H
-#define VP3DSP_SSE2_H
+#ifndef FFMPEG_VP3DSP_SSE2_H
+#define FFMPEG_VP3DSP_SSE2_H
 
 #include "dsputil.h"
 
@@ -28,4 +28,4 @@ void ff_vp3_idct_sse2(int16_t *input_data);
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* VP3DSP_SSE2_H */
+#endif /* FFMPEG_VP3DSP_SSE2_H */
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index fcd780b420..75f4fd7449 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_IMCDATA_H
-#define AVCODEC_IMCDATA_H
+#ifndef FFMPEG_IMCDATA_H
+#define FFMPEG_IMCDATA_H
 
 #include <stdint.h>
 
@@ -166,4 +166,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = {
     }
 };
 
-#endif // AVCODEC_IMCDATA_H
+#endif /* FFMPEG_IMCDATA_H */
diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h
index 84c19c1dcf..2be32dfc92 100644
--- a/libavcodec/indeo2data.h
+++ b/libavcodec/indeo2data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_INDEO2DATA_H
-#define AVCODEC_INDEO2DATA_H
+#ifndef FFMPEG_INDEO2DATA_H
+#define FFMPEG_INDEO2DATA_H
 
 #include <stdint.h>
 
@@ -138,4 +138,4 @@ static const uint8_t ir2_luma_table[256] = {
  0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
 };
 
-#endif // AVCODEC_INDEO2DATA_H
+#endif /* FFMPEG_INDEO2DATA_H */
diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h
index eee688a5f4..eb9a8c19e4 100644
--- a/libavcodec/indeo3data.h
+++ b/libavcodec/indeo3data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_INDEO3DATA_H
-#define AVCODEC_INDEO3DATA_H
+#ifndef FFMPEG_INDEO3DATA_H
+#define FFMPEG_INDEO3DATA_H
 
 #include <stdint.h>
 
@@ -2339,4 +2339,4 @@ static const uint32_t correctionhighorder[] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
-#endif // AVCODEC_INDEO3DATA_H
+#endif /* FFMPEG_INDEO3DATA_H */
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h
index 2aba57ba63..792d2be3b5 100644
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@@ -25,8 +25,8 @@
  * JPEG-LS common code.
  */
 
-#ifndef JPEGLS_H
-#define JPEGLS_H
+#ifndef FFMPEG_JPEGLS_H
+#define FFMPEG_JPEGLS_H
 
 #include "avcodec.h"
 
@@ -108,4 +108,4 @@ static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err
 #define R(a, i   ) (bits == 8 ?  ((uint8_t*)(a))[i]    :  ((uint16_t*)(a))[i]  )
 #define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v))
 
-#endif /* JPEGLS_H */
+#endif /* FFMPEG_JPEGLS_H */
diff --git a/libavcodec/jpeglsdec.h b/libavcodec/jpeglsdec.h
index c5766184ff..362a0feb52 100644
--- a/libavcodec/jpeglsdec.h
+++ b/libavcodec/jpeglsdec.h
@@ -25,8 +25,8 @@
  * JPEG-LS decoder.
  */
 
-#ifndef JPEGLSDEC_H
-#define JPEGLSDEC_H
+#ifndef FFMPEG_JPEGLSDEC_H
+#define FFMPEG_JPEGLSDEC_H
 
 #include "mjpeg.h"
 #include "mjpegdec.h"
@@ -38,4 +38,4 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s);
 
 int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv);
 
-#endif /* JPEGLSDEC_H */
+#endif /* FFMPEG_JPEGLSDEC_H */
diff --git a/libavcodec/lcl.h b/libavcodec/lcl.h
index b60c0e901a..7d5a76a789 100644
--- a/libavcodec/lcl.h
+++ b/libavcodec/lcl.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_LCL_H
-#define AVCODEC_LCL_H
+#ifndef FFMPEG_LCL_H
+#define FFMPEG_LCL_H
 
 #define BMPTYPE_YUV 1
 #define BMPTYPE_RGB 2
@@ -46,4 +46,4 @@
 #define CODEC_MSZH 1
 #define CODEC_ZLIB 3
 
-#endif /* AVCODEC_LCL_H */
+#endif /* FFMPEG_LCL_H */
diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h
index 37df2080da..a7d5a9646c 100644
--- a/libavcodec/libxvid_internal.h
+++ b/libavcodec/libxvid_internal.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LIBXVID_INTERNAL_H
-#define LIBXVID_INTERNAL_H
+#ifndef FFMPEG_LIBXVID_INTERNAL_H
+#define FFMPEG_LIBXVID_INTERNAL_H
 
 /**
  * @file libxvid_internal.h
@@ -29,4 +29,4 @@
 
 int av_tempfile(char *prefix, char **filename);
 
-#endif /* LIBXVID_INTERNAL_H */
+#endif /* FFMPEG_LIBXVID_INTERNAL_H */
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index 9c45c23872..6903862707 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -27,8 +27,8 @@
  * Modified for use in TIFF by Konstantin Shishkov
  */
 
-#ifndef LZW_H
-#define LZW_H
+#ifndef FFMPEG_LZW_H
+#define FFMPEG_LZW_H
 
 #include "bitstream.h"
 
@@ -56,4 +56,4 @@ void ff_lzw_encode_init(struct LZWEncodeState * s, uint8_t * outbuf, int outsize
 int ff_lzw_encode(struct LZWEncodeState * s, const uint8_t * inbuf, int insize);
 int ff_lzw_encode_flush(struct LZWEncodeState * s);
 
-#endif
+#endif /* FFMPEG_LZW_H */
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 7a47a9188c..38b1f5c65d 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -19,8 +19,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 MATHOPS_H
-#define MATHOPS_H
+#ifndef FFMPEG_MATHOPS_H
+#define FFMPEG_MATHOPS_H
 
 #include "common.h"
 
@@ -71,5 +71,5 @@ static av_always_inline int MULH(int a, int b){
 #   define MUL16(ra, rb) ((ra) * (rb))
 #endif
 
-#endif //MATHOPS_H
+#endif /* FFMPEG_MATHOPS_H */
 
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index e63b314dea..1916fd0cfc 100644
--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@@ -30,8 +30,8 @@
  * MJPEG encoder and decoder.
  */
 
-#ifndef MJPEG_H
-#define MJPEG_H
+#ifndef FFMPEG_MJPEG_H
+#define FFMPEG_MJPEG_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -153,4 +153,4 @@ void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
                                   const uint8_t *bits_table,
                                   const uint8_t *val_table);
 
-#endif /* MJPEG_H */
+#endif /* FFMPEG_MJPEG_H */
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index 178d2cb298..c00cd4e438 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -26,8 +26,8 @@
  * MJPEG decoder.
  */
 
-#ifndef MJPEGDEC_H
-#define MJPEGDEC_H
+#ifndef FFMPEG_MJPEGDEC_H
+#define FFMPEG_MJPEGDEC_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -109,4 +109,4 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
 
-#endif /* MJPEGDEC_H */
+#endif /* FFMPEG_MJPEGDEC_H */
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h
index d6f1ec9d24..02f8a714c3 100644
--- a/libavcodec/mjpegenc.h
+++ b/libavcodec/mjpegenc.h
@@ -30,8 +30,8 @@
  * MJPEG encoder.
  */
 
-#ifndef MJPEGENC_H
-#define MJPEGENC_H
+#ifndef FFMPEG_MJPEGENC_H
+#define FFMPEG_MJPEGENC_H
 
 #include "dsputil.h"
 #include "mpegvideo.h"
@@ -57,4 +57,4 @@ void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
                         uint8_t *huff_size, uint16_t *huff_code);
 void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]);
 
-#endif /* MJPEGENC_H */
+#endif /* FFMPEG_MJPEGENC_H */
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h
index e40f7e5e23..aef88098d2 100644
--- a/libavcodec/mpcdata.h
+++ b/libavcodec/mpcdata.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_MPCDATA_H
-#define AVCODEC_MPCDATA_H
+#ifndef FFMPEG_MPCDATA_H
+#define FFMPEG_MPCDATA_H
 
 #include <stdint.h>
 
@@ -209,4 +209,4 @@ static const float mpc7_SCF[128] = {
     0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };
 
-#endif // AVCODEC_MPCDATA_H
+#endif /* FFMPEG_MPCDATA_H */
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 699592d0b8..662e3b38f8 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_MPEG12_H
-#define AVCODEC_MPEG12_H
+#ifndef FFMPEG_MPEG12_H
+#define FFMPEG_MPEG12_H
 
 #include "mpegvideo.h"
 
@@ -28,4 +28,4 @@ extern uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
 void ff_mpeg12_common_init(MpegEncContext *s);
 
-#endif /* AVCODEC_MPEG12_H */
+#endif /* FFMPEG_MPEG12_H */
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index 9793604725..190817f648 100644
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -25,8 +25,8 @@
  * MPEG1/2 tables.
  */
 
-#ifndef AVCODEC_MPEG12DATA_H
-#define AVCODEC_MPEG12DATA_H
+#ifndef FFMPEG_MPEG12DATA_H
+#define FFMPEG_MPEG12DATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -47,4 +47,4 @@ extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2];
 extern const float ff_mpeg1_aspect[16];
 extern const AVRational ff_mpeg2_aspect[16];
 
-#endif // AVCODEC_MPEG12DATA_H
+#endif /* FFMPEG_MPEG12DATA_H */
diff --git a/libavcodec/mpeg12decdata.h b/libavcodec/mpeg12decdata.h
index 7aee9899bf..52816d4162 100644
--- a/libavcodec/mpeg12decdata.h
+++ b/libavcodec/mpeg12decdata.h
@@ -25,8 +25,8 @@
  * MPEG1/2 decoder tables.
  */
 
-#ifndef AVCODEC_MPEG12DECDATA_H
-#define AVCODEC_MPEG12DECDATA_H
+#ifndef FFMPEG_MPEG12DECDATA_H
+#define FFMPEG_MPEG12DECDATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -121,4 +121,4 @@ static const uint8_t *mpeg2_dc_scale_table[4]={
     mpeg2_dc_scale_table3,
 };
 
-#endif // AVCODEC_MPEG12DECDATA_H
+#endif /* FFMPEG_MPEG12DECDATA_H */
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index 966dcb0df1..ba8f9463cb 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -25,8 +25,8 @@
  * mpeg4 tables.
  */
 
-#ifndef AVCODEC_MPEG4DATA_H
-#define AVCODEC_MPEG4DATA_H
+#ifndef FFMPEG_MPEG4DATA_H
+#define FFMPEG_MPEG4DATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -429,4 +429,4 @@ static const uint8_t mpeg4_dc_threshold[8]={
     99, 13, 15, 17, 19, 21, 23, 0
 };
 
-#endif // AVCODEC_MPEG4DATA_H
+#endif /* FFMPEG_MPEG4DATA_H */
diff --git a/libavcodec/mpeg4video_parser.h b/libavcodec/mpeg4video_parser.h
index 0da1da0586..125f6aa501 100644
--- a/libavcodec/mpeg4video_parser.h
+++ b/libavcodec/mpeg4video_parser.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MPEG4VIDEO_PARSER_H
-#define MPEG4VIDEO_PARSER_H
+#ifndef FFMPEG_MPEG4VIDEO_PARSER_H
+#define FFMPEG_MPEG4VIDEO_PARSER_H
 
 #include "parser.h"
 
@@ -31,4 +31,4 @@
  */
 int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#endif /* MPEG4VIDEO_PARSER_H */
+#endif /* FFMPEG_MPEG4VIDEO_PARSER_H */
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index d0461526ba..6d602a1dcb 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -23,8 +23,8 @@
  * mpeg audio declarations for both encoder and decoder.
  */
 
-#ifndef MPEGAUDIO_H
-#define MPEGAUDIO_H
+#ifndef FFMPEG_MPEGAUDIO_H
+#define FFMPEG_MPEGAUDIO_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -152,4 +152,4 @@ static inline int ff_mpa_check_header(uint32_t header){
     return 0;
 }
 
-#endif /* MPEGAUDIO_H */
+#endif /* FFMPEG_MPEGAUDIO_H */
diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h
index 8b247b89ca..09254cb0a7 100644
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@@ -24,8 +24,8 @@
  * mpeg audio layer common tables.
  */
 
-#ifndef MPEGAUDIODATA_H
-#define MPEGAUDIODATA_H
+#ifndef FFMPEG_MPEGAUDIODATA_H
+#define FFMPEG_MPEGAUDIODATA_H
 
 #include "common.h"
 
@@ -37,4 +37,4 @@ extern const int ff_mpa_quant_steps[17];
 extern const int ff_mpa_quant_bits[17];
 extern const unsigned char *ff_mpa_alloc_tables[5];
 
-#endif /* MPEGAUDIODATA_H */
+#endif /* FFMPEG_MPEGAUDIODATA_H */
diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h
index e773f2e9c0..21e8cf016d 100644
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@@ -24,8 +24,8 @@
  * MPEG Audio header decoder.
  */
 
-#ifndef MPEGAUDIODECHEADER_H
-#define MPEGAUDIODECHEADER_H
+#ifndef FFMPEG_MPEGAUDIODECHEADER_H
+#define FFMPEG_MPEGAUDIODECHEADER_H
 
 #include "common.h"
 #include "mpegaudio.h"
@@ -36,4 +36,4 @@
    that the frame size must be computed externally */
 int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header);
 
-#endif /* MPEGAUDIODECHEADER_H */
+#endif /* FFMPEG_MPEGAUDIODECHEADER_H */
diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h
index f3b43de2c5..a41ff7aaa8 100644
--- a/libavcodec/mpegaudiodectab.h
+++ b/libavcodec/mpegaudiodectab.h
@@ -24,8 +24,8 @@
  * mpeg audio layer decoder tables.
  */
 
-#ifndef AVCODEC_MPEGAUDIODECTAB_H
-#define AVCODEC_MPEGAUDIODECTAB_H
+#ifndef FFMPEG_MPEGAUDIODECTAB_H
+#define FFMPEG_MPEGAUDIODECTAB_H
 
 #include <stdint.h>
 #include "mpegaudio.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 // AVCODEC_MPEGAUDIODECTAB_H
+#endif /* FFMPEG_MPEGAUDIODECTAB_H */
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h
index 63e93dd3c7..61ea471b1c 100644
--- a/libavcodec/mpegaudiotab.h
+++ b/libavcodec/mpegaudiotab.h
@@ -27,8 +27,8 @@
  * Most of them come from the mpeg audio specification.
  */
 
-#ifndef AVCODEC_MPEGAUDIOTAB_H
-#define AVCODEC_MPEGAUDIOTAB_H
+#ifndef FFMPEG_MPEGAUDIOTAB_H
+#define FFMPEG_MPEGAUDIOTAB_H
 
 #include <stdint.h>
 #include "mpegaudio.h"
@@ -115,4 +115,4 @@ static const float fixed_smr[SBLIMIT] =  {
 
 static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
 
-#endif // AVCODEC_MPEGAUDIOTAB_H
+#endif /* FFMPEG_MPEGAUDIOTAB_H */
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index d3d8f6f334..f984f2d939 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -25,8 +25,8 @@
  * mpegvideo header.
  */
 
-#ifndef AVCODEC_MPEGVIDEO_H
-#define AVCODEC_MPEGVIDEO_H
+#ifndef FFMPEG_MPEGVIDEO_H
+#define FFMPEG_MPEGVIDEO_H
 
 #include "dsputil.h"
 #include "bitstream.h"
@@ -898,5 +898,5 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
                        DCTELEM block[6][64],
                        int motion_x, int motion_y);
 
-#endif /* AVCODEC_MPEGVIDEO_H */
+#endif /* FFMPEG_MPEGVIDEO_H */
 
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index 0698e1ddfb..f2655a9545 100644
--- a/libavcodec/mpegvideo_common.h
+++ b/libavcodec/mpegvideo_common.h
@@ -27,8 +27,8 @@
  * The simplest mpeg encoder (well, it was the simplest!).
  */
 
-#ifndef MPEGVIDEO_COMMON_H
-#define MPEGVIDEO_COMMON_H
+#ifndef FFMPEG_MPEGVIDEO_COMMON_H
+#define FFMPEG_MPEGVIDEO_COMMON_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -833,4 +833,4 @@ static inline void MPV_motion(MpegEncContext *s,
     }
 }
 
-#endif /* MPEGVIDEO_COMMON_H */
+#endif /* FFMPEG_MPEGVIDEO_COMMON_H */
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 1b2dabdb29..2012cb407a 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -23,8 +23,8 @@
  * @file msmpeg4.h
  */
 
-#ifndef MSMPEG4_H
-#define MSMPEG4_H
+#ifndef FFMPEG_MSMPEG4_H
+#define FFMPEG_MSMPEG4_H
 
 #include "config.h"
 
@@ -41,4 +41,4 @@
 #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER)
 #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER)
 
-#endif /* MSMPEG4_H */
+#endif /* FFMPEG_MSMPEG4_H */
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index b79b291a62..23640e4d6e 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -27,8 +27,8 @@
  * MSMPEG4 data tables.
  */
 
-#ifndef MSMPEG4DATA_H
-#define MSMPEG4DATA_H
+#ifndef FFMPEG_MSMPEG4DATA_H
+#define FFMPEG_MSMPEG4DATA_H
 
 #include "common.h"
 #include "bitstream.h"
@@ -97,4 +97,4 @@ extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2];
 extern const uint8_t wmv2_scantableA[64];
 extern const uint8_t wmv2_scantableB[64];
 
-#endif /* MSMPEG4DATA_H */
+#endif /* FFMPEG_MSMPEG4DATA_H */
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index b79f462660..0860d16a33 100644
--- a/libavcodec/opt.h
+++ b/libavcodec/opt.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVOPT_H
-#define AVOPT_H
+#ifndef FFMPEG_OPT_H
+#define FFMPEG_OPT_H
 
 /**
  * @file opt.h
@@ -84,4 +84,4 @@ int av_opt_show(void *obj, void *av_log_obj);
 void av_opt_set_defaults(void *s);
 void av_opt_set_defaults2(void *s, int mask, int flags);
 
-#endif
+#endif /* FFMPEG_OPT_H */
diff --git a/libavcodec/png.h b/libavcodec/png.h
index 1e95ba2538..e6fced7f37 100644
--- a/libavcodec/png.h
+++ b/libavcodec/png.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PNG_H
-#define AVCODEC_PNG_H
+#ifndef FFMPEG_PNG_H
+#define FFMPEG_PNG_H
 
 #include <stdint.h>
 
@@ -71,4 +71,4 @@ extern int ff_png_get_nb_channels(int color_type);
 /* compute the row size of an interleaved pass */
 extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
 
-#endif
+#endif /* FFMPEG_PNG_H */
diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h
index fa5e55e69d..c77bcca09e 100644
--- a/libavcodec/pnm.h
+++ b/libavcodec/pnm.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef PNM_H
-#define PNM_H
+#ifndef FFMPEG_PNM_H
+#define FFMPEG_PNM_H
 
 #include "avcodec.h"
 
@@ -34,4 +34,4 @@ typedef struct PNMContext {
 
 int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s);
 
-#endif /* PNM_H */
+#endif /* FFMPEG_PNM_H */
diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h
index 539fa04e74..ef75c4037e 100644
--- a/libavcodec/ppc/dsputil_altivec.h
+++ b/libavcodec/ppc/dsputil_altivec.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DSPUTIL_ALTIVEC_H
-#define DSPUTIL_ALTIVEC_H
+#ifndef FFMPEG_DSPUTIL_ALTIVEC_H
+#define FFMPEG_DSPUTIL_ALTIVEC_H
 
 #include "dsputil_ppc.h"
 
@@ -31,4 +31,4 @@ void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size,
 
 void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h);
 
-#endif /* DSPUTIL_ALTIVEC_H */
+#endif /* FFMPEG_DSPUTIL_ALTIVEC_H */
diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h
index 803fe283a3..d8f6b27f98 100644
--- a/libavcodec/ppc/dsputil_ppc.h
+++ b/libavcodec/ppc/dsputil_ppc.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DSPUTIL_PPC_H
-#define DSPUTIL_PPC_H
+#ifndef FFMPEG_DSPUTIL_PPC_H
+#define FFMPEG_DSPUTIL_PPC_H
 
 #ifdef CONFIG_POWERPC_PERF
 void powerpc_display_perf_report(void);
@@ -152,4 +152,4 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][
 #define POWERPC_PERF_STOP_COUNT(a, cond)     do {} while (0)
 #endif /* CONFIG_POWERPC_PERF */
 
-#endif /*  DSPUTIL_PPC_H */
+#endif /*  FFMPEG_DSPUTIL_PPC_H */
diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h
index c9c5dd8d66..7edbe74033 100644
--- a/libavcodec/ppc/gcc_fixes.h
+++ b/libavcodec/ppc/gcc_fixes.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GCC_FIXES_H
-#define GCC_FIXES_H
+#ifndef FFMPEG_GCC_FIXES_H
+#define FFMPEG_GCC_FIXES_H
 
 #ifdef HAVE_ALTIVEC_H
 #include <altivec.h>
@@ -97,4 +97,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \
 
 #endif
 
-#endif /* GCC_FIXES_H */
+#endif /* FFMPEG_GCC_FIXES_H */
diff --git a/libavcodec/ppc/imgresample_altivec.h b/libavcodec/ppc/imgresample_altivec.h
index e7a1254591..f27d9cb5b4 100644
--- a/libavcodec/ppc/imgresample_altivec.h
+++ b/libavcodec/ppc/imgresample_altivec.h
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef IMGRESAMPLE_ALTIVEC_H
-#define IMGRESAMPLE_ALTIVEC_H
+#ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H
+#define FFMPEG_IMGRESAMPLE_ALTIVEC_H
 
 void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src,
                           int wrap, int16_t *filter);
-#endif /* IMGRESAMPLE_ALTIVEC_H */
+#endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 92483fb6f2..d7cc85365f 100644
--- a/libavcodec/ppc/mathops.h
+++ b/libavcodec/ppc/mathops.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_PPC_MATHOPS_H
-#define AVCODEC_PPC_MATHOPS_H
+#ifndef FFMPEG_PPC_MATHOPS_H
+#define FFMPEG_PPC_MATHOPS_H
 
 #if defined(ARCH_POWERPC_405)
 /* signed 16x16 -> 32 multiply add accumulate */
@@ -35,4 +35,4 @@
          __rt; })
 #endif
 
-#endif // AVCODEC_PPC_MATHOPS_H
+#endif /* FFMPEG_PPC_MATHOPS_H */
diff --git a/libavcodec/ppc/types_altivec.h b/libavcodec/ppc/types_altivec.h
index d8430097a6..6d41a928bf 100644
--- a/libavcodec/ppc/types_altivec.h
+++ b/libavcodec/ppc/types_altivec.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_TYPES_ALTIVEC_H
-#define AVCODEC_TYPES_ALTIVEC_H
+#ifndef FFMPEG_TYPES_ALTIVEC_H
+#define FFMPEG_TYPES_ALTIVEC_H
 
 /***********************************************************************
  * Vector types
@@ -43,4 +43,4 @@
 #define zero_u32v (vec_u32_t) zerov
 #define zero_s32v (vec_s32_t) zerov
 
-#endif // AVCODEC_TYPES_ALTIVEC_H
+#endif /* FFMPEG_TYPES_ALTIVEC_H */
diff --git a/libavcodec/ppc/util_altivec.h b/libavcodec/ppc/util_altivec.h
index 63b7f1a0c4..ed029b4d85 100644
--- a/libavcodec/ppc/util_altivec.h
+++ b/libavcodec/ppc/util_altivec.h
@@ -21,8 +21,8 @@
  * Contains misc utility macros and inline functions
  */
 
-#ifndef UTIL_ALTIVEC_H
-#define UTIL_ALTIVEC_H
+#ifndef FFMPEG_UTIL_ALTIVEC_H
+#define FFMPEG_UTIL_ALTIVEC_H
 
 // used to build registers permutation vectors (vcprm)
 // the 's' are for words in the _s_econd vector
@@ -103,4 +103,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src)
     return vec_perm(first, second, mask);
 }
 
-#endif /* UTIL_ALTIVEC_H */
+#endif /* FFMPEG_UTIL_ALTIVEC_H */
diff --git a/libavcodec/ps2/mmi.h b/libavcodec/ps2/mmi.h
index 62e8fcec6e..1e0a504f8f 100644
--- a/libavcodec/ps2/mmi.h
+++ b/libavcodec/ps2/mmi.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MMI_H
-#define MMI_H
+#ifndef FFMPEG_MMI_H
+#define FFMPEG_MMI_H
 
 #define align16 __attribute__ ((aligned (16)))
 
@@ -168,5 +168,4 @@
 #define         pextlb(rs, rt, rd) \
         __asm__ __volatile__ ("pextlb  " #rd ", " #rs ", " #rt )
 
-#endif
-
+#endif /* FFMPEG_MMI_H */
diff --git a/libavcodec/qdm2data.h b/libavcodec/qdm2data.h
index cfadd87f68..8edb246e49 100644
--- a/libavcodec/qdm2data.h
+++ b/libavcodec/qdm2data.h
@@ -27,8 +27,8 @@
  * Various QDM2 tables.
  */
 
-#ifndef QDM2DATA_H
-#define QDM2DATA_H
+#ifndef FFMPEG_QDM2DATA_H
+#define FFMPEG_QDM2DATA_H
 
 #include <stdint.h>
 
@@ -528,4 +528,4 @@ static const float type34_delta[10] = { // FIXME: covers 8 entries..
     0.138071194291115f,0.333333343267441f,0.60947573184967f,1.0f,0.0f,
 };
 
-#endif /* QDM2DATA_H */
+#endif /* FFMPEG_QDM2DATA_H */
diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h
index 6d477b2f8d..0d7a14a4f5 100644
--- a/libavcodec/ra144.h
+++ b/libavcodec/ra144.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RA144TABLES_H
-#define RA144TABLES_H
+#ifndef FFMPEG_RA144_H
+#define FFMPEG_RA144_H
 
 /* 14.4 data tables */
 static const unsigned short sqrt_table[4096]={
@@ -2425,4 +2425,4 @@ decodetable1,decodetable2,decodetable3,decodetable4,decodetable5,
 decodetable6,decodetable7,decodetable8,decodetable9,decodetable10,
 decodetable11};
 
-#endif /* RA144TABLES_H */
+#endif /* FFMPEG_RA144_H */
diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h
index 8cc2903974..e222035a2c 100644
--- a/libavcodec/ra288.h
+++ b/libavcodec/ra288.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RA288TABLES_H
-#define RA288TABLES_H
+#ifndef FFMPEG_RA288_H
+#define FFMPEG_RA288_H
 
 static const float amptable[8]={ 0.515625, 0.90234375, 1.57910156, 2.76342773,
                          -0.515625,-0.90234375,-1.57910156,-2.76342773 };
@@ -202,4 +202,4 @@ static const float table2a[10]={
         0.553955078,        0.50201416,        0.454956055,        0.41229248,        0.373657227
 };
 
-#endif /* RA288TABLES_H */
+#endif /* FFMPEG_RA288_H */
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index f26b39aa7f..4726afb56e 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -24,8 +24,8 @@
  * Range coder.
  */
 
-#ifndef AVCODEC_RANGECODER_H
-#define AVCODEC_RANGECODER_H
+#ifndef FFMPEG_RANGECODER_H
+#define FFMPEG_RANGECODER_H
 
 #include <stdint.h>
 #include <assert.h>
@@ -138,4 +138,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
 #endif
 }
 
-#endif // AVCODEC_RANGECODER_H
+#endif /* FFMPEG_RANGECODER_H */
diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h
index a1017751e2..8704b43014 100644
--- a/libavcodec/ratecontrol.h
+++ b/libavcodec/ratecontrol.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_RATECONTROL_H
-#define AVCODEC_RATECONTROL_H
+#ifndef FFMPEG_RATECONTROL_H
+#define FFMPEG_RATECONTROL_H
 
 /**
  * @file ratecontrol.h
@@ -101,5 +101,5 @@ int ff_xvid_rate_control_init(struct MpegEncContext *s);
 void ff_xvid_rate_control_uninit(struct MpegEncContext *s);
 float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run);
 
-#endif /* AVCODEC_RATECONTROL_H */
+#endif /* FFMPEG_RATECONTROL_H */
 
diff --git a/libavcodec/raw.h b/libavcodec/raw.h
index e600dca395..1110114e25 100644
--- a/libavcodec/raw.h
+++ b/libavcodec/raw.h
@@ -24,8 +24,8 @@
  * Raw Video Codec
  */
 
-#ifndef AVCODEC_RAW_H
-#define AVCODEC_RAW_H
+#ifndef FFMPEG_RAW_H
+#define FFMPEG_RAW_H
 
 #include "avcodec.h"
 
@@ -36,4 +36,4 @@ typedef struct PixelFormatTag {
 
 extern const PixelFormatTag ff_raw_pixelFormatTags[];
 
-#endif /* AVCODEC_RAW_H */
+#endif /* FFMPEG_RAW_H */
diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index bb7a7ee779..ecea2c8911 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -24,8 +24,8 @@
  * rl header.
  */
 
-#ifndef AVCODEC_RL_H
-#define AVCODEC_RL_H
+#ifndef FFMPEG_RL_H
+#define FFMPEG_RL_H
 
 #include <stdint.h>
 #include "bitstream.h"
@@ -64,4 +64,4 @@ static inline int get_rl_index(const RLTable *rl, int last, int run, int level)
     return index + level - 1;
 }
 
-#endif
+#endif /* FFMPEG_RL_H */
diff --git a/libavcodec/rle.h b/libavcodec/rle.h
index 15252c85d0..14d07084f6 100644
--- a/libavcodec/rle.h
+++ b/libavcodec/rle.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RLE_H
-#define RLE_H
+#ifndef FFMPEG_RLE_H
+#define FFMPEG_RLE_H
 
 #include <stdint.h>
 
@@ -36,4 +36,4 @@
 int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp, int w,
                   int add_rep, int xor_rep, int add_raw, int xor_raw);
 
-#endif /* RLE_H */
+#endif /* FFMPEG_RLE_H */
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 202f32a394..c7544278f2 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ROQVIDEO_H
-#define AVCODEC_ROQVIDEO_H
+#ifndef FFMPEG_ROQVIDEO_H
+#define FFMPEG_ROQVIDEO_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -89,4 +89,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 // AVCODEC_ROQVIDEO_H
+#endif /* FFMPEG_ROQVIDEO_H */
diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h
index c36a54f8b4..f707a76661 100644
--- a/libavcodec/rtjpeg.h
+++ b/libavcodec/rtjpeg.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RTJPEG_H
-#define RTJPEG_H
+#ifndef FFMPEG_RTJPEG_H
+#define FFMPEG_RTJPEG_H
 
 #include <stdint.h>
 #include <dsputil.h>
@@ -39,4 +39,4 @@ void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
 
 int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
                                uint8_t *buf, int buf_size);
-#endif
+#endif /* FFMPEG_RTJPEG_H */
diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h
index d368c5b805..9ead901b6e 100644
--- a/libavcodec/s3tc.h
+++ b/libavcodec/s3tc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FF_S3TC_H
-#define FF_S3TC_H
+#ifndef FFMPEG_S3TC_H
+#define FFMPEG_S3TC_H
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@ void ff_decode_dxt3(const uint8_t *src, uint8_t *dst,
                     const unsigned int w, const unsigned int h,
                     const unsigned int stride);
 
-#endif
+#endif /* FFMPEG_S3TC_H */
diff --git a/libavcodec/sgi.h b/libavcodec/sgi.h
index 53d390a74d..8c658761dc 100644
--- a/libavcodec/sgi.h
+++ b/libavcodec/sgi.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SGI_H
-#define SGI_H
+#ifndef FFMPEG_SGI_H
+#define FFMPEG_SGI_H
 
 /**
  * SGI image file signature
@@ -33,5 +33,4 @@
 #define SGI_RGB 3
 #define SGI_RGBA 4
 
-#endif
-
+#endif /* FFMPEG_SGI_H */
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index 43f4ad2fe1..48c7db6b21 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -25,8 +25,8 @@
  * simple idct header.
  */
 
-#ifndef AVCODEC_SIMPLE_IDCT_H
-#define AVCODEC_SIMPLE_IDCT_H
+#ifndef FFMPEG_SIMPLE_IDCT_H
+#define FFMPEG_SIMPLE_IDCT_H
 
 #include <stdint.h>
 #include "dsputil.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 // AVCODEC_SIMPLE_IDCT_H
+#endif /* FFMPEG_SIMPLE_IDCT_H */
diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index a6cca967b4..e9b988986c 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SNOW_H
-#define SNOW_H
+#ifndef FFMPEG_SNOW_H
+#define FFMPEG_SNOW_H
 
 #include "dsputil.h"
 
@@ -171,4 +171,4 @@ static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTE
         }
 }
 
-#endif
+#endif /* FFMPEG_SNOW_H */
diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h
index 7916d1b607..e93408b34c 100644
--- a/libavcodec/sp5x.h
+++ b/libavcodec/sp5x.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SP5X_H
-#define SP5X_H
+#ifndef FFMPEG_SP5X_H
+#define FFMPEG_SP5X_H
 
 #include <stdint.h>
 
@@ -331,4 +331,4 @@ static const uint8_t sp5x_quant_table_orig[18][64] =
 };
 #endif
 
-#endif /* SP5X_H */
+#endif /* FFMPEG_SP5X_H */
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h
index 22c292672f..a0b09f5bc4 100644
--- a/libavcodec/sparc/vis.h
+++ b/libavcodec/sparc/vis.h
@@ -40,8 +40,8 @@
  * the assembler to keep the binary from becoming tainted.
  */
 
-#ifndef AVCODEC_VIS_H
-#define AVCODEC_VIS_H
+#ifndef FFMPEG_VIS_H
+#define FFMPEG_VIS_H
 
 #define vis_opc_base    ((0x1 << 31) | (0x36 << 19))
 #define vis_opf(X)      ((X) << 5)
@@ -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 // AVCODEC_VIS_H
+#endif /* FFMPEG_VIS_H */
diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h
index e0930bf9a8..48fe6c72e1 100644
--- a/libavcodec/svq1.h
+++ b/libavcodec/svq1.h
@@ -32,8 +32,8 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
-#ifndef AVCODEC_SVQ1_H
-#define AVCODEC_SVQ1_H
+#ifndef FFMPEG_SVQ1_H
+#define FFMPEG_SVQ1_H
 
 #include <stdint.h>
 
@@ -58,4 +58,4 @@ extern const uint16_t ff_svq1_inter_mean_vlc[512][2];
 
 extern svq1_frame_size_t ff_svq1_frame_size_table[8];
 
-#endif /* AVCODEC_SVQ1_H */
+#endif /* FFMPEG_SVQ1_H */
diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h
index 2df53af655..f4a4054d1c 100644
--- a/libavcodec/svq1_cb.h
+++ b/libavcodec/svq1_cb.h
@@ -28,8 +28,8 @@
  * svq1 code books.
  */
 
-#ifndef AVCODEC_SVQ1_CB_H
-#define AVCODEC_SVQ1_CB_H
+#ifndef FFMPEG_SVQ1_CB_H
+#define FFMPEG_SVQ1_CB_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1520,4 +1520,4 @@ const int8_t* const ff_svq1_intra_codebooks[6] = {
     NULL, NULL,
 };
 
-#endif // AVCODEC_SVQ1_CB_H
+#endif /* FFMPEG_SVQ1_CB_H */
diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h
index 3776158947..05fb12aad2 100644
--- a/libavcodec/svq1_vlc.h
+++ b/libavcodec/svq1_vlc.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef SVQ1_VLC_H
-#define SVQ1_VLC_H
+#ifndef FFMPEG_SVQ1_VLC_H
+#define FFMPEG_SVQ1_VLC_H
 
 #include <stdint.h>
 
@@ -280,4 +280,4 @@ const uint16_t ff_svq1_inter_mean_vlc[512][2] = {
     { 0x3, 22 },  { 0x2, 22 },  { 0x1, 22 },  { 0x0, 22 }
 };
 
-#endif
+#endif /* FFMPEG_SVQ1_VLC_H */
diff --git a/libavcodec/svq1enc_cb.h b/libavcodec/svq1enc_cb.h
index c97b92de89..1feeed0ab6 100644
--- a/libavcodec/svq1enc_cb.h
+++ b/libavcodec/svq1enc_cb.h
@@ -24,8 +24,8 @@
  * svq1 code books.
  */
 
-#ifndef AVCODEC_SVQ1ENC_CB_H
-#define AVCODEC_SVQ1ENC_CB_H
+#ifndef FFMPEG_SVQ1ENC_CB_H
+#define FFMPEG_SVQ1ENC_CB_H
 
 #include <stdint.h>
 
@@ -93,4 +93,4 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = {
  }
 };
 
-#endif /* AVCODEC_SVQ1ENC_CB_H */
+#endif /* FFMPEG_SVQ1ENC_CB_H */
diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index 594fcc5d0c..c5687d7df6 100644
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -24,8 +24,8 @@
  * @file tiff.h
  * @author Konstantin Shishkov
  */
-#ifndef TIFF_H
-#define TIFF_H
+#ifndef FFMPEG_TIFF_H
+#define FFMPEG_TIFF_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ static const uint8_t type_sizes[6] = {
     0, 1, 100, 2, 4, 8
 };
 
-#endif                          /* TIFF_H */
+#endif /* FFMPEG_TIFF_H */
diff --git a/libavcodec/truemotion1data.h b/libavcodec/truemotion1data.h
index f8355e2bc5..e9662e3d04 100644
--- a/libavcodec/truemotion1data.h
+++ b/libavcodec/truemotion1data.h
@@ -22,8 +22,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 TRUEMOTION1DATA_H
-#define TRUEMOTION1DATA_H
+#ifndef FFMPEG_TRUEMOTION1DATA_H
+#define FFMPEG_TRUEMOTION1DATA_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -829,4 +829,5 @@ static const uint8_t pc_tbl4[] = {
 };
 
 static const uint8_t *tables[] = { pc_tbl2, pc_tbl3, pc_tbl4 };
-#endif
+
+#endif /* FFMPEG_TRUEMOTION1DATA_H */
diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h
index 1ee75dc128..c7ca559103 100644
--- a/libavcodec/truespeech_data.h
+++ b/libavcodec/truespeech_data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef TRUESPEECH_DATA_H
-#define TRUESPEECH_DATA_H
+#ifndef FFMPEG_TRUESPEECH_DATA_H
+#define FFMPEG_TRUESPEECH_DATA_H
 
 #include <stdint.h>
 
@@ -156,4 +156,4 @@ static const int16_t ts_5E2[8] =
 static const int16_t ts_5F2[8] =
     { 0x6000, 0x4800, 0x3600, 0x2880, 0x1E60, 0x16C8, 0x1116, 0x0CD1 };
 
-#endif /* TRUESPEECH_DATA_H */
+#endif /* FFMPEG_TRUESPEECH_DATA_H */
diff --git a/libavcodec/ulti_cb.h b/libavcodec/ulti_cb.h
index 43e4e125ec..e7bd3b86b0 100644
--- a/libavcodec/ulti_cb.h
+++ b/libavcodec/ulti_cb.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ULTI_CB_H
-#define AVCODEC_ULTI_CB_H
+#ifndef FFMPEG_ULTI_CB_H
+#define FFMPEG_ULTI_CB_H
 
 static const unsigned char ulti_codebook[16384]={
     0x00, 0x01, 0x01, 0x02,
@@ -4121,4 +4121,4 @@ static const unsigned char ulti_codebook[16384]={
     0x3D, 0x3E, 0x3E, 0x3F
 };
 
-#endif // AVCODEC_ULTI_CB_H
+#endif /* FFMPEG_ULTI_CB_H */
diff --git a/libavcodec/unary.h b/libavcodec/unary.h
index 5484be4d56..abd7a531b1 100644
--- a/libavcodec/unary.h
+++ b/libavcodec/unary.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_UNARY_H
-#define AVCODEC_UNARY_H
+#ifndef FFMPEG_UNARY_H
+#define FFMPEG_UNARY_H
 
 #include "bitstream.h"
 
@@ -53,4 +53,4 @@ static inline int get_unary_0_9(GetBitContext *gb)
     return get_unary(gb, 0, 9);
 }
 
-#endif /* AVCODEC_UNARY_H */
+#endif /* FFMPEG_UNARY_H */
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index aa61dfaa8c..7412dde9b5 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_VC1_H
-#define AVCODEC_VC1_H
+#ifndef FFMPEG_VC1_H
+#define FFMPEG_VC1_H
 
 #include "avcodec.h"
 #include "mpegvideo.h"
@@ -304,4 +304,4 @@ typedef struct VC1Context{
     int bi_type;
 } VC1Context;
 
-#endif // AVCODEC_VC1_H
+#endif /* FFMPEG_VC1_H */
diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h
index 48d350cd90..f775283ddb 100644
--- a/libavcodec/vc1acdata.h
+++ b/libavcodec/vc1acdata.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_VC1ACDATA_H
-#define AVCODEC_VC1ACDATA_H
+#ifndef FFMPEG_VC1ACDATA_H
+#define FFMPEG_VC1ACDATA_H
 
 #include <stdint.h>
 
@@ -589,4 +589,4 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = {
 }
 };
 
-#endif // AVCODEC_VC1ACDATA_H
+#endif /* FFMPEG_VC1ACDATA_H */
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 786e311035..5d995d754f 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -25,8 +25,8 @@
  * VC-1 tables.
  */
 
-#ifndef VC1DATA_H
-#define VC1DATA_H
+#ifndef FFMPEG_VC1DATA_H
+#define FFMPEG_VC1DATA_H
 
 #include <stdint.h>
 #include "bitstream.h"
@@ -160,4 +160,4 @@ extern const int8_t ff_vc1_adv_interlaced_4x4_zz [16];
 /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */
 extern const int32_t ff_vc1_dqscale[63];
 
-#endif /* VC1DATA_H */
+#endif /* FFMPEG_VC1DATA_H */
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index cda909aa9e..f5e8b7a99a 100644
--- a/libavcodec/vorbis.h
+++ b/libavcodec/vorbis.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VORBIS_H
-#define VORBIS_H
+#ifndef FFMPEG_VORBIS_H
+#define FFMPEG_VORBIS_H
 
 #include "avcodec.h"
 
@@ -40,4 +40,4 @@ void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16
 
 #define ilog(i) av_log2(2*(i))
 
-#endif
+#endif /* FFMPEG_VORBIS_H */
diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h
index 8875d77e67..1b4be9aaa1 100644
--- a/libavcodec/vorbis_enc_data.h
+++ b/libavcodec/vorbis_enc_data.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_VORBIS_ENC_DATA_H
-#define AVCODEC_VORBIS_ENC_DATA_H
+#ifndef FFMPEG_VORBIS_ENC_DATA_H
+#define FFMPEG_VORBIS_ENC_DATA_H
 
 #include <stdint.h>
 
@@ -502,4 +502,4 @@ static const struct {
     { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
 };
 
-#endif // AVCODEC_VORBIS_ENC_DATA_H
+#endif /* FFMPEG_VORBIS_ENC_DATA_H */
diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h
index 77bdd7ac77..aa33b83275 100644
--- a/libavcodec/vp3data.h
+++ b/libavcodec/vp3data.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP3DATA_H
-#define VP3DATA_H
+#ifndef FFMPEG_VP3DATA_H
+#define FFMPEG_VP3DATA_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -3178,4 +3178,4 @@ static const uint16_t ac_bias_3[16][32][2] = {
   }
 };
 
-#endif /* VP3DATA_H */
+#endif /* FFMPEG_VP3DATA_H */
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 22fd83d0bf..0bfd13a216 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP56_H
-#define VP56_H
+#ifndef FFMPEG_VP56_H
+#define FFMPEG_VP56_H
 
 #include "vp56data.h"
 #include "dsputil.h"
@@ -265,4 +265,4 @@ static inline int vp56_rac_get_tree(vp56_range_coder_t *c,
     return -tree->val;
 }
 
-#endif /* VP56_H */
+#endif /* FFMPEG_VP56_H */
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index 624b7bf4ea..0dd79b06b1 100644
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP56DATA_H
-#define VP56DATA_H
+#ifndef FFMPEG_VP56DATA_H
+#define FFMPEG_VP56DATA_H
 
 #include "common.h"
 
@@ -248,4 +248,4 @@ static const int8_t vp56_candidate_predictor_pos[12][2] = {
     {  2, -2 },
 };
 
-#endif /* VP56DATA */
+#endif /* FFMPEG_VP56DATA_H */
diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h
index 0f3754cce0..c08688a213 100644
--- a/libavcodec/vp5data.h
+++ b/libavcodec/vp5data.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP5DATA_H
-#define VP5DATA_H
+#ifndef FFMPEG_VP5DATA_H
+#define FFMPEG_VP5DATA_H
 
 #include <stdint.h>
 
@@ -172,4 +172,4 @@ static const int16_t vp5_ract_lc[3][3][5][6][2] = {
 
 static const uint8_t vp5_coord_div[] = { 2, 2, 2, 2, 4, 4 };
 
-#endif /* VP5DATA_H */
+#endif /* FFMPEG_VP5DATA_H */
diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 70bf1b88c4..8d4bb0b57f 100644
--- a/libavcodec/vp6data.h
+++ b/libavcodec/vp6data.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VP6DATA_H
-#define VP6DATA_H
+#ifndef FFMPEG_VP6DATA_H
+#define FFMPEG_VP6DATA_H
 
 #include "vp56data.h"
 
@@ -305,4 +305,4 @@ static const uint8_t vp6_huff_run_map[] = {
     10, 13, 11, 12, 0, 1, 2, 3, 14, 8, 15, 16, 4, 5, 6, 7
 };
 
-#endif /* VP6DATA_H */
+#endif /* FFMPEG_VP6DATA_H */
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index b5a043bd36..88b5dbf9e9 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef WMA_H
-#define WMA_H
+#ifndef FFMPEG_WMA_H
+#define FFMPEG_WMA_H
 
 #include "bitstream.h"
 #include "dsputil.h"
@@ -147,4 +147,4 @@ int ff_wma_init(AVCodecContext * avctx, int flags2);
 int ff_wma_total_gain_to_bits(int total_gain);
 int ff_wma_end(AVCodecContext *avctx);
 
-#endif
+#endif /* FFMPEG_WMA_H */
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h
index 8775bcded8..aa2a120a2b 100644
--- a/libavcodec/wmadata.h
+++ b/libavcodec/wmadata.h
@@ -24,8 +24,8 @@
  * Various WMA tables.
  */
 
-#ifndef AVCODEC_WMADATA_H
-#define AVCODEC_WMADATA_H
+#ifndef FFMPEG_WMADATA_H
+#define FFMPEG_WMADATA_H
 
 #include <stdint.h>
 #include "wma.h"
@@ -1438,4 +1438,4 @@ static const CoefVLCTable coef_vlcs[6] = {
     },
 };
 
-#endif // AVCODEC_WMADATA_H
+#endif /* FFMPEG_WMADATA_H */
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 910ff37a10..7e75750107 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_XIPH_H
-#define AVCODEC_XIPH_H
+#ifndef FFMPEG_XIPH_H
+#define FFMPEG_XIPH_H
 
 #include "common.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 // AVCODEC_XIPH_H
+#endif /* FFMPEG_XIPH_H */
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h
index 66b5d61f31..10fd56ffaa 100644
--- a/libavcodec/xvmc_render.h
+++ b/libavcodec/xvmc_render.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_XVMC_RENDER_H
-#define AVCODEC_XVMC_RENDER_H
+#ifndef FFMPEG_XVMC_RENDER_H
+#define FFMPEG_XVMC_RENDER_H
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -72,4 +72,4 @@ typedef   struct{
 
 } xvmc_render_state_t;
 
-#endif // AVCODEC_XVMC_RENDER_H
+#endif /* FFMPEG_XVMC_RENDER_H */
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 8387aa50f9..ca92f4c16d 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_ASF_H
-#define AVFORMAT_ASF_H
+#ifndef FFMPEG_ASF_H
+#define FFMPEG_ASF_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -286,4 +286,4 @@ static const GUID my_guid = {
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-#endif // AVFORMAT_ASF_H
+#endif /* FFMPEG_ASF_H */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 770ab7e87b..dbbb9b48c3 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_H
-#define AVFORMAT_H
+#ifndef FFMPEG_AVFORMAT_H
+#define FFMPEG_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_INT ((51<<16)+(15<<8)+0)
 #define LIBAVFORMAT_VERSION     51.15.0
@@ -930,5 +930,4 @@ int match_ext(const char *filename, const char *extensions);
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#endif /* AVFORMAT_H */
-
+#endif /* FFMPEG_AVFORMAT_H */
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 6606226007..eb93e47e5d 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.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 AVIO_H
-#define AVIO_H
+#ifndef FFMPEG_AVIO_H
+#define FFMPEG_AVIO_H
 
 #include <stdint.h>
 
@@ -266,5 +266,4 @@ int udp_set_remote_url(URLContext *h, const char *uri);
 int udp_get_local_port(URLContext *h);
 int udp_get_file_handle(URLContext *h);
 
-#endif
-
+#endif /* FFMPEG_AVIO_H */
diff --git a/libavformat/dv.h b/libavformat/dv.h
index 0e33a2f21a..cfe93533a7 100644
--- a/libavformat/dv.h
+++ b/libavformat/dv.h
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_DV_H
-#define AVFORMAT_DV_H
+#ifndef FFMPEG_DV_H
+#define FFMPEG_DV_H
 
 #include "avformat.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 // AVFORMAT_DV_H
+#endif /* FFMPEG_DV_H */
diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h
index 67671e5cf8..7f3521d6e8 100644
--- a/libavformat/dv1394.h
+++ b/libavformat/dv1394.h
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DV_1394_H
-#define DV_1394_H
+#ifndef FFMPEG_DV1394_H
+#define FFMPEG_DV1394_H
 
 #define DV1394_DEFAULT_CHANNEL 63
 #define DV1394_DEFAULT_CARD    0
@@ -353,4 +353,4 @@ struct dv1394_status {
 };
 
 
-#endif /* DV_1394_H */
+#endif /* FFMPEG_DV1394_H */
diff --git a/libavformat/flv.h b/libavformat/flv.h
index 1484ac15d6..59418390e4 100644
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FLV_H
-#define FLV_H
+#ifndef FFMPEG_FLV_H
+#define FFMPEG_FLV_H
 
 /* offsets for packed values */
 #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
@@ -107,4 +107,4 @@ typedef enum {
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FLV_H */
+#endif /* FFMPEG_FLV_H */
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index 1902ebc909..3210cae04f 100644
--- a/libavformat/framehook.h
+++ b/libavformat/framehook.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FRAMEHOOK_H
-#define FRAMEHOOK_H
+#ifndef FFMPEG_FRAMEHOOK_H
+#define FFMPEG_FRAMEHOOK_H
 
 #warning VHOOK is deprecated. Please help porting libmpcodecs or a better filter system to FFmpeg instead of wasting your time writing new filters for this crappy one.
 
@@ -49,4 +49,4 @@ extern int frame_hook_add(int argc, char *argv[]);
 extern void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts);
 extern void frame_hook_release(void);
 
-#endif
+#endif /* FFMPEG_FRAMEHOOK_H */
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index a683bc70b3..8842161e06 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MATROSKA_H
-#define MATROSKA_H
+#ifndef FFMPEG_MATROSKA_H
+#define FFMPEG_MATROSKA_H
 
 #include "avcodec.h"
 
@@ -194,4 +194,4 @@ typedef struct CodecTags{
 
 extern CodecTags ff_mkv_codec_tags[];
 
-#endif /* MATROSKA_H */
+#endif /* FFMPEG_MATROSKA_H */
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index 94c703d464..053b1590ea 100644
--- a/libavformat/mpeg.h
+++ b/libavformat/mpeg.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_MPEG_H
-#define AVFORMAT_MPEG_H
+#ifndef FFMPEG_MPEG_H
+#define FFMPEG_MPEG_H
 
 #define PACK_START_CODE             ((unsigned int)0x000001ba)
 #define SYSTEM_HEADER_START_CODE    ((unsigned int)0x000001bb)
@@ -57,4 +57,4 @@
 
 static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
 
-#endif /* AVFORMAT_MPEG_H */
+#endif /* FFMPEG_MPEG_H */
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index ef0ede6890..cd11495e55 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_MPEGTS_H
-#define AVFORMAT_MPEGTS_H
+#ifndef FFMPEG_MPEGTS_H
+#define FFMPEG_MPEGTS_H
 
 #include "avformat.h"
 
@@ -65,4 +65,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif /* AVFORMAT_MPEGTS_H */
+#endif /* FFMPEG_MPEGTS_H */
diff --git a/libavformat/network.h b/libavformat/network.h
index 4c9a3a07c0..d897722c94 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef FFMPEG_NETWORK_H
+#define FFMPEG_NETWORK_H
 
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
@@ -66,4 +66,4 @@ static inline void ff_network_close(void)
 int inet_aton (const char * str, struct in_addr * add);
 #endif
 
-#endif
+#endif /* FFMPEG_NETWORK_H */
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 3507ced26d..74492cd9ad 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_NUT_H
-#define AVFORMAT_NUT_H
+#ifndef FFMPEG_NUT_H
+#define FFMPEG_NUT_H
 
 //#include <limits.h>
 #include "avformat.h"
@@ -100,4 +100,4 @@ int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b);
 int ff_nut_sp_pts_cmp(syncpoint_t *a, syncpoint_t *b);
 void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 
-#endif /* AVFORMAT_NUT_H */
+#endif /* FFMPEG_NUT_H */
diff --git a/libavformat/ogg2.h b/libavformat/ogg2.h
index 55a4a75e3f..656a3f95aa 100644
--- a/libavformat/ogg2.h
+++ b/libavformat/ogg2.h
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 **/
 
-#ifndef OGG2_H
-#define OGG2_H
+#ifndef FFMPEG_OGG2_H
+#define FFMPEG_OGG2_H
 
 #include "avformat.h"
 
@@ -84,4 +84,4 @@ extern ogg_codec_t ogm_old_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* OGG2_H */
+#endif /* FFMPEG_OGG2_H */
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 029223a56c..9c0965c5c1 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef OS_SUPPORT_H
-#define OS_SUPPORT_H
+#ifndef FFMPEG_OS_SUPPORT_H
+#define FFMPEG_OS_SUPPORT_H
 
 /**
  * @file os_support.h
@@ -96,4 +96,4 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* HAVE_SYS_POLL_H */
 #endif /* CONFIG_FFSERVER */
 
-#endif /* OS_SUPPORT_H */
+#endif /* FFMPEG_OS_SUPPORT_H */
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 183600fdef..088abf3e57 100644
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef QTPALETTE_H
-#define QTPALETTE_H
+#ifndef FFMPEG_QTPALETTE_H
+#define FFMPEG_QTPALETTE_H
 
 unsigned char ff_qt_default_palette_4[4 * 4] = {
   0x93, 0x65, 0x5E, 0x00,
@@ -308,4 +308,4 @@ unsigned char ff_qt_default_palette_256[256 * 4] = {
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif
+#endif /* FFMPEG_QTPALETTE_H */
diff --git a/libavformat/raw.h b/libavformat/raw.h
index ce3e45c932..3d851c829b 100644
--- a/libavformat/raw.h
+++ b/libavformat/raw.h
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_RAW_H
-#define AVFORMAT_RAW_H
+#ifndef FFMPEG_RAW_H
+#define FFMPEG_RAW_H
 
 #include "avformat.h"
 
 int pcm_read_seek(AVFormatContext *s,
                   int stream_index, int64_t timestamp, int flags);
 
-#endif /* AVFORMAT_RAW_H */
+#endif /* FFMPEG_RAW_H */
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 274d184872..dc970f619d 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -25,8 +25,8 @@
  * do NOT include this in end user applications
  */
 
-#ifndef FF_RIFF_H
-#define FF_RIFF_H
+#ifndef FFMPEG_RIFF_H
+#define FFMPEG_RIFF_H
 
 #include "avcodec.h"
 #include "avio.h"
@@ -51,4 +51,4 @@ unsigned int codec_get_tag(const AVCodecTag *tags, int id);
 enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag);
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
-#endif
+#endif /* FFMPEG_RIFF_H */
diff --git a/libavformat/rm.h b/libavformat/rm.h
index 2e307c2125..553fbccc42 100644
--- a/libavformat/rm.h
+++ b/libavformat/rm.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RM_H
-#define RM_H
+#ifndef FFMPEG_RM_H
+#define FFMPEG_RM_H
 
 #include "avformat.h"
 
@@ -57,4 +57,4 @@ typedef struct {
     int sub_packet_lengths[16]; /// Length of each aac subpacket
 } RMContext;
 
-#endif /* RM_H */
+#endif /* FFMPEG_RM_H */
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index bcdb769102..38db56e763 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.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 RTP_H
-#define RTP_H
+#ifndef FFMPEG_RTP_H
+#define FFMPEG_RTP_H
 
 #include "avcodec.h"
 #include "avformat.h"
@@ -122,4 +122,4 @@ typedef enum {
 #endif
 
 extern AVRtpPayloadType_t AVRtpPayloadTypes[];
-#endif /* RTP_H */
+#endif /* FFMPEG_RTP_H */
diff --git a/libavformat/rtp_aac.h b/libavformat/rtp_aac.h
index caa65907cc..f89edf1eb7 100644
--- a/libavformat/rtp_aac.h
+++ b/libavformat/rtp_aac.h
@@ -17,9 +17,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef RTP_AAC_H
-#define RTP_AAC_H
+#ifndef FFMPEG_RTP_AAC_H
+#define FFMPEG_RTP_AAC_H
 
 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
 
-#endif /* RTP_AAC_H */
+#endif /* FFMPEG_RTP_AAC_H */
diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h
index f12809bc3c..57fc5325ea 100644
--- a/libavformat/rtp_h264.h
+++ b/libavformat/rtp_h264.h
@@ -19,10 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RTP_H264_H
-#define RTP_H264_H
+#ifndef FFMPEG_RTP_H264_H
+#define FFMPEG_RTP_H264_H
 
 #include "rtp_internal.h"
 
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
-#endif /* RTP_H264_H */
+
+#endif /* FFMPEG_RTP_H264_H */
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index 4bfa4bba62..6ef797cb70 100644
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -20,8 +20,8 @@
  */
 
 // this is a bit of a misnomer, because rtp & rtsp internal structures and prototypes are in here.
-#ifndef RTP_INTERNAL_H
-#define RTP_INTERNAL_H
+#ifndef FFMPEG_RTP_INTERNAL_H
+#define FFMPEG_RTP_INTERNAL_H
 
 #include <stdint.h>
 #include "avcodec.h"
@@ -116,5 +116,5 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
 
 void av_register_rtp_dynamic_payload_handlers(void);
 
-#endif /* RTP_INTERNAL_H */
+#endif /* FFMPEG_RTP_INTERNAL_H */
 
diff --git a/libavformat/rtp_mpv.h b/libavformat/rtp_mpv.h
index 41133672ad..4a7568d754 100644
--- a/libavformat/rtp_mpv.h
+++ b/libavformat/rtp_mpv.h
@@ -17,9 +17,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef RTP_MPV_H
-#define RTP_MPV_H
+#ifndef FFMPEG_RTP_MPV_H
+#define FFMPEG_RTP_MPV_H
 
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
 
-#endif /* RTP_MPV_H */
+#endif /* FFMPEG_RTP_MPV_H */
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index a41032ddc3..67d37d6871 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.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 RTSP_H
-#define RTSP_H
+#ifndef FFMPEG_RTSP_H
+#define FFMPEG_RTSP_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -88,4 +88,4 @@ extern int rtsp_rtp_port_max;
 int rtsp_pause(AVFormatContext *s);
 int rtsp_resume(AVFormatContext *s);
 
-#endif /* RTSP_H */
+#endif /* FFMPEG_RTSP_H */
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h
index 9e4d87bae6..d4ad25b76f 100644
--- a/libavformat/rtspcodes.h
+++ b/libavformat/rtspcodes.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVFORMAT_RTSPCODES_H
-#define AVFORMAT_RTSPCODES_H
+#ifndef FFMPEG_RTSPCODES_H
+#define FFMPEG_RTSPCODES_H
 
 /** RTSP handling */
 enum RTSPStatusCode {
@@ -37,4 +37,4 @@ RTSP_STATUS_SERVICE         =503, /**< Service Unavailable */
 RTSP_STATUS_VERSION         =505, /**< RTSP Version not supported */
 };
 
-#endif // AVFORMAT_RTSPCODES_H
+#endif /* FFMPEG_RTSPCODES_H */
diff --git a/libavformat/voc.h b/libavformat/voc.h
index e98ca39911..606f2152e5 100644
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef VOC_H
-#define VOC_H
+#ifndef FFMPEG_VOC_H
+#define FFMPEG_VOC_H
 
 #include "avformat.h"
 #include "riff.h"    /* for CodecTag */
@@ -48,4 +48,4 @@ extern const AVCodecTag voc_codec_tags[];
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif
+#endif /* FFMPEG_VOC_H */
diff --git a/libavutil/adler32.h b/libavutil/adler32.h
index 223cbfd223..2e29e05b25 100644
--- a/libavutil/adler32.h
+++ b/libavutil/adler32.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef ADLER32_H
-#define ADLER32_H
+#ifndef FFMPEG_ADLER32_H
+#define FFMPEG_ADLER32_H
 
 #include <stdint.h>
 
 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
                                 unsigned int len);
 
-#endif
+#endif /* FFMPEG_ADLER32_H */
diff --git a/libavutil/aes.h b/libavutil/aes.h
index a4ee1f9659..438ba170e4 100644
--- a/libavutil/aes.h
+++ b/libavutil/aes.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AES_H
-#define AES_H
+#ifndef FFMPEG_AES_H
+#define FFMPEG_AES_H
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ int av_aes_init(struct AVAES *a, const uint8_t *key, int key_bits, int decrypt);
  */
 void av_aes_crypt(struct AVAES *a, uint8_t *dst, uint8_t *src, int count, uint8_t *iv, int decrypt);
 
-#endif /* AES_H */
+#endif /* FFMPEG_AES_H */
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index 954174555c..ecac9e6230 100644
--- a/libavutil/avstring.h
+++ b/libavutil/avstring.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_AVSTRING_H
-#define AVUTIL_AVSTRING_H
+#ifndef FFMPEG_AVSTRING_H
+#define FFMPEG_AVSTRING_H
 
 #include <stddef.h>
 
@@ -87,4 +87,4 @@ size_t av_strlcat(char *dst, const char *src, size_t size);
  */
 size_t av_strlcatf(char *dst, size_t size, const char *fmt, ...);
 
-#endif /* AVUTIL_AVSTRING_H */
+#endif /* FFMPEG_AVSTRING_H */
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 70252863cc..764ae846d7 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_H
-#define AVUTIL_H
+#ifndef FFMPEG_AVUTIL_H
+#define FFMPEG_AVUTIL_H
 
 /**
  * @file avutil.h
@@ -129,4 +129,4 @@ enum PixelFormat {
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
-#endif /* AVUTIL_H */
+#endif /* FFMPEG_AVUTIL_H */
diff --git a/libavutil/base64.h b/libavutil/base64.h
index 1ee7014152..e05ead1e03 100644
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_BASE64_H
-#define AVUTIL_BASE64_H
+#ifndef FFMPEG_BASE64_H
+#define FFMPEG_BASE64_H
 
 #include <stdint.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 // AVUTIL_BASE64_H
+#endif /* FFMPEG_BASE64_H */
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 211a15c0ab..850cbe3201 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -23,8 +23,8 @@
  * byte swap.
  */
 
-#ifndef BSWAP_H
-#define BSWAP_H
+#ifndef FFMPEG_BSWAP_H
+#define FFMPEG_BSWAP_H
 
 #include <stdint.h>
 #include "common.h"
@@ -138,4 +138,4 @@ static inline uint64_t bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* BSWAP_H */
+#endif /* FFMPEG_BSWAP_H */
diff --git a/libavutil/common.h b/libavutil/common.h
index 9550403503..f2dd83b323 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -23,8 +23,8 @@
  * common internal and external api header.
  */
 
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef FFMPEG_COMMON_H
+#define FFMPEG_COMMON_H
 
 #include <inttypes.h>
 
@@ -366,4 +366,4 @@ tend= AV_READ_TIME();\
 #define STOP_TIMER(id) {}
 #endif
 
-#endif /* COMMON_H */
+#endif /* FFMPEG_COMMON_H */
diff --git a/libavutil/crc.h b/libavutil/crc.h
index 4fdc4bbd2a..c6205c12a6 100644
--- a/libavutil/crc.h
+++ b/libavutil/crc.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CRC_H
-#define CRC_H
+#ifndef FFMPEG_CRC_H
+#define FFMPEG_CRC_H
 
 #include <stdint.h>
 #include <sys/types.h>
@@ -48,5 +48,5 @@ extern AVCRC av_crc07      [];
 int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
 uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length);
 
-#endif /* CRC_H */
+#endif /* FFMPEG_CRC_H */
 
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index 278a8c82f3..817a8a6b61 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -21,8 +21,8 @@
  * A very simple circular buffer FIFO implementation.
  */
 
-#ifndef FIFO_H
-#define FIFO_H
+#ifndef FFMPEG_FIFO_H
+#define FFMPEG_FIFO_H
 
 #include <stdint.h>
 
@@ -99,4 +99,4 @@ static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
         ptr -= f->end - f->buffer;
     return *ptr;
 }
-#endif /* FIFO_H */
+#endif /* FFMPEG_FIFO_H */
diff --git a/libavutil/integer.h b/libavutil/integer.h
index 2a1df34bc3..f539125d14 100644
--- a/libavutil/integer.h
+++ b/libavutil/integer.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef INTEGER_H
-#define INTEGER_H
+#ifndef FFMPEG_INTEGER_H
+#define FFMPEG_INTEGER_H
 
 #include <stdint.h>
 
@@ -80,4 +80,4 @@ AVInteger av_int2i(int64_t a);
  */
 int64_t av_i2int(AVInteger a);
 
-#endif // INTEGER_H
+#endif /* FFMPEG_INTEGER_H */
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 1ae163f4fa..47472cee46 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -23,8 +23,8 @@
  * common internal api header.
  */
 
-#ifndef INTERNAL_H
-#define INTERNAL_H
+#ifndef FFMPEG_INTERNAL_H
+#define FFMPEG_INTERNAL_H
 
 #if !defined(DEBUG) && !defined(NDEBUG)
 #    define NDEBUG
@@ -278,4 +278,4 @@ static av_always_inline long int lrintf(float x)
 }
 #endif /* HAVE_LRINTF */
 
-#endif /* INTERNAL_H */
+#endif /* FFMPEG_INTERNAL_H */
diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h
index c535b64c8b..fe7fe35201 100644
--- a/libavutil/intfloat_readwrite.h
+++ b/libavutil/intfloat_readwrite.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INTFLOAT_READWRITE_H
-#define INTFLOAT_READWRITE_H
+#ifndef FFMPEG_INTFLOAT_READWRITE_H
+#define FFMPEG_INTFLOAT_READWRITE_H
 
 #include "common.h"
 
@@ -36,4 +36,4 @@ int64_t av_dbl2int(double d);
 int32_t av_flt2int(float d);
 AVExtFloat av_dbl2ext(double d);
 
-#endif /* INTFLOAT_READWRITE_H */
+#endif /* FFMPEG_INTFLOAT_READWRITE_H */
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index d6c1b67ffa..9832b56f35 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INTREADWRITE_H
-#define INTREADWRITE_H
+#ifndef FFMPEG_INTREADWRITE_H
+#define FFMPEG_INTREADWRITE_H
 
 #include <stdint.h>
 #include "bswap.h"
@@ -186,4 +186,4 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
                     ((uint8_t*)(p))[7] = (d)>>56; } while(0)
 #endif
 
-#endif /* INTREADWRITE_H */
+#endif /* FFMPEG_INTREADWRITE_H */
diff --git a/libavutil/lls.h b/libavutil/lls.h
index e6d352a9ef..90b2332aa9 100644
--- a/libavutil/lls.h
+++ b/libavutil/lls.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LLS_H
-#define LLS_H
+#ifndef FFMPEG_LLS_H
+#define FFMPEG_LLS_H
 
 #define MAX_VARS 32
 
@@ -42,4 +42,4 @@ void av_update_lls(LLSModel *m, double *param, double decay);
 void av_solve_lls(LLSModel *m, double threshold, int min_order);
 double av_evaluate_lls(LLSModel *m, double *param, int order);
 
-#endif
+#endif /* FFMPEG_LLS_H */
diff --git a/libavutil/log.h b/libavutil/log.h
index fa88f5fb25..243037239d 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LOG_H
-#define LOG_H
+#ifndef FFMPEG_LOG_H
+#define FFMPEG_LOG_H
 
 #include <stdarg.h>
 
@@ -113,4 +113,4 @@ extern void av_log_default_callback(void* ptr, int level, const char* fmt, va_li
 extern void (*av_vlog)(void*, int, const char*, va_list);
 #endif
 
-#endif /* LOG_H */
+#endif /* FFMPEG_LOG_H */
diff --git a/libavutil/lzo.h b/libavutil/lzo.h
index 5b3d98f408..00427c1469 100644
--- a/libavutil/lzo.h
+++ b/libavutil/lzo.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef LZO_H
-#define LZO_H
+#ifndef FFMPEG_LZO_H
+#define FFMPEG_LZO_H
 
 #define LZO_INPUT_DEPLETED 1
 #define LZO_OUTPUT_FULL 2
@@ -32,4 +32,4 @@
 
 int lzo1x_decode(void *out, int *outlen, void *in, int *inlen);
 
-#endif
+#endif /* FFMPEG_LZO_H */
diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
index 0b74b254b9..a0c286249f 100644
--- a/libavutil/mathematics.h
+++ b/libavutil/mathematics.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MATHEMATICS_H
-#define MATHEMATICS_H
+#ifndef FFMPEG_MATHEMATICS_H
+#define FFMPEG_MATHEMATICS_H
 
 #include "rational.h"
 
@@ -48,4 +48,4 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding);
  */
 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq);
 
-#endif /* MATHEMATICS_H */
+#endif /* FFMPEG_MATHEMATICS_H */
diff --git a/libavutil/md5.h b/libavutil/md5.h
index fa83b1cdfe..7d63df01b3 100644
--- a/libavutil/md5.h
+++ b/libavutil/md5.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef MD5_H
-#define MD5_H
+#ifndef FFMPEG_MD5_H
+#define FFMPEG_MD5_H
 
 #include <stdint.h>
 
@@ -32,5 +32,5 @@ void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
 void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
 void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
 
-#endif /* MD5_H */
+#endif /* FFMPEG_MD5_H */
 
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 0d3e7f3ba0..db49c8d515 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -23,8 +23,8 @@
  * Memory handling functions.
  */
 
-#ifndef AV_MEM_H
-#define AV_MEM_H
+#ifndef FFMPEG_MEM_H
+#define FFMPEG_MEM_H
 
 #ifdef __GNUC__
   #define DECLARE_ALIGNED(n,t,v)       t v __attribute__ ((aligned (n)))
@@ -69,4 +69,4 @@ char *av_strdup(const char *s);
  */
 void av_freep(void *ptr);
 
-#endif /* AV_MEM_H */
+#endif /* FFMPEG_MEM_H */
diff --git a/libavutil/random.h b/libavutil/random.h
index d9d08a5de1..4d00d7e00f 100644
--- a/libavutil/random.h
+++ b/libavutil/random.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AV_RANDOM_H
-#define AV_RANDOM_H
+#ifndef FFMPEG_RANDOM_H
+#define FFMPEG_RANDOM_H
 
 #define AV_RANDOM_N 624
 
@@ -65,5 +65,5 @@ static inline double av_random_real1(AVRandomState *state)
 
 // only available if DEBUG is defined in the .c file
 void av_benchmark_random(void);
-#endif // AV_RANDOM_H
 
+#endif /* FFMPEG_RANDOM_H */
diff --git a/libavutil/rational.h b/libavutil/rational.h
index 8826772084..f53f278619 100644
--- a/libavutil/rational.h
+++ b/libavutil/rational.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef RATIONAL_H
-#define RATIONAL_H
+#ifndef FFMPEG_RATIONAL_H
+#define FFMPEG_RATIONAL_H
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ AVRational av_sub_q(AVRational b, AVRational c);
  */
 AVRational av_d2q(double d, int max);
 
-#endif // RATIONAL_H
+#endif /* FFMPEG_RATIONAL_H */
diff --git a/libavutil/rc4.h b/libavutil/rc4.h
index d3b8e6cb81..5e4f086f97 100644
--- a/libavutil/rc4.h
+++ b/libavutil/rc4.h
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef RC4_H
-#define RC4_H
+#ifndef FFMPEG_RC4_H
+#define FFMPEG_RC4_H
 
 void ff_rc4_enc(const uint8_t *key, int keylen, uint8_t *data, int datalen);
 
-#endif /* RC4_H */
+#endif /* FFMPEG_RC4_H */
diff --git a/libavutil/sha1.h b/libavutil/sha1.h
index 87974a2922..f00ecf0d5b 100644
--- a/libavutil/sha1.h
+++ b/libavutil/sha1.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AV_SHA1_H
-#define AV_SHA1_H
+#ifndef FFMPEG_SHA1_H
+#define FFMPEG_SHA1_H
 
 #include <stdint.h>
 
@@ -30,4 +30,5 @@ struct AVSHA1;
 void av_sha1_init(struct AVSHA1* context);
 void av_sha1_update(struct AVSHA1* context, uint8_t* data, unsigned int len);
 void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);
-#endif
+
+#endif /* FFMPEG_SHA1_H */
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index a0d614bbd6..d1a1901ea5 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_SOFTFLOAT_H
-#define AVUTIL_SOFTFLOAT_H
+#ifndef FFMPEG_SOFTFLOAT_H
+#define FFMPEG_SOFTFLOAT_H
 
 #include <stdint.h>
 
@@ -125,4 +125,4 @@ static inline int av_sf2int(SoftFloat v, int frac_bits){
     else           return v.mant >>(-v.exp);
 }
 
-#endif // AVUTIL_SOFTFLOAT_H
+#endif /* FFMPEG_SOFTFLOAT_H */
diff --git a/libavutil/tree.h b/libavutil/tree.h
index be17358580..146d35d56e 100644
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -24,8 +24,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef TREE_H
-#define TREE_H
+#ifndef FFMPEG_TREE_H
+#define FFMPEG_TREE_H
 
 struct AVTreeNode;
 
@@ -55,4 +55,4 @@ void *av_tree_find(const struct AVTreeNode *root, void *key, int (*cmp)(void *ke
 void *av_tree_insert(struct AVTreeNode **rootp, void *key, int (*cmp)(void *key, const void *b));
 void av_tree_destroy(struct AVTreeNode *t);
 
-#endif /* TREE_H */
+#endif /* FFMPEG_TREE_H */
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index 0e4b5d16c9..f0e875f630 100644
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_X86CPU_H
-#define AVUTIL_X86CPU_H
+#ifndef FFMPEG_X86CPU_H
+#define FFMPEG_X86CPU_H
 
 #ifdef ARCH_X86_64
 #  define REG_a "rax"
@@ -65,4 +65,4 @@
 #  define BROKEN_RELOCATIONS 1
 #endif
 
-#endif /* AVUTIL_X86CPU_H */
+#endif /* FFMPEG_X86CPU_H */
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index ac4533b2c2..1109b2047e 100644
--- a/libpostproc/postprocess.h
+++ b/libpostproc/postprocess.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef POSTPROCESS_H
-#define POSTPROCESS_H
+#ifndef FFMPEG_POSTPROCESS_H
+#define FFMPEG_POSTPROCESS_H
 
 /**
  * @file postprocess.h
@@ -75,4 +75,4 @@ void pp_free_context(pp_context_t *ppContext);
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
-#endif /* POSTPROCESS_H */
+#endif /* FFMPEG_POSTPROCESS_H */
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index 56d1191d91..e977048d2f 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -23,8 +23,8 @@
  * internal api header.
  */
 
-#ifndef POSTPROCESS_INTERNAL_H
-#define POSTPROCESS_INTERNAL_H
+#ifndef FFMPEG_POSTPROCESS_INTERNAL_H
+#define FFMPEG_POSTPROCESS_INTERNAL_H
 
 #include "avutil.h"
 #include "postprocess.h"
@@ -186,4 +186,4 @@ static inline void linecpy(void *dest, void *src, int lines, int stride)
         }
 }
 
-#endif // POSTPROCESS_INTERNAL_H
+#endif /* FFMPEG_POSTPROCESS_INTERNAL_H */