diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 83171e2c29b8341c9f5098dce332155346bdba97..0a9cc81604176230832562a75ae0b96c10e44b7e 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -27,8 +27,8 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef FFMPEG_AAC_H
-#define FFMPEG_AAC_H
+#ifndef AVCODEC_AAC_H
+#define AVCODEC_AAC_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -272,4 +272,4 @@ typedef struct {
 
 } AACContext;
 
-#endif /* FFMPEG_AAC_H */
+#endif /* AVCODEC_AAC_H */
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h
index 36ea0e06719f1a3930503bbf9b087363c1f0fef0..b2fc0afde816a9b8ea7edff27ac051494c68ecd9 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 FFMPEG_AAC_AC3_PARSER_H
-#define FFMPEG_AAC_AC3_PARSER_H
+#ifndef AVCODEC_AAC_AC3_PARSER_H
+#define AVCODEC_AAC_AC3_PARSER_H
 
 #include <stdint.h>
 #include "avcodec.h"
@@ -50,4 +50,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
                      const uint8_t **poutbuf, int *poutbuf_size,
                      const uint8_t *buf, int buf_size);
 
-#endif /* FFMPEG_AAC_AC3_PARSER_H */
+#endif /* AVCODEC_AAC_AC3_PARSER_H */
diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h
index 3c27c384a8db0986d7c1262d14e87b25ff7c9480..e4b87d79a06710b9a50abee889d2afc811ecf75a 100644
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@@ -27,8 +27,8 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef FFMPEG_AACDECTAB_H
-#define FFMPEG_AACDECTAB_H
+#ifndef AVCODEC_AACDECTAB_H
+#define AVCODEC_AACDECTAB_H
 
 #include "aac.h"
 
@@ -206,4 +206,4 @@ static const float *tns_tmp2_map[4] = {
 };
 // @}
 
-#endif /* FFMPEG_AACDECTAB_H */
+#endif /* AVCODEC_AACDECTAB_H */
diff --git a/libavcodec/aacpsy.h b/libavcodec/aacpsy.h
index d0dbb078e9af7d3bb19ea44222a6bddaf4cec050..f0142677eee5185601f0c3b06e7c0d34727cd528 100644
--- a/libavcodec/aacpsy.h
+++ b/libavcodec/aacpsy.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AACPSY_H
-#define FFMPEG_AACPSY_H
+#ifndef AVCODEC_AACPSY_H
+#define AVCODEC_AACPSY_H
 
 #include "avcodec.h"
 #include "aac.h"
@@ -47,4 +47,4 @@ typedef struct AACPsyContext {
  */
 void ff_aac_psy_end(AACPsyContext *ctx);
 
-#endif /* FFMPEG_AACPSY_H */
+#endif /* AVCODEC_AACPSY_H */
diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h
index 1a3a8dfe2f6f1820062e4b14aefd5a7aa442234a..5189fcdde08cd1e8ef49b5e2bf64ab1ca07c2f21 100644
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@@ -27,8 +27,8 @@
  * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
  */
 
-#ifndef FFMPEG_AACTAB_H
-#define FFMPEG_AACTAB_H
+#ifndef AVCODEC_AACTAB_H
+#define AVCODEC_AACTAB_H
 
 #include "libavutil/mem.h"
 #include "aac.h"
@@ -69,4 +69,4 @@ extern const float ff_aac_pow2sf_tab[316];
 extern       float ff_aac_pow2sf_tab[316];
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* FFMPEG_AACTAB_H */
+#endif /* AVCODEC_AACTAB_H */
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 3b18a15a7c00e265dc5fecc8408614633e8f4d3d..1f5a7115d702f37ee8e427fd122bbaccaf260294 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -24,8 +24,8 @@
  * Common code between the AC-3 encoder and decoder.
  */
 
-#ifndef FFMPEG_AC3_H
-#define FFMPEG_AC3_H
+#ifndef AVCODEC_AC3_H
+#define AVCODEC_AC3_H
 
 #include "ac3tab.h"
 
@@ -182,4 +182,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
                                    uint8_t *dba_offsets, uint8_t *dba_lengths,
                                    uint8_t *dba_values);
 
-#endif /* FFMPEG_AC3_H */
+#endif /* AVCODEC_AC3_H */
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index e49492558ab7b67553d6c2521eeb5d3c052d549f..fc17e8773eeb244c8f98eac9d5cffa7854062b8a 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 FFMPEG_AC3_PARSER_H
-#define FFMPEG_AC3_PARSER_H
+#ifndef AVCODEC_AC3_PARSER_H
+#define AVCODEC_AC3_PARSER_H
 
 #include "ac3.h"
 #include "bitstream.h"
@@ -58,4 +58,4 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
  */
 int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr);
 
-#endif /* FFMPEG_AC3_PARSER_H */
+#endif /* AVCODEC_AC3_PARSER_H */
diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index 81825bd2bd757fd558b4616c9ca6b10f7720d2af..617080910b62581b30fa8b991de513efeb4bd441 100644
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -24,8 +24,8 @@
  * Common code between the AC-3 and E-AC-3 decoders.
  */
 
-#ifndef FFMPEG_AC3DEC_H
-#define FFMPEG_AC3DEC_H
+#ifndef AVCODEC_AC3DEC_H
+#define AVCODEC_AC3DEC_H
 
 #include "libavutil/lfg.h"
 #include "ac3.h"
@@ -179,4 +179,4 @@ int ff_eac3_parse_header(AC3DecodeContext *s);
  */
 void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
 
-#endif /* FFMPEG_AC3DEC_H */
+#endif /* AVCODEC_AC3DEC_H */
diff --git a/libavcodec/ac3dec_data.h b/libavcodec/ac3dec_data.h
index ab2c430c317908c15a85597fa8b9c48c9ee797dd..0be680808c508b42d756efc8186ef3b31d40ee82 100644
--- a/libavcodec/ac3dec_data.h
+++ b/libavcodec/ac3dec_data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AC3DEC_DATA_H
-#define FFMPEG_AC3DEC_DATA_H
+#ifndef AVCODEC_AC3DEC_DATA_H
+#define AVCODEC_AC3DEC_DATA_H
 
 #include "libavutil/common.h"
 
@@ -37,4 +37,4 @@ extern const uint8_t ff_eac3_default_cpl_band_struct[18];
 
 extern const uint8_t ff_ac3_rematrix_band_tab[5];
 
-#endif /* FFMPEG_AC3DEC_DATA_H */
+#endif /* AVCODEC_AC3DEC_DATA_H */
diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h
index 7b965d849745be8c8d3066828fe1940d99adb907..a46e29d3c589ed496d48fa436023af491bab3d73 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 FFMPEG_AC3TAB_H
-#define FFMPEG_AC3TAB_H
+#ifndef AVCODEC_AC3TAB_H
+#define AVCODEC_AC3TAB_H
 
 #include "libavutil/common.h"
 
@@ -56,4 +56,4 @@ enum CustomChannelMapLocation{
     AC3_CHMAP_LFE =     1<<(15-15)
 };
 
-#endif /* FFMPEG_AC3TAB_H */
+#endif /* AVCODEC_AC3TAB_H */
diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h
index 6b0679ff70a6225e146178e15730e33d877ba9b0..b2f05bc9f00b62e6b35997587af3d8b6b12a7cd5 100644
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_FILTERS_H
-#define FFMPEG_ACELP_FILTERS_H
+#ifndef AVCODEC_ACELP_FILTERS_H
+#define AVCODEC_ACELP_FILTERS_H
 
 #include <stdint.h>
 
@@ -134,4 +134,4 @@ void ff_acelp_high_pass_filter(
         const int16_t* in,
         int length);
 
-#endif /* FFMPEG_ACELP_FILTERS_H */
+#endif /* AVCODEC_ACELP_FILTERS_H */
diff --git a/libavcodec/acelp_math.h b/libavcodec/acelp_math.h
index 769fcf6b1bdf5f1d5a1d1b3e55d0d7828f7251e3..3843e69138fb17d633501f072ce77288647f37eb 100644
--- a/libavcodec/acelp_math.h
+++ b/libavcodec/acelp_math.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_MATH_H
-#define FFMPEG_ACELP_MATH_H
+#ifndef AVCODEC_ACELP_MATH_H
+#define AVCODEC_ACELP_MATH_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset)
     else           return value <<  offset;
 }
 
-#endif /* FFMPEG_ACELP_MATH_H */
+#endif /* AVCODEC_ACELP_MATH_H */
diff --git a/libavcodec/acelp_pitch_delay.h b/libavcodec/acelp_pitch_delay.h
index b5b9add7f2346ca523137521945936ab59bb2c9b..be5ac094322865f831f683a48674b459bf313027 100644
--- a/libavcodec/acelp_pitch_delay.h
+++ b/libavcodec/acelp_pitch_delay.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_PITCH_DELAY_H
-#define FFMPEG_ACELP_PITCH_DELAY_H
+#ifndef AVCODEC_ACELP_PITCH_DELAY_H
+#define AVCODEC_ACELP_PITCH_DELAY_H
 
 #include <stdint.h>
 
@@ -217,4 +217,4 @@ int16_t ff_acelp_decode_gain_code(
     int subframe_size,
     int max_pred_order);
 
-#endif /* FFMPEG_ACELP_PITCH_DELAY_H */
+#endif /* AVCODEC_ACELP_PITCH_DELAY_H */
diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h
index ae6c0b23c3f3517e20e5281c923d2885f3cd491c..a5e71fc128766d2ccbf0fc8b5084d6807e020989 100644
--- a/libavcodec/acelp_vectors.h
+++ b/libavcodec/acelp_vectors.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ACELP_VECTORS_H
-#define FFMPEG_ACELP_VECTORS_H
+#ifndef AVCODEC_ACELP_VECTORS_H
+#define AVCODEC_ACELP_VECTORS_H
 
 #include <stdint.h>
 
@@ -150,4 +150,4 @@ void ff_acelp_weighted_vector_sum(
         int shift,
         int length);
 
-#endif /* FFMPEG_ACELP_VECTORS_H */
+#endif /* AVCODEC_ACELP_VECTORS_H */
diff --git a/libavcodec/adx.h b/libavcodec/adx.h
index 16180372ac98a069591e16f60e31d35fcb642556..1df06117745f7212c3d156def7b59b1ed2ce74a5 100644
--- a/libavcodec/adx.h
+++ b/libavcodec/adx.h
@@ -28,8 +28,8 @@
  * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/
  */
 
-#ifndef FFMPEG_ADX_H
-#define FFMPEG_ADX_H
+#ifndef AVCODEC_ADX_H
+#define AVCODEC_ADX_H
 
 typedef struct {
     int s1,s2;
@@ -46,4 +46,4 @@ typedef struct {
 #define    SCALE1    0x7298
 #define    SCALE2    0x3350
 
-#endif /* FFMPEG_ADX_H */
+#endif /* AVCODEC_ADX_H */
diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h
index 1d0fa6f6a7bbe0d85b9e582b8b885154b7e86293..6fef165de4b9357b5a660cc7b20562419892a770 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 FFMPEG_ASM_H
-#define FFMPEG_ASM_H
+#ifndef AVCODEC_ALPHA_ASM_H
+#define AVCODEC_ALPHA_ASM_H
 
 #include <inttypes.h>
 
@@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
 #error "Unknown compiler!"
 #endif
 
-#endif /* FFMPEG_ASM_H */
+#endif /* AVCODEC_ALPHA_ASM_H */
diff --git a/libavcodec/alpha/regdef.h b/libavcodec/alpha/regdef.h
index aaa15e99453284509679c7481c7e6551c8045cc7..aa1959f46eef73eb5855647f8f1ad64141bb003d 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 FFMPEG_REGDEF_H
-#define FFMPEG_REGDEF_H
+#ifndef AVCODEC_ALPHA_REGDEF_H
+#define AVCODEC_ALPHA_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 /* FFMPEG_REGDEF_H */
+#endif /* AVCODEC_ALPHA_REGDEF_H */
diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index ff12aef8c9fb10ad8f463dd66f10277297d7fc87..9602cd4f9f24052ce45c06be4b6359e9fbf15031 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 FFMPEG_ARMV4L_MATHOPS_H
-#define FFMPEG_ARMV4L_MATHOPS_H
+#ifndef AVCODEC_ARMV4L_MATHOPS_H
+#define AVCODEC_ARMV4L_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(a, b) \
@@ -80,4 +80,4 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b)
 
 #endif
 
-#endif /* FFMPEG_ARMV4L_MATHOPS_H */
+#endif /* AVCODEC_ARMV4L_MATHOPS_H */
diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h
index 555a3a20d6694e8d72278130b0d0afe1194946a4..ff9ada8753efee9a7008ea540ba07bc1852a33ff 100644
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@@ -25,8 +25,8 @@
  * Atrac 3 AKA RealAudio 8 compatible decoder data
  */
 
-#ifndef FFMPEG_ATRAC3DATA_H
-#define FFMPEG_ATRAC3DATA_H
+#ifndef AVCODEC_ATRAC3DATA_H
+#define AVCODEC_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 /* FFMPEG_ATRAC3DATA_H */
+#endif /* AVCODEC_ATRAC3DATA_H */
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index e10849bd3a16782e9cd4431034264ee88553744f..c391759ebe718d3f15c738f5cce893dd4ecc6751 100644
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AUDIOCONVERT_H
-#define FFMPEG_AUDIOCONVERT_H
+#ifndef AVCODEC_AUDIOCONVERT_H
+#define AVCODEC_AUDIOCONVERT_H
 
 /**
  * @file audioconvert.h
@@ -88,4 +88,4 @@ int av_audio_convert(AVAudioConvert *ctx,
                            void * const out[6], const int out_stride[6],
                      const void * const  in[6], const int  in_stride[6], int len);
 
-#endif /* FFMPEG_AUDIOCONVERT_H */
+#endif /* AVCODEC_AUDIOCONVERT_H */
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 63c62d8b057b4ecf0f572dd25abacae97ff60ab0..e333841fd0518e1c73e5e6d8e27369553df445fc 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 FFMPEG_AVCODEC_H
-#define FFMPEG_AVCODEC_H
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H
 
 /**
  * @file avcodec.h
@@ -3074,4 +3074,4 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample);
 #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 /* FFMPEG_AVCODEC_H */
+#endif /* AVCODEC_AVCODEC_H */
diff --git a/libavcodec/bethsoftvideo.h b/libavcodec/bethsoftvideo.h
index 96629cd054f011f52ca7726fc4c50d1f5ede78dd..d5b5d0a5258ffe182480804f3d83a5e1c9407f13 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 FFMPEG_BETHSOFTVIDEO_H
-#define FFMPEG_BETHSOFTVIDEO_H
+#ifndef AVCODEC_BETHSOFTVIDEO_H
+#define AVCODEC_BETHSOFTVIDEO_H
 
 enum BethsoftVidBlockType
 {
@@ -33,4 +33,4 @@ enum BethsoftVidBlockType
     EOF_BLOCK           = 0x14,
 };
 
-#endif /* FFMPEG_BETHSOFTVIDEO_H */
+#endif /* AVCODEC_BETHSOFTVIDEO_H */
diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h
index 0f0eab6bef213995d1691f6a7ffb10276f0b4b87..bc488f80256cd974368fa5ec5705acb7745428d5 100644
--- a/libavcodec/bfin/config_bfin.h
+++ b/libavcodec/bfin/config_bfin.h
@@ -30,8 +30,8 @@ DEFUN(put_pixels_clamped,mL1,
       rts;
 */
 
-#ifndef FFMPEG_CONFIG_BFIN_H
-#define FFMPEG_CONFIG_BFIN_H
+#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
+#define AVCODEC_BFIN_CONFIG_BFIN_H
 
 #ifndef DEFUN
 
@@ -62,4 +62,4 @@ DEFUN(put_pixels_clamped,mL1,
 
 #endif
 
-#endif /* FFMPEG_CONFIG_BFIN_H */
+#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */
diff --git a/libavcodec/bfin/dsputil_bfin.h b/libavcodec/bfin/dsputil_bfin.h
index 411c8ea73cb95157d53c1fd4df9dff39a03e0f89..8d5d32746d745dd9dffb9364d7f461934e21da83 100644
--- a/libavcodec/bfin/dsputil_bfin.h
+++ b/libavcodec/bfin/dsputil_bfin.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef FFMPEG_DSPUTIL_BFIN_H
-#define FFMPEG_DSPUTIL_BFIN_H
+#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H
+#define AVCODEC_BFIN_DSPUTIL_BFIN_H
 
 #ifdef __FDPIC__
 #define attribute_l1_text  __attribute__ ((l1_text))
@@ -71,4 +71,4 @@ static void bfprof (void)
 #define bfprof()
 #endif
 
-#endif /* FFMPEG_DSPUTIL_BFIN_H */
+#endif /* AVCODEC_BFIN_DSPUTIL_BFIN_H */
diff --git a/libavcodec/bfin/mathops.h b/libavcodec/bfin/mathops.h
index ec40f4e681fd4f4b72153c4c4f7846d0c956486a..7bdffbc9b127f0182a98d881ee76ff71615ecda4 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 FFMPEG_BFIN_MATHOPS_H
-#define FFMPEG_BFIN_MATHOPS_H
+#ifndef AVCODEC_BFIN_MATHOPS_H
+#define AVCODEC_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 /* FFMPEG_BFIN_MATHOPS_H */
+#endif /* AVCODEC_BFIN_MATHOPS_H */
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 14e54e40ff2b40fdb4fd9618262cacddfd173cf8..770c1ddd366e4affda02e04c22964a883435e16d 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -23,8 +23,8 @@
  * bitstream api header.
  */
 
-#ifndef FFMPEG_BITSTREAM_H
-#define FFMPEG_BITSTREAM_H
+#ifndef AVCODEC_BITSTREAM_H
+#define AVCODEC_BITSTREAM_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -954,4 +954,4 @@ static inline int decode210(GetBitContext *gb){
         return 2 - get_bits1(gb);
 }
 
-#endif /* FFMPEG_BITSTREAM_H */
+#endif /* AVCODEC_BITSTREAM_H */
diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index cbbd21ce90ecd936efa3c92bd549ecd4ff36b3c7..b24a1faf00a98063613237f5ad31fe057f267c5a 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 FFMPEG_BMP_H
-#define FFMPEG_BMP_H
+#ifndef AVCODEC_BMP_H
+#define AVCODEC_BMP_H
 
 #include "avcodec.h"
 
@@ -35,4 +35,4 @@ typedef enum {
     BMP_BITFIELDS   =3,
 } BiCompression;
 
-#endif /* FFMPEG_BMP_H */
+#endif /* AVCODEC_BMP_H */
diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h
index 61fb36a76d74dafc2ff32bc9db4ac6269cbfcf52..e0d7111d17d5068129dac63c529d832eb8f686bc 100644
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_BYTESTREAM_H
-#define FFMPEG_BYTESTREAM_H
+#ifndef AVCODEC_BYTESTREAM_H
+#define AVCODEC_BYTESTREAM_H
 
 #include "libavutil/common.h"
 
@@ -66,4 +66,4 @@ static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *s
     (*b) += size;
 }
 
-#endif /* FFMPEG_BYTESTREAM_H */
+#endif /* AVCODEC_BYTESTREAM_H */
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index b748237ad36850b00bb3fccdf6947e6a385e459b..bfab32dae58376d0408bf475aedeb14932bba097 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -24,8 +24,8 @@
  * Context Adaptive Binary Arithmetic Coder.
  */
 
-#ifndef FFMPEG_CABAC_H
-#define FFMPEG_CABAC_H
+#ifndef AVCODEC_CABAC_H
+#define AVCODEC_CABAC_H
 
 #include "bitstream.h"
 
@@ -757,4 +757,4 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
 }
 #endif /* 0 */
 
-#endif /* FFMPEG_CABAC_H */
+#endif /* AVCODEC_CABAC_H */
diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index 9afa96e42cbc8daca621f7cb13571afdaaaf5ccb..c684acf7991f6ad314b52dc8ef72640edafd0a49 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 FFMPEG_CAVS_H
-#define FFMPEG_CAVS_H
+#ifndef AVCODEC_CAVS_H
+#define AVCODEC_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 /* FFMPEG_CAVS_H */
+#endif /* AVCODEC_CAVS_H */
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index a24fb5ddb41e9bc989fe42dcd0efaccc9f3bb2bf..94b620b366b324ae52b74ae058c6228a8c442248 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 FFMPEG_CAVSDATA_H
-#define FFMPEG_CAVSDATA_H
+#ifndef AVCODEC_CAVSDATA_H
+#define AVCODEC_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 /* FFMPEG_CAVSDATA_H */
+#endif /* AVCODEC_CAVSDATA_H */
diff --git a/libavcodec/colorspace.h b/libavcodec/colorspace.h
index 9d89d6daa49770ec200326a76538c755c1bee2ae..7221517527ad51beb035279d9c05297bdc8cc04a 100644
--- a/libavcodec/colorspace.h
+++ b/libavcodec/colorspace.h
@@ -24,8 +24,8 @@
  * Various defines for YUV<->RGB conversion
  */
 
-#ifndef FFMPEG_COLORSPACE_H
-#define FFMPEG_COLORSPACE_H
+#ifndef AVCODEC_COLORSPACE_H
+#define AVCODEC_COLORSPACE_H
 
 #define SCALEBITS 10
 #define ONE_HALF  (1 << (SCALEBITS - 1))
@@ -108,4 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) {
 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 -           \
    FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
 
-#endif /* FFMPEG_COLORSPACE_H */
+#endif /* AVCODEC_COLORSPACE_H */
diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index c86577c6b7dff6c289e9bee42d26fedf35a54510..4aa1a4ad3ad64a02f582e9628a9599c22318ba66 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -25,8 +25,8 @@
  * Cook AKA RealAudio G2 compatible decoderdata
  */
 
-#ifndef FFMPEG_COOKDATA_H
-#define FFMPEG_COOKDATA_H
+#ifndef AVCODEC_COOKDATA_H
+#define AVCODEC_COOKDATA_H
 
 #include <stdint.h>
 
@@ -560,4 +560,4 @@ static const float* const cplscales[5] = {
     cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };
 
-#endif /* FFMPEG_COOKDATA_H */
+#endif /* AVCODEC_COOKDATA_H */
diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index e2197a4408795c9fb01a322e5ab54b43d6d6baec..389571909ed34d23433eeb207793665e43aa534b 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 FFMPEG_DCA_H
-#define FFMPEG_DCA_H
+#ifndef AVCODEC_DCA_H
+#define AVCODEC_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 /* FFMPEG_DCA_H */
+#endif /* AVCODEC_DCA_H */
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index 696efe28a02752e64eeb41ca750d6666a4c5a2ed..8b777efda10e6d0de9791234f3b83485991b63ba 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -24,8 +24,8 @@
  * @file dcadata.c
  */
 
-#ifndef FFMPEG_DCADATA_H
-#define FFMPEG_DCADATA_H
+#ifndef AVCODEC_DCADATA_H
+#define AVCODEC_DCADATA_H
 
 #include <stdint.h>
 
@@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
 
 */
 
-#endif /* FFMPEG_DCADATA_H */
+#endif /* AVCODEC_DCADATA_H */
diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index bdb05d55d0dbed7dbb40089ea53fc09f2c371556..5704ac383ae94a0907b805a5430a1692bcaeee32 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 FFMPEG_DCAHUFF_H
-#define FFMPEG_DCAHUFF_H
+#ifndef AVCODEC_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1073,4 +1073,4 @@ static const uint8_t* const bitalloc_bits[10][8] = {
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
 
-#endif /* FFMPEG_DCAHUFF_H */
+#endif /* AVCODEC_DCAHUFF_H */
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index 1bd028e0859ae46c1f7b2a7fefbdaad8d8b00292..8dbc48ba0fd1b176fbc04a7b259c6dc30f5af615 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 FFMPEG_DNXHDDATA_H
-#define FFMPEG_DNXHDDATA_H
+#ifndef AVCODEC_DNXHDDATA_H
+#define AVCODEC_DNXHDDATA_H
 
 #include <stdint.h>
 #include "avcodec.h"
@@ -48,4 +48,4 @@ extern const CIDEntry ff_dnxhd_cid_table[];
 int ff_dnxhd_get_cid_table(int cid);
 int ff_dnxhd_find_cid(AVCodecContext *avctx);
 
-#endif /* FFMPEG_DNXHDDATA_H */
+#endif /* AVCODEC_DNXHDDATA_H */
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 4b7e8ed4a4149dbbffce5e9cbe887f015f29a8dc..b8504bc0ac21d3ba01d8a4370df747e4d28fe324 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 FFMPEG_DSPUTIL_H
-#define FFMPEG_DSPUTIL_H
+#ifndef AVCODEC_DSPUTIL_H
+#define AVCODEC_DSPUTIL_H
 
 #include "avcodec.h"
 
@@ -824,4 +824,4 @@ static inline void copy_block17(uint8_t *dst, uint8_t *src, int dstStride, int s
     }
 }
 
-#endif /* FFMPEG_DSPUTIL_H */
+#endif /* AVCODEC_DSPUTIL_H */
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 5f8e73c26d8b8a1149bf4ef6e53d4398e37db24b..6197b285a633f0ca0e69c1f8a4d1c0d11341aea7 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -24,8 +24,8 @@
  * Constants for DV codec.
  */
 
-#ifndef FFMPEG_DVDATA_H
-#define FFMPEG_DVDATA_H
+#ifndef AVCODEC_DVDATA_H
+#define AVCODEC_DVDATA_H
 
 #include "libavutil/rational.h"
 #include "avcodec.h"
@@ -6443,4 +6443,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
     return 3;
 }
 
-#endif /* FFMPEG_DVDATA_H */
+#endif /* AVCODEC_DVDATA_H */
diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h
index 84ec8657ef73cd53f5bf8fed3ceace293c6bb275..9be0440e86d1e2c9bda57fb4c91dd7be12f4ee37 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 FFMPEG_ELBG_H
-#define FFMPEG_ELBG_H
+#ifndef AVCODEC_ELBG_H
+#define AVCODEC_ELBG_H
 
 #include "libavutil/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 /* FFMPEG_ELBG_H */
+#endif /* AVCODEC_ELBG_H */
diff --git a/libavcodec/eval.h b/libavcodec/eval.h
index 786e950c0132b0ce97e2dc0be47b7fe2a4366bfa..2083a6307ce096c86b04b48c1896d4be210e1f58 100644
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@@ -25,8 +25,8 @@
  * eval header.
  */
 
-#ifndef FFMPEG_EVAL_H
-#define FFMPEG_EVAL_H
+#ifndef AVCODEC_EVAL_H
+#define AVCODEC_EVAL_H
 
 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 /**
@@ -84,4 +84,4 @@ AVEvalExpr * ff_parse(const char *s, const char **const_name,
 double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque);
 void ff_eval_free(AVEvalExpr * e);
 
-#endif /* FFMPEG_EVAL_H */
+#endif /* AVCODEC_EVAL_H */
diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h
index b9a4eeb3e50955fbac331ca66526acea42d11d23..b86f9accb484ab907de129ed5db6b6f9c725bcde 100644
--- a/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_FAANDCT_H
-#define FFMPEG_FAANDCT_H
+#ifndef AVCODEC_FAANDCT_H
+#define AVCODEC_FAANDCT_H
 
 #include "dsputil.h"
 
@@ -36,4 +36,4 @@
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
 
-#endif /* FFMPEG_FAANDCT_H */
+#endif /* AVCODEC_FAANDCT_H */
diff --git a/libavcodec/faanidct.h b/libavcodec/faanidct.h
index 817ca31214f08b1eb01928073e1f7ad36637fbd8..4cf11892863510f7041550a6b847e06a8f49ad0e 100644
--- a/libavcodec/faanidct.h
+++ b/libavcodec/faanidct.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FAANIDCT_H
-#define FFMPEG_FAANIDCT_H
+#ifndef AVCODEC_FAANIDCT_H
+#define AVCODEC_FAANIDCT_H
 
 #include <stdint.h>
 #include "dsputil.h"
@@ -29,4 +29,4 @@ void ff_faanidct(DCTELEM block[64]);
 void ff_faanidct_add(uint8_t *dest, int line_size, DCTELEM block[64]);
 void ff_faanidct_put(uint8_t *dest, int line_size, DCTELEM block[64]);
 
-#endif /* FFMPEG_FAANIDCT_H */
+#endif /* AVCODEC_FAANIDCT_H */
diff --git a/libavcodec/flac.h b/libavcodec/flac.h
index d9da14927c0fffc243209082eab6b4e5b64dcf53..e110f48cec05c02086377534daa19f569ee2dd19 100644
--- a/libavcodec/flac.h
+++ b/libavcodec/flac.h
@@ -24,8 +24,8 @@
  * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions
  */
 
-#ifndef FFMPEG_FLAC_H
-#define FFMPEG_FLAC_H
+#ifndef AVCODEC_FLAC_H
+#define AVCODEC_FLAC_H
 
 #include "avcodec.h"
 
@@ -54,4 +54,4 @@ typedef struct FLACStreaminfo {
 void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
                               const uint8_t *buffer);
 
-#endif /* FFMPEG_FLAC_H */
+#endif /* AVCODEC_FLAC_H */
diff --git a/libavcodec/g729.h b/libavcodec/g729.h
index 8e6378367a2c5f964fcf2f7da5446f6a9f177d91..3fdf1ee65081bb36b8e3d8a3ed06a3e82a97e313 100644
--- a/libavcodec/g729.h
+++ b/libavcodec/g729.h
@@ -18,12 +18,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_G729_H
-#define FFMPEG_G729_H
+#ifndef AVCODEC_G729_H
+#define AVCODEC_G729_H
 
 /**
  * maximum possible subframe size
  */
 #define MAX_SUBFRAME_SIZE 44
 
-#endif // FFMPEG_G729_H
+#endif // AVCODEC_G729_H
diff --git a/libavcodec/g729data.h b/libavcodec/g729data.h
index 6c739526311abc22cb96ae364f4e6370532ee74e..0caf25cacce82efc6d5fcc8cd9a685087f9b92ef 100644
--- a/libavcodec/g729data.h
+++ b/libavcodec/g729data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_G729DATA_H
-#define FFMPEG_G729DATA_H
+#ifndef AVCODEC_G729DATA_H
+#define AVCODEC_G729DATA_H
 
 #include <stdint.h>
 
@@ -211,4 +211,4 @@ static const int16_t cb_lsp_2nd[1<<VQ_2ND_BITS][10] =
   { -163,   674,   -11,  -886,   531, -1125,  -265,  -242,   724,   934}
 };
 
-#endif // FFMPEG_G729DATA_H
+#endif // AVCODEC_G729DATA_H
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index db4586521cda490f368382521603fae4a7ddf513..a1d904cced06a092e62f309ea93d457cb6a495c2 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -27,8 +27,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
  */
 
-#ifndef FFMPEG_GOLOMB_H
-#define FFMPEG_GOLOMB_H
+#ifndef AVCODEC_GOLOMB_H
+#define AVCODEC_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 /* FFMPEG_GOLOMB_H */
+#endif /* AVCODEC_GOLOMB_H */
diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index f0ce7c366a777a3d2e559fe76c346c7792c1f4e8..b5eb539e7386635b638a9fe42d4b40d130d5807c 100644
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -25,8 +25,8 @@
  * h261codec.
  */
 
-#ifndef FFMPEG_H261_H
-#define FFMPEG_H261_H
+#ifndef AVCODEC_H261_H
+#define AVCODEC_H261_H
 
 #include "mpegvideo.h"
 
@@ -48,4 +48,4 @@ typedef struct H261Context{
 
 #define MB_TYPE_H261_FIL 0x800000
 
-#endif /* FFMPEG_H261_H */
+#endif /* AVCODEC_H261_H */
diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index a86b6df98a18855c8976da08542e8b34384c094c..9218bf1c035f456575d1d510e2ecff932d1501e8 100644
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -24,8 +24,8 @@
  * H.261 tables.
  */
 
-#ifndef FFMPEG_H261DATA_H
-#define FFMPEG_H261DATA_H
+#ifndef AVCODEC_H261DATA_H
+#define AVCODEC_H261DATA_H
 
 #include <stdint.h>
 #include "h261.h"
@@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_level,
 };
 
-#endif /* FFMPEG_H261DATA_H */
+#endif /* AVCODEC_H261DATA_H */
diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index 47b168b54a9b433849904393b4b1b1b88fef0e5b..2df3be5ab0e256baae010118e4247960e1995cff 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 FFMPEG_H263_H
-#define FFMPEG_H263_H
+#ifndef AVCODEC_H263_H
+#define AVCODEC_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 /* FFMPEG_H263_H */
+#endif /* AVCODEC_H263_H */
diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h
index dc50774517df07a29ddc147d6d4057911964082a..565a222bc1ec87fc988a9088492f150d37e1d88a 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 FFMPEG_H263_PARSER_H
-#define FFMPEG_H263_PARSER_H
+#ifndef AVCODEC_H263_PARSER_H
+#define AVCODEC_H263_PARSER_H
 
 #include "parser.h"
 
 int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#endif /* FFMPEG_H263_PARSER_H */
+#endif /* AVCODEC_H263_PARSER_H */
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index b6c1c163cc306d6ebf5cce9fa8d7ffbe97edfd12..089f4fbc9db24d45229608109eb7cfecbc9a8236 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -26,8 +26,8 @@
  * H.263 tables.
  */
 
-#ifndef FFMPEG_H263DATA_H
-#define FFMPEG_H263DATA_H
+#ifndef AVCODEC_H263DATA_H
+#define AVCODEC_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 /* FFMPEG_H263DATA_H */
+#endif /* AVCODEC_H263DATA_H */
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 1f1cb1c5d605e896bb4b350ed4ebd8157baf553b..9ca5beb6c37040de414588054b2d43111be13717 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264_H
-#define FFMPEG_H264_H
+#ifndef AVCODEC_H264_H
+#define AVCODEC_H264_H
 
 #include "dsputil.h"
 #include "cabac.h"
@@ -435,4 +435,4 @@ typedef struct H264Context{
 
 }H264Context;
 
-#endif /* FFMPEG_H264_H */
+#endif /* AVCODEC_H264_H */
diff --git a/libavcodec/h264_parser.h b/libavcodec/h264_parser.h
index 0bb286ffeadb4c580c632b03f8a3bfd323a37352..f37b64f924c9ac65ec6c3c4c78ec6924525333fc 100644
--- a/libavcodec/h264_parser.h
+++ b/libavcodec/h264_parser.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264_PARSER_H
-#define FFMPEG_H264_PARSER_H
+#ifndef AVCODEC_H264_PARSER_H
+#define AVCODEC_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 /* FFMPEG_H264_PARSER_H */
+#endif /* AVCODEC_H264_PARSER_H */
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 32cbcbf0515c8bbd7691c05b1e63a61aa5064e0c..6ee84428296e36da76ad1b06327d3223b9c4a7db 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264DATA_H
-#define FFMPEG_H264DATA_H
+#ifndef AVCODEC_H264DATA_H
+#define AVCODEC_H264DATA_H
 
 #include <stdint.h>
 #include "libavutil/rational.h"
@@ -1316,4 +1316,4 @@ static const int8_t cabac_context_init_PB[3][460][2] =
     }
 };
 
-#endif /* FFMPEG_H264DATA_H */
+#endif /* AVCODEC_H264DATA_H */
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h
index dae0d81cc2e298408dc5a0d9e6bc6e533f6f528d..150567d2949d32b9c3dc0d7c0e575e0f017510fa 100644
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264PRED_H
-#define FFMPEG_H264PRED_H
+#ifndef AVCODEC_H264PRED_H
+#define AVCODEC_H264PRED_H
 
 #include "libavutil/common.h"
 
@@ -79,4 +79,4 @@ typedef struct H264PredContext{
 
 void ff_h264_pred_init(H264PredContext *h, int codec_id);
 
-#endif /* FFMPEG_H264PRED_H */
+#endif /* AVCODEC_H264PRED_H */
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 650700be8cfe5f20b09adf6c849f386e9db7b98f..0b11af8b45dc8a01c129b9285c23a5d52673a9ac 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 FFMPEG_HUFFMAN_H
-#define FFMPEG_HUFFMAN_H
+#ifndef AVCODEC_HUFFMAN_H
+#define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -39,4 +39,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 flags);
 
-#endif /* FFMPEG_HUFFMAN_H */
+#endif /* AVCODEC_HUFFMAN_H */
diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/i386/dsputil_mmx.h
index a4b3bfcdacacd946a43ee779e6249e89f45e5cdb..f095975128b16737c2d7aca55e553a08d0b28dda 100644
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DSPUTIL_MMX_H
-#define FFMPEG_DSPUTIL_MMX_H
+#ifndef AVCODEC_I386_DSPUTIL_MMX_H
+#define AVCODEC_I386_DSPUTIL_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -133,4 +133,4 @@ extern const double ff_pd_2[2];
 
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
 
-#endif /* FFMPEG_DSPUTIL_MMX_H */
+#endif /* AVCODEC_I386_DSPUTIL_MMX_H */
diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/i386/h264_i386.h
index 80468f68c928b95040e2b3dc4d7f05523b581e00..5cd03a519bf8419a5cf277f4db80e856e539d495 100644
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_H264_I386_H
-#define FFMPEG_H264_I386_H
+#ifndef AVCODEC_I386_H264_I386_H
+#define AVCODEC_I386_H264_I386_H
 
 #include "libavcodec/cabac.h"
 
@@ -152,4 +152,4 @@ static int decode_significance_8x8_x86(CABACContext *c,
 #endif /* defined(ARCH_X86) && defined(HAVE_7REGS) &&                 */
        /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */
 
-#endif /* FFMPEG_H264_I386_H */
+#endif /* AVCODEC_I386_H264_I386_H */
diff --git a/libavcodec/i386/idct_xvid.h b/libavcodec/i386/idct_xvid.h
index 8e62671e5ed06de75511988933dd8b9d5d78b647..2051ebd5917a332038eeed88bee5d8104a9e5086 100644
--- a/libavcodec/i386/idct_xvid.h
+++ b/libavcodec/i386/idct_xvid.h
@@ -23,8 +23,8 @@
  * header for Xvid IDCT functions
  */
 
-#ifndef FFMPEG_IDCT_XVID_H
-#define FFMPEG_IDCT_XVID_H
+#ifndef AVCODEC_I386_IDCT_XVID_H
+#define AVCODEC_I386_IDCT_XVID_H
 
 void ff_idct_xvid_mmx(short *block);
 void ff_idct_xvid_mmx2(short *block);
@@ -32,4 +32,4 @@ void ff_idct_xvid_sse2(short *block);
 void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block);
 void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block);
 
-#endif /* FFMPEG_IDCT_XVID_H */
+#endif /* AVCODEC_I386_IDCT_XVID_H */
diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h
index 75ed55c57da774998e8eeaad255c8ebf50b2251a..46c2d638f0e2f62828beaa83faf9e21e7c245580 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 FFMPEG_I386_MATHOPS_H
-#define FFMPEG_I386_MATHOPS_H
+#ifndef AVCODEC_I386_MATHOPS_H
+#define AVCODEC_I386_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
@@ -42,4 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\
      rt; })
 
-#endif /* FFMPEG_I386_MATHOPS_H */
+#endif /* AVCODEC_I386_MATHOPS_H */
diff --git a/libavcodec/i386/mmx.h b/libavcodec/i386/mmx.h
index 361c6b637187e5033318bb9a7dd9ea3aed8fde7c..197e059a1cb77af13eb882eeaef4bb026c9ce767 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 FFMPEG_MMX_H
-#define FFMPEG_MMX_H
+#ifndef AVCODEC_I386_MMX_H
+#define AVCODEC_I386_MMX_H
 
 #warning Everything in this header is deprecated, use plain asm()! New code using this header will be rejected.
 
@@ -282,4 +282,4 @@ typedef        union {
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)
 
 
-#endif /* FFMPEG_MMX_H */
+#endif /* AVCODEC_I386_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_mmx.h b/libavcodec/i386/vp3dsp_mmx.h
index d0e61960aed6501d20c06399c660c6ac6d9a0daa..2c6fc4fa5948c60dc24a297e0a9312e6e945ac89 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 FFMPEG_VP3DSP_MMX_H
-#define FFMPEG_VP3DSP_MMX_H
+#ifndef AVCODEC_I386_VP3DSP_MMX_H
+#define AVCODEC_I386_VP3DSP_MMX_H
 
 #include <stdint.h>
 #include "libavcodec/dsputil.h"
@@ -29,4 +29,4 @@ void ff_vp3_idct_mmx(int16_t *data);
 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);
 
-#endif /* FFMPEG_VP3DSP_MMX_H */
+#endif /* AVCODEC_I386_VP3DSP_MMX_H */
diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h
index a421abc9aec015ec8852bbbd8d791928b9e4047d..55908c22a04e4a8431fdb186688e6cad7cbb8b3f 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 FFMPEG_VP3DSP_SSE2_H
-#define FFMPEG_VP3DSP_SSE2_H
+#ifndef AVCODEC_I386_VP3DSP_SSE2_H
+#define AVCODEC_I386_VP3DSP_SSE2_H
 
 #include "libavcodec/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 /* FFMPEG_VP3DSP_SSE2_H */
+#endif /* AVCODEC_I386_VP3DSP_SSE2_H */
diff --git a/libavcodec/iirfilter.h b/libavcodec/iirfilter.h
index ac948d8959ba10ced386ce9cf6d7d07d057cedec..d51f44b8e8344cf2548a9d2a3917473629d1ef42 100644
--- a/libavcodec/iirfilter.h
+++ b/libavcodec/iirfilter.h
@@ -24,8 +24,8 @@
  * IIR filter interface
  */
 
-#ifndef FFMPEG_IIRFILTER_H
-#define FFMPEG_IIRFILTER_H
+#ifndef AVCODEC_IIRFILTER_H
+#define AVCODEC_IIRFILTER_H
 
 #include "avcodec.h"
 
@@ -100,4 +100,4 @@ void ff_iir_filter_free_state(struct FFIIRFilterState *state);
 void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state,
                    int size, const int16_t *src, int sstep, int16_t *dst, int dstep);
 
-#endif /* FFMPEG_IIRFILTER_H */
+#endif /* AVCODEC_IIRFILTER_H */
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 966bc2789fcbf55a79a303265dbd29109d6f9fd2..64e7c7185e151da12132aa6a4a8785d9a4bf4578 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 FFMPEG_IMCDATA_H
-#define FFMPEG_IMCDATA_H
+#ifndef AVCODEC_IMCDATA_H
+#define AVCODEC_IMCDATA_H
 
 #include <stdint.h>
 
@@ -166,4 +166,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = {
     }
 };
 
-#endif /* FFMPEG_IMCDATA_H */
+#endif /* AVCODEC_IMCDATA_H */
diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
index a87106aee22f1f40af1f9b34fa9149ccb3f9593e..bfaa03ea16e9f5b109d754e05ae79e6d7096fa9b 100644
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_IMGCONVERT_H
-#define FFMPEG_IMGCONVERT_H
+#ifndef AVCODEC_IMGCONVERT_H
+#define AVCODEC_IMGCONVERT_H
 
 #include <stdint.h>
 #include "avcodec.h"
@@ -33,4 +33,4 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height);
 
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
 
-#endif /* FFMPEG_IMGCONVERT_H */
+#endif /* AVCODEC_IMGCONVERT_H */
diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h
index 2be32dfc92ce41f1a99ebd2fcb28273be5e1c387..b2e0b8a5096e22b7b32667ba0b15f12e8cd04f1f 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 FFMPEG_INDEO2DATA_H
-#define FFMPEG_INDEO2DATA_H
+#ifndef AVCODEC_INDEO2DATA_H
+#define AVCODEC_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 /* FFMPEG_INDEO2DATA_H */
+#endif /* AVCODEC_INDEO2DATA_H */
diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h
index eb9a8c19e44ab4271bf4f079a78e549ffc41d00c..bbc4c952ff323ba97dc296f9f5e8b3099a783788 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 FFMPEG_INDEO3DATA_H
-#define FFMPEG_INDEO3DATA_H
+#ifndef AVCODEC_INDEO3DATA_H
+#define AVCODEC_INDEO3DATA_H
 
 #include <stdint.h>
 
@@ -2339,4 +2339,4 @@ static const uint32_t correctionhighorder[] = {
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
-#endif /* FFMPEG_INDEO3DATA_H */
+#endif /* AVCODEC_INDEO3DATA_H */
diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 3f6de67da5d01b6e7489f608f9ba2d0cde204024..5f63e6abf3a46dc18ce04a6d3630aef4c482023f 100644
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_INTRAX8_H
-#define FFMPEG_INTRAX8_H
+#ifndef AVCODEC_INTRAX8_H
+#define AVCODEC_INTRAX8_H
 
 #include "bitstream.h"
 #include "mpegvideo.h"
@@ -54,4 +54,4 @@ void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s);
 void ff_intrax8_common_end(IntraX8Context * w);
 int  ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq);
 
-#endif /* FFMPEG_INTRAX8_H */
+#endif /* AVCODEC_INTRAX8_H */
diff --git a/libavcodec/intrax8huf.h b/libavcodec/intrax8huf.h
index f8c830d9546a4b372a124a850d2cfb308788f20a..375906bab20dcd5ee1fede52ceebb68e0f56fe64 100644
--- a/libavcodec/intrax8huf.h
+++ b/libavcodec/intrax8huf.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_INTRAX8HUF_H
-#define FFMPEG_INTRAX8HUF_H
+#ifndef AVCODEC_INTRAX8HUF_H
+#define AVCODEC_INTRAX8HUF_H
 
 #include <inttypes.h>
 
@@ -915,4 +915,4 @@ static const uint16_t x8_ac1_highquant_table[8][77][2]={
 };
 #define MAX_AC_VLC_BITS 16
 
-#endif /* FFMPEG_INTRAX8HUF_H */
+#endif /* AVCODEC_INTRAX8HUF_H */
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h
index 792d2be3b54cebfff6d82e7e4d1a0a02a8d112ff..c2b22e25e611ad155c1ceecc8f1f5f448760e4c3 100644
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@@ -25,8 +25,8 @@
  * JPEG-LS common code.
  */
 
-#ifndef FFMPEG_JPEGLS_H
-#define FFMPEG_JPEGLS_H
+#ifndef AVCODEC_JPEGLS_H
+#define AVCODEC_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 /* FFMPEG_JPEGLS_H */
+#endif /* AVCODEC_JPEGLS_H */
diff --git a/libavcodec/jpeglsdec.h b/libavcodec/jpeglsdec.h
index 362a0feb527db5bc96109d80f4e15181abfce23c..f9416dfa36d6a487aae0cf75d6951ccc0b17d3d8 100644
--- a/libavcodec/jpeglsdec.h
+++ b/libavcodec/jpeglsdec.h
@@ -25,8 +25,8 @@
  * JPEG-LS decoder.
  */
 
-#ifndef FFMPEG_JPEGLSDEC_H
-#define FFMPEG_JPEGLSDEC_H
+#ifndef AVCODEC_JPEGLSDEC_H
+#define AVCODEC_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 /* FFMPEG_JPEGLSDEC_H */
+#endif /* AVCODEC_JPEGLSDEC_H */
diff --git a/libavcodec/lcl.h b/libavcodec/lcl.h
index 7d5a76a78960baf5abcfb8a5c1c7413b66916782..b60c0e901a569f73f71bfc927ed1714ec102f793 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 FFMPEG_LCL_H
-#define FFMPEG_LCL_H
+#ifndef AVCODEC_LCL_H
+#define AVCODEC_LCL_H
 
 #define BMPTYPE_YUV 1
 #define BMPTYPE_RGB 2
@@ -46,4 +46,4 @@
 #define CODEC_MSZH 1
 #define CODEC_ZLIB 3
 
-#endif /* FFMPEG_LCL_H */
+#endif /* AVCODEC_LCL_H */
diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h
index 31cd5738d7b8209e4cda1bd00fc96d30cb8dd97c..54db287824d756b49a036f0ccfa9bbcd7d879793 100644
--- a/libavcodec/libdirac.h
+++ b/libavcodec/libdirac.h
@@ -23,8 +23,8 @@
 * data structures common to libdiracenc.c and libdiracdec.c
 */
 
-#ifndef FFMPEG_LIBDIRAC_H
-#define FFMPEG_LIBDIRAC_H
+#ifndef AVCODEC_LIBDIRAC_H
+#define AVCODEC_LIBDIRAC_H
 
 #include "config.h"
 
@@ -46,4 +46,4 @@ static const struct {
 };
 
 #endif /* CONFIG_LIBDIRAC */
-#endif /* FFMPEG_LIBDIRAC_H */
+#endif /* AVCODEC_LIBDIRAC_H */
diff --git a/libavcodec/libdirac_libschro.h b/libavcodec/libdirac_libschro.h
index 81a0fe4b3e16fc0156e03bfd169d472adccec050..9c6c0f102410207e8c0e241a6acb11c514d0ed66 100644
--- a/libavcodec/libdirac_libschro.h
+++ b/libavcodec/libdirac_libschro.h
@@ -23,8 +23,8 @@
 * data structures common to libdirac and libschroedinger
 */
 
-#ifndef FFMPEG_LIBDIRAC_LIBSCHRO_H
-#define FFMPEG_LIBDIRAC_LIBSCHRO_H
+#ifndef AVCODEC_LIBDIRAC_LIBSCHRO_H
+#define AVCODEC_LIBDIRAC_LIBSCHRO_H
 
 #include "avcodec.h"
 
@@ -106,4 +106,4 @@ void *ff_dirac_schro_queue_pop (FfmpegDiracSchroQueue *queue);
 */
 void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue,
                                void (*free_func)(void *));
-#endif /* FFMPEG_LIBDIRAC_LIBSCHRO_H */
+#endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */
diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h
index 7b5f7f2bcfdf0df3344873989c0ee228b9f781ef..6902a5d0596a2e8b2784b103045237a1b606411f 100644
--- a/libavcodec/libschroedinger.h
+++ b/libavcodec/libschroedinger.h
@@ -23,8 +23,8 @@
 * data structures common to libschroedingerdec.c and libschroedingerenc.c
 */
 
-#ifndef FFMPEG_LIBSCHROEDINGER_H
-#define FFMPEG_LIBSCHROEDINGER_H
+#ifndef AVCODEC_LIBSCHROEDINGER_H
+#define AVCODEC_LIBSCHROEDINGER_H
 
 #include "config.h"
 
@@ -58,4 +58,4 @@ int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt,
                                SchroFrameFormat  *schro_frame_fmt);
 
 #endif /* CONFIG_LIBSCHROEDINGER */
-#endif /* FFMPEG_LIBSCHROEDINGER_H */
+#endif /* AVCODEC_LIBSCHROEDINGER_H */
diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h
index bce30cebf26b6f4f68161f442dc385d17a2fbd0f..1cf7589aa1525ec02c1ad21a60ea1ca6ed13658c 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 FFMPEG_LIBXVID_INTERNAL_H
-#define FFMPEG_LIBXVID_INTERNAL_H
+#ifndef AVCODEC_LIBXVID_INTERNAL_H
+#define AVCODEC_LIBXVID_INTERNAL_H
 
 /**
  * @file libxvid_internal.h
@@ -29,4 +29,4 @@
 
 int av_tempfile(char *prefix, char **filename);
 
-#endif /* FFMPEG_LIBXVID_INTERNAL_H */
+#endif /* AVCODEC_LIBXVID_INTERNAL_H */
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
index 6586854e6726b75bb84aee79533a7f8cb88fb6b2..96f9f856f29f9e4e23c9c66c32c0e37f5542733c 100644
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_LPC_H
-#define FFMPEG_LPC_H
+#ifndef AVCODEC_LPC_H
+#define AVCODEC_LPC_H
 
 #include <stdint.h>
 #include "dsputil.h"
@@ -45,4 +45,4 @@ int ff_lpc_calc_coefs(DSPContext *s,
                       int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc,
                       int omethod, int max_shift, int zero_shift);
 
-#endif /* FFMPEG_LPC_H */
+#endif /* AVCODEC_LPC_H */
diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h
index d4bc4957db61a2d1fedaad3725655d049b3c719c..2337756406445f59eac0fc445109783aaf5c5a82 100644
--- a/libavcodec/lsp.h
+++ b/libavcodec/lsp.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_LSP_H
-#define FFMPEG_LSP_H
+#ifndef AVCODEC_LSP_H
+#define AVCODEC_LSP_H
 
 #include <stdint.h>
 
@@ -67,4 +67,4 @@ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order);
  */
 void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order);
 
-#endif /* FFMPEG_LSP_H */
+#endif /* AVCODEC_LSP_H */
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index 161f0dce5615c079df98a51f61c13625b8475b90..e8ff46c733c802395a4afcaef15e1d6a554dcfc8 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -27,8 +27,8 @@
  * Modified for use in TIFF by Konstantin Shishkov
  */
 
-#ifndef FFMPEG_LZW_H
-#define FFMPEG_LZW_H
+#ifndef AVCODEC_LZW_H
+#define AVCODEC_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 /* FFMPEG_LZW_H */
+#endif /* AVCODEC_LZW_H */
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 3b9bfeb09f18cafc0c4361c4da0e6fc894e7aca9..123fcb76c76030648096d934ed5e46e5bc17e508 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 FFMPEG_MATHOPS_H
-#define FFMPEG_MATHOPS_H
+#ifndef AVCODEC_MATHOPS_H
+#define AVCODEC_MATHOPS_H
 
 #include "libavutil/common.h"
 
@@ -83,5 +83,5 @@ static av_always_inline int MULH(int a, int b){
 #   define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb))
 #endif
 
-#endif /* FFMPEG_MATHOPS_H */
+#endif /* AVCODEC_MATHOPS_H */
 
diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h
index 028f8c0d3f333869c03973ae899032a290198a97..f8741cc7a082b421650af6e8b230c09bf6701e9c 100644
--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@@ -30,8 +30,8 @@
  * MJPEG encoder and decoder.
  */
 
-#ifndef FFMPEG_MJPEG_H
-#define FFMPEG_MJPEG_H
+#ifndef AVCODEC_MJPEG_H
+#define AVCODEC_MJPEG_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -152,4 +152,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 /* FFMPEG_MJPEG_H */
+#endif /* AVCODEC_MJPEG_H */
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index d6022eb1e9f80eece3848cc58b20d7ac15722a57..c973a9c2a2c4cd9f9bad05c50a2ba6ec376b36bd 100644
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -26,8 +26,8 @@
  * MJPEG decoder.
  */
 
-#ifndef FFMPEG_MJPEGDEC_H
-#define FFMPEG_MJPEGDEC_H
+#ifndef AVCODEC_MJPEGDEC_H
+#define AVCODEC_MJPEGDEC_H
 
 #include "avcodec.h"
 #include "bitstream.h"
@@ -108,4 +108,4 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
 
-#endif /* FFMPEG_MJPEGDEC_H */
+#endif /* AVCODEC_MJPEGDEC_H */
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h
index 02f8a714c3a5fab841b9a512ced440dd0728248a..4c904c3e7e5968f5cb3285f4a660d5dbd50be944 100644
--- a/libavcodec/mjpegenc.h
+++ b/libavcodec/mjpegenc.h
@@ -30,8 +30,8 @@
  * MJPEG encoder.
  */
 
-#ifndef FFMPEG_MJPEGENC_H
-#define FFMPEG_MJPEGENC_H
+#ifndef AVCODEC_MJPEGENC_H
+#define AVCODEC_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 /* FFMPEG_MJPEGENC_H */
+#endif /* AVCODEC_MJPEGENC_H */
diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
index bbb09e0b5a00f113aece80ec8ef95e164cadea0d..338a7a3310aa9c166124cfce8d738f0b12363136 100644
--- a/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MLP_H
-#define FFMPEG_MLP_H
+#ifndef AVCODEC_MLP_H
+#define AVCODEC_MLP_H
 
 #include <stdint.h>
 
@@ -118,4 +118,4 @@ static inline uint8_t xor_32_to_8(uint32_t value)
     return value;
 }
 
-#endif /* FFMPEG_MLP_H */
+#endif /* AVCODEC_MLP_H */
diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h
index c3d26add4fd548270ce0c4edb7cc7ce4906ac6b6..4199db04d7f9db31f96158d1f563063a493e987b 100644
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parser.h
@@ -24,8 +24,8 @@
  * MLP parser prototypes
  */
 
-#ifndef FFMPEG_MLP_PARSER_H
-#define FFMPEG_MLP_PARSER_H
+#ifndef AVCODEC_MLP_PARSER_H
+#define AVCODEC_MLP_PARSER_H
 
 #include "bitstream.h"
 
@@ -55,5 +55,5 @@ typedef struct MLPHeaderInfo
 
 int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb);
 
-#endif /* FFMPEG_MLP_PARSER_H */
+#endif /* AVCODEC_MLP_PARSER_H */
 
diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 0c1548992fb9771c954772a5af4427b4ca8bd33f..304013554a4eaa7884ce14886d9b8d5e4335bca6 100644
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -25,8 +25,8 @@
  * divided into 32 subbands.
  */
 
-#ifndef FFMPEG_MPC_H
-#define FFMPEG_MPC_H
+#ifndef AVCODEC_MPC_H
+#define AVCODEC_MPC_H
 
 #include "libavutil/random.h"
 #include "avcodec.h"
@@ -77,4 +77,4 @@ typedef struct {
 extern void ff_mpc_init();
 extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst);
 
-#endif /* FFMPEG_MPC_H */
+#endif /* AVCODEC_MPC_H */
diff --git a/libavcodec/mpc7data.h b/libavcodec/mpc7data.h
index b9e64702ec8be71061d80c7ced25b48430c0b236..5609e8fbf3015e67177eebcfea955af1cd257a61 100644
--- a/libavcodec/mpc7data.h
+++ b/libavcodec/mpc7data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPC7DATA_H
-#define FFMPEG_MPC7DATA_H
+#ifndef AVCODEC_MPC7DATA_H
+#define AVCODEC_MPC7DATA_H
 
 #include <stdint.h>
 
@@ -168,4 +168,4 @@ static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = {
 }
 };
 
-#endif /* FFMPEG_MPC7DATA_H */
+#endif /* AVCODEC_MPC7DATA_H */
diff --git a/libavcodec/mpc8data.h b/libavcodec/mpc8data.h
index 280dd6ffd01f136841db62032135d145ca509604..d6fbc1afb3b62fdc270e266a10cf13e71aca2fa4 100644
--- a/libavcodec/mpc8data.h
+++ b/libavcodec/mpc8data.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPC8DATA_H
-#define FFMPEG_MPC8DATA_H
+#ifndef AVCODEC_MPC8DATA_H
+#define AVCODEC_MPC8DATA_H
 
 #include <stdint.h>
 
@@ -118,4 +118,4 @@ const static uint32_t mpc8_cnk_lost[16][33] =
     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 103, 55, 3347, 12419, 56459, 16987, 313105, 54177, 3076873, 3739321, 3132677, 66353813, 123012781, 236330717, 0}
 };
 
-#endif /* FFMPEG_MPC8DATA_H */
+#endif /* AVCODEC_MPC8DATA_H */
diff --git a/libavcodec/mpc8huff.h b/libavcodec/mpc8huff.h
index 21e7730ce6588da5950bae1706ed33dac42d1355..8491037aa4748f64ea08d071bb73b9a4cb20be63 100644
--- a/libavcodec/mpc8huff.h
+++ b/libavcodec/mpc8huff.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPC8HUFF_H
-#define FFMPEG_MPC8HUFF_H
+#ifndef AVCODEC_MPC8HUFF_H
+#define AVCODEC_MPC8HUFF_H
 
 #include <stdint.h>
 
@@ -575,4 +575,4 @@ static const int8_t mpc8_q8_bits[2][MPC8_Q8_SIZE] = {
 }
 };
 
-#endif /* FFMPEG_MPC8HUFF_H */
+#endif /* AVCODEC_MPC8HUFF_H */
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h
index 23ad06d9c535638722abcb0dfc0232d08a4f7811..a2212ecb25d33184e232766494adfd53e5b489eb 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 FFMPEG_MPCDATA_H
-#define FFMPEG_MPCDATA_H
+#ifndef AVCODEC_MPCDATA_H
+#define AVCODEC_MPCDATA_H
 
 #include <stdint.h>
 
@@ -65,4 +65,4 @@ static const float mpc_SCF[128] = {
     0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };
 
-#endif /* FFMPEG_MPCDATA_H */
+#endif /* AVCODEC_MPCDATA_H */
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 1e919b4d66cd053ea94b033ac4fee2d2cecebe15..e65bb43d115b88d4f06b61728fdde9aaa5475e22 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 FFMPEG_MPEG12_H
-#define FFMPEG_MPEG12_H
+#ifndef AVCODEC_MPEG12_H
+#define AVCODEC_MPEG12_H
 
 #include "mpegvideo.h"
 
@@ -56,4 +56,4 @@ static inline int decode_dc(GetBitContext *gb, int component)
     return diff;
 }
 
-#endif /* FFMPEG_MPEG12_H */
+#endif /* AVCODEC_MPEG12_H */
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index d15bf4baa9863f766d07e76a6e9d67d68f7b0a00..5f04ac44bfbbcef12384e9c511a437657881be3f 100644
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -25,8 +25,8 @@
  * MPEG1/2 tables.
  */
 
-#ifndef FFMPEG_MPEG12DATA_H
-#define FFMPEG_MPEG12DATA_H
+#ifndef AVCODEC_MPEG12DATA_H
+#define AVCODEC_MPEG12DATA_H
 
 #include <stdint.h>
 #include "libavutil/rational.h"
@@ -53,4 +53,4 @@ extern const AVRational ff_frame_rate_tab[];
 extern const float ff_mpeg1_aspect[16];
 extern const AVRational ff_mpeg2_aspect[16];
 
-#endif /* FFMPEG_MPEG12DATA_H */
+#endif /* AVCODEC_MPEG12DATA_H */
diff --git a/libavcodec/mpeg12decdata.h b/libavcodec/mpeg12decdata.h
index c6ba2bb4d98048dde942353af16e58c93398e39d..b6eada2c24e4a6f8082f9146d69ac1f2ac7e9dd3 100644
--- a/libavcodec/mpeg12decdata.h
+++ b/libavcodec/mpeg12decdata.h
@@ -25,8 +25,8 @@
  * MPEG1/2 decoder tables.
  */
 
-#ifndef FFMPEG_MPEG12DECDATA_H
-#define FFMPEG_MPEG12DECDATA_H
+#ifndef AVCODEC_MPEG12DECDATA_H
+#define AVCODEC_MPEG12DECDATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -121,4 +121,4 @@ static const uint8_t * const mpeg2_dc_scale_table[4]={
     mpeg2_dc_scale_table3,
 };
 
-#endif /* FFMPEG_MPEG12DECDATA_H */
+#endif /* AVCODEC_MPEG12DECDATA_H */
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h
index 06a1a366db9afc14fa3b59b9e65e12e18fb632e4..68ad310b552231f37f246f934ea3c2abb0d2b069 100644
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPEG4AUDIO_H
-#define FFMPEG_MPEG4AUDIO_H
+#ifndef AVCODEC_MPEG4AUDIO_H
+#define AVCODEC_MPEG4AUDIO_H
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ extern const uint8_t ff_mpeg4audio_channels[8];
  */
 int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size);
 
-#endif /* FFMPEG_MPEGAUDIO_H */
+#endif /* AVCODEC_MPEG4AUDIO_H */
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index ba8f9463cba75ccca8665878da8c014e251faaa2..d149ad1c6eb206c30df9e0ce5914ddb284c71caa 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -25,8 +25,8 @@
  * mpeg4 tables.
  */
 
-#ifndef FFMPEG_MPEG4DATA_H
-#define FFMPEG_MPEG4DATA_H
+#ifndef AVCODEC_MPEG4DATA_H
+#define AVCODEC_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 /* FFMPEG_MPEG4DATA_H */
+#endif /* AVCODEC_MPEG4DATA_H */
diff --git a/libavcodec/mpeg4video_parser.h b/libavcodec/mpeg4video_parser.h
index 125f6aa501d785e3f89f844c9698eaa34090868a..aaa62994eab9be02665098a6f6a777c266df4628 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 FFMPEG_MPEG4VIDEO_PARSER_H
-#define FFMPEG_MPEG4VIDEO_PARSER_H
+#ifndef AVCODEC_MPEG4VIDEO_PARSER_H
+#define AVCODEC_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 /* FFMPEG_MPEG4VIDEO_PARSER_H */
+#endif /* AVCODEC_MPEG4VIDEO_PARSER_H */
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 6d602a1dcb47ab9730ff70cef61676ffac33ae48..bf79d3b58c74352b0e85a0cbca7cf96c40457102 100644
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -23,8 +23,8 @@
  * mpeg audio declarations for both encoder and decoder.
  */
 
-#ifndef FFMPEG_MPEGAUDIO_H
-#define FFMPEG_MPEGAUDIO_H
+#ifndef AVCODEC_MPEGAUDIO_H
+#define AVCODEC_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 /* FFMPEG_MPEGAUDIO_H */
+#endif /* AVCODEC_MPEGAUDIO_H */
diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h
index 55ea4f64e87e246462a36c431513cd15f5be0127..85277dfc22c23eebae35499d9e0c8875a932dac4 100644
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@@ -24,8 +24,8 @@
  * mpeg audio layer common tables.
  */
 
-#ifndef FFMPEG_MPEGAUDIODATA_H
-#define FFMPEG_MPEGAUDIODATA_H
+#ifndef AVCODEC_MPEGAUDIODATA_H
+#define AVCODEC_MPEGAUDIODATA_H
 
 #include "libavutil/common.h"
 
@@ -40,4 +40,4 @@ extern const int ff_mpa_quant_steps[17];
 extern const int ff_mpa_quant_bits[17];
 extern const unsigned char * const ff_mpa_alloc_tables[5];
 
-#endif /* FFMPEG_MPEGAUDIODATA_H */
+#endif /* AVCODEC_MPEGAUDIODATA_H */
diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h
index 60f0365484151d35ea126eb510a74145fc49d8e4..6f668e0e12ebe34c35a654609dba1933940cea29 100644
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@@ -24,8 +24,8 @@
  * MPEG Audio header decoder.
  */
 
-#ifndef FFMPEG_MPEGAUDIODECHEADER_H
-#define FFMPEG_MPEGAUDIODECHEADER_H
+#ifndef AVCODEC_MPEGAUDIODECHEADER_H
+#define AVCODEC_MPEGAUDIODECHEADER_H
 
 #include "libavutil/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 /* FFMPEG_MPEGAUDIODECHEADER_H */
+#endif /* AVCODEC_MPEGAUDIODECHEADER_H */
diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h
index a41ff7aaa859bd0f5eaf377e9eadd5f17080d370..eea9cfbe224b9a66286e9b54914f4e17939b7b06 100644
--- a/libavcodec/mpegaudiodectab.h
+++ b/libavcodec/mpegaudiodectab.h
@@ -24,8 +24,8 @@
  * mpeg audio layer decoder tables.
  */
 
-#ifndef FFMPEG_MPEGAUDIODECTAB_H
-#define FFMPEG_MPEGAUDIODECTAB_H
+#ifndef AVCODEC_MPEGAUDIODECTAB_H
+#define AVCODEC_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 /* FFMPEG_MPEGAUDIODECTAB_H */
+#endif /* AVCODEC_MPEGAUDIODECTAB_H */
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h
index 61ea471b1cf318cc0c45b433387ec71349809c9c..c82c1b9b7a5d8db60049114472766111a20a6ca4 100644
--- a/libavcodec/mpegaudiotab.h
+++ b/libavcodec/mpegaudiotab.h
@@ -27,8 +27,8 @@
  * Most of them come from the mpeg audio specification.
  */
 
-#ifndef FFMPEG_MPEGAUDIOTAB_H
-#define FFMPEG_MPEGAUDIOTAB_H
+#ifndef AVCODEC_MPEGAUDIOTAB_H
+#define AVCODEC_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 /* FFMPEG_MPEGAUDIOTAB_H */
+#endif /* AVCODEC_MPEGAUDIOTAB_H */
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 255e1f20807d9071c174ce233a4fd04d32e1c93f..d2c46e31cb107bdb6bcf496763d80a71fae4a521 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -25,8 +25,8 @@
  * mpegvideo header.
  */
 
-#ifndef FFMPEG_MPEGVIDEO_H
-#define FFMPEG_MPEGVIDEO_H
+#ifndef AVCODEC_MPEGVIDEO_H
+#define AVCODEC_MPEGVIDEO_H
 
 #include "dsputil.h"
 #include "bitstream.h"
@@ -863,5 +863,5 @@ void ff_wmv2_encode_mb(MpegEncContext * s,
                        DCTELEM block[6][64],
                        int motion_x, int motion_y);
 
-#endif /* FFMPEG_MPEGVIDEO_H */
+#endif /* AVCODEC_MPEGVIDEO_H */
 
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index 4f3396f589cea3979be41e1760ec0ebd1396f6ae..034217e1561301adc74ccd3a8b8f8a7d4e69fe29 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 FFMPEG_MPEGVIDEO_COMMON_H
-#define FFMPEG_MPEGVIDEO_COMMON_H
+#ifndef AVCODEC_MPEGVIDEO_COMMON_H
+#define AVCODEC_MPEGVIDEO_COMMON_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -898,4 +898,4 @@ static inline void MPV_motion(MpegEncContext *s,
         MPV_motion_internal(s, dest_y, dest_cb, dest_cr, dir,
                             ref_picture, pix_op, qpix_op, 0);
 }
-#endif /* FFMPEG_MPEGVIDEO_COMMON_H */
+#endif /* AVCODEC_MPEGVIDEO_COMMON_H */
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 17288b8e281c3804b87d0a0abc725e0e60ee0fe1..3226015be266926fdaeeea08faf64e6eede23569 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -23,8 +23,8 @@
  * @file msmpeg4.h
  */
 
-#ifndef FFMPEG_MSMPEG4_H
-#define FFMPEG_MSMPEG4_H
+#ifndef AVCODEC_MSMPEG4_H
+#define AVCODEC_MSMPEG4_H
 
 #include "config.h"
 #include "avcodec.h"
@@ -62,4 +62,4 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]);
 #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER)
 #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER)
 
-#endif /* FFMPEG_MSMPEG4_H */
+#endif /* AVCODEC_MSMPEG4_H */
diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 0234027288077c6f9c24bc85d4f1414a07e2b2bf..b9ffb2719776cbe7206d38f90129b2cb582e3bef 100644
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -27,8 +27,8 @@
  * MSMPEG4 data tables.
  */
 
-#ifndef FFMPEG_MSMPEG4DATA_H
-#define FFMPEG_MSMPEG4DATA_H
+#ifndef AVCODEC_MSMPEG4DATA_H
+#define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
 #include "bitstream.h"
@@ -96,4 +96,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 /* FFMPEG_MSMPEG4DATA_H */
+#endif /* AVCODEC_MSMPEG4DATA_H */
diff --git a/libavcodec/nellymoser.h b/libavcodec/nellymoser.h
index 4f415dedb9cc9059fd4bd91c296f3e16e81bdc5a..6a7526dbf048a28eb11202e44c5568abf99d2285 100644
--- a/libavcodec/nellymoser.h
+++ b/libavcodec/nellymoser.h
@@ -31,8 +31,8 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#ifndef FFMPEG_NELLYMOSER_H
-#define FFMPEG_NELLYMOSER_H
+#ifndef AVCODEC_NELLYMOSER_H
+#define AVCODEC_NELLYMOSER_H
 
 #include "avcodec.h"
 
diff --git a/libavcodec/opt.h b/libavcodec/opt.h
index 4add25c5f82c06255c2d04353c2453548cb849aa..557c4300754f171181ae6e7f02221b0de92fa306 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 FFMPEG_OPT_H
-#define FFMPEG_OPT_H
+#ifndef AVCODEC_OPT_H
+#define AVCODEC_OPT_H
 
 /**
  * @file opt.h
@@ -141,4 +141,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 /* FFMPEG_OPT_H */
+#endif /* AVCODEC_OPT_H */
diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 80ee6894e056225ac8f295401755ae15e52b6425..4150870c8438255543977cfc4e0a11b4b9fb4983 100644
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_PARSER_H
-#define FFMPEG_PARSER_H
+#ifndef AVCODEC_PARSER_H
+#define AVCODEC_PARSER_H
 
 #include "avcodec.h"
 
@@ -66,4 +66,4 @@ void ff_parse1_close(AVCodecParserContext *s);
  */
 void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove);
 
-#endif /* FFMPEG_PARSER_H */
+#endif /* AVCODEC_PARSER_H */
diff --git a/libavcodec/png.h b/libavcodec/png.h
index 6e16f62e0fedfa2f6c89e5d83fcda7f21e3810ac..0fde3f41d6bf55265477ede55c395729b025ec88 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 FFMPEG_PNG_H
-#define FFMPEG_PNG_H
+#ifndef AVCODEC_PNG_H
+#define AVCODEC_PNG_H
 
 #include <stdint.h>
 
@@ -74,4 +74,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 /* FFMPEG_PNG_H */
+#endif /* AVCODEC_PNG_H */
diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h
index c77bcca09ebb2d40163f0f458fff06b98f888b9d..8aa42763738e25d2de05c7bc7de1e9262bbdc521 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 FFMPEG_PNM_H
-#define FFMPEG_PNM_H
+#ifndef AVCODEC_PNM_H
+#define AVCODEC_PNM_H
 
 #include "avcodec.h"
 
@@ -34,4 +34,4 @@ typedef struct PNMContext {
 
 int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s);
 
-#endif /* FFMPEG_PNM_H */
+#endif /* AVCODEC_PNM_H */
diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h
index 43bd5ababf45fd1f21b6eb2e336514a06ab7dbed..63f817a215847783c2b3238e6c6c31286d97583f 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 FFMPEG_DSPUTIL_ALTIVEC_H
-#define FFMPEG_DSPUTIL_ALTIVEC_H
+#ifndef AVCODEC_PPC_DSPUTIL_ALTIVEC_H
+#define AVCODEC_PPC_DSPUTIL_ALTIVEC_H
 
 #include <stdint.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 /* FFMPEG_DSPUTIL_ALTIVEC_H */
+#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */
diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h
index 1276661b02b82c5f0284b9b3000ea1ea4db6a446..0fc8b3c377705665744cdbe5628fd1afac907dab 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 FFMPEG_DSPUTIL_PPC_H
-#define FFMPEG_DSPUTIL_PPC_H
+#ifndef AVCODEC_PPC_DSPUTIL_PPC_H
+#define AVCODEC_PPC_DSPUTIL_PPC_H
 
 #ifdef CONFIG_POWERPC_PERF
 void powerpc_display_perf_report(void);
@@ -149,4 +149,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 /*  FFMPEG_DSPUTIL_PPC_H */
+#endif /*  AVCODEC_PPC_DSPUTIL_PPC_H */
diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h
index b8a908a61508541cc95f75b91561f76665375ee1..01b1c18567ca54efe064cc6bdcffb1334a60a6e1 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 FFMPEG_GCC_FIXES_H
-#define FFMPEG_GCC_FIXES_H
+#ifndef AVCODEC_PPC_GCC_FIXES_H
+#define AVCODEC_PPC_GCC_FIXES_H
 
 #include "config.h"
 
@@ -99,4 +99,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \
 
 #endif /* (__GNUC__ == 3 && __GNUC_MINOR__ < 3) */
 
-#endif /* FFMPEG_GCC_FIXES_H */
+#endif /* AVCODEC_PPC_GCC_FIXES_H */
diff --git a/libavcodec/ppc/imgresample_altivec.h b/libavcodec/ppc/imgresample_altivec.h
index 538c1bee64fa545979d120c26b940374dec5c766..27b85f9a848eefa05ca0e92988a129d217c8a2db 100644
--- a/libavcodec/ppc/imgresample_altivec.h
+++ b/libavcodec/ppc/imgresample_altivec.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H
-#define FFMPEG_IMGRESAMPLE_ALTIVEC_H
+#ifndef AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H
+#define AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H
 
 #include <stdint.h>
 
 void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src,
                           int wrap, int16_t *filter);
-#endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */
+#endif /* AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H */
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 2259f2af09c5d9708e46b6208bdd5d465e70d088..b530ce5523749fc0c060903e44b27548ca0b36ad 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 FFMPEG_PPC_MATHOPS_H
-#define FFMPEG_PPC_MATHOPS_H
+#ifndef AVCODEC_PPC_MATHOPS_H
+#define AVCODEC_PPC_MATHOPS_H
 
 #if defined(ARCH_POWERPC_405)
 /* signed 16x16 -> 32 multiply add accumulate */
@@ -35,4 +35,4 @@
     __rt; })
 #endif
 
-#endif /* FFMPEG_PPC_MATHOPS_H */
+#endif /* AVCODEC_PPC_MATHOPS_H */
diff --git a/libavcodec/ppc/types_altivec.h b/libavcodec/ppc/types_altivec.h
index 6d41a928bf5de18e855b435f445e657f6c1a78e7..30963c2938a12f900d71e8e5848823c6aa596c87 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 FFMPEG_TYPES_ALTIVEC_H
-#define FFMPEG_TYPES_ALTIVEC_H
+#ifndef AVCODEC_PPC_TYPES_ALTIVEC_H
+#define AVCODEC_PPC_TYPES_ALTIVEC_H
 
 /***********************************************************************
  * Vector types
@@ -43,4 +43,4 @@
 #define zero_u32v (vec_u32_t) zerov
 #define zero_s32v (vec_s32_t) zerov
 
-#endif /* FFMPEG_TYPES_ALTIVEC_H */
+#endif /* AVCODEC_PPC_TYPES_ALTIVEC_H */
diff --git a/libavcodec/ppc/util_altivec.h b/libavcodec/ppc/util_altivec.h
index 74fc2ab1ce8f341a5ea52a80276f9a45012790d8..c54d0ea4c17613c86c4318cdb99ca440904b187d 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 FFMPEG_UTIL_ALTIVEC_H
-#define FFMPEG_UTIL_ALTIVEC_H
+#ifndef AVCODEC_PPC_UTIL_ALTIVEC_H
+#define AVCODEC_PPC_UTIL_ALTIVEC_H
 
 #include <stdint.h>
 
@@ -102,4 +102,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src)
     return vec_perm(first, second, mask);
 }
 
-#endif /* FFMPEG_UTIL_ALTIVEC_H */
+#endif /* AVCODEC_PPC_UTIL_ALTIVEC_H */
diff --git a/libavcodec/ps2/mmi.h b/libavcodec/ps2/mmi.h
index 2c5ecb01dc8c80384e5ca1c0604d77df99f88158..81905e0dd60574bd6422423d5b7f61845ecc161e 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 FFMPEG_MMI_H
-#define FFMPEG_MMI_H
+#ifndef AVCODEC_PS2_MMI_H
+#define AVCODEC_PS2_MMI_H
 
 #define align16 __attribute__ ((aligned (16)))
 
@@ -168,4 +168,4 @@
 #define         pextlb(rs, rt, rd) \
         asm volatile ("pextlb  " #rd ", " #rs ", " #rt )
 
-#endif /* FFMPEG_MMI_H */
+#endif /* AVCODEC_PS2_MMI_H */
diff --git a/libavcodec/qdm2data.h b/libavcodec/qdm2data.h
index 8e2d87581f0a7a3517d94648c1dbba73121179aa..166e720fc97554b6cc31638486cfb405dd41ebda 100644
--- a/libavcodec/qdm2data.h
+++ b/libavcodec/qdm2data.h
@@ -27,8 +27,8 @@
  * Various QDM2 tables.
  */
 
-#ifndef FFMPEG_QDM2DATA_H
-#define FFMPEG_QDM2DATA_H
+#ifndef AVCODEC_QDM2DATA_H
+#define AVCODEC_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 /* FFMPEG_QDM2DATA_H */
+#endif /* AVCODEC_QDM2DATA_H */
diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h
index 11e0c25f86d1cf5e921c21106a676a2944bb3bd8..986ee2ba01d0c842fa2a4398dfa2f4162e33739c 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 FFMPEG_RA144_H
-#define FFMPEG_RA144_H
+#ifndef AVCODEC_RA144_H
+#define AVCODEC_RA144_H
 
 #include <stdint.h>
 
@@ -1552,4 +1552,4 @@ static const int16_t * const lpc_refl_cb[10]={
     lpc_refl_cb6, lpc_refl_cb7, lpc_refl_cb8, lpc_refl_cb9, lpc_refl_cb10
 };
 
-#endif /* FFMPEG_RA144_H */
+#endif /* AVCODEC_RA144_H */
diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h
index c6b24d4d3c7e70c5c910fac034d37970b319336c..26fa65a3132304da46b0704f2c258fb92ce40995 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 FFMPEG_RA288_H
-#define FFMPEG_RA288_H
+#ifndef AVCODEC_RA288_H
+#define AVCODEC_RA288_H
 
 static const float amptable[8]={
      0.515625,  0.90234375,  1.57910156,  2.76342773,
@@ -206,4 +206,4 @@ static const float gain_bw_tab[10]={
   0.553955078, 0.50201416,  0.454956055, 0.41229248,  0.373657227
 };
 
-#endif /* FFMPEG_RA288_H */
+#endif /* AVCODEC_RA288_H */
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 7d23b252d01afd761dcf5a772898bf39c9f6916f..1e47231539282c5d909a0e5af31d419a90580a56 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -24,8 +24,8 @@
  * Range coder.
  */
 
-#ifndef FFMPEG_RANGECODER_H
-#define FFMPEG_RANGECODER_H
+#ifndef AVCODEC_RANGECODER_H
+#define AVCODEC_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 /* FFMPEG_RANGECODER_H */
+#endif /* AVCODEC_RANGECODER_H */
diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h
index 8704b430140a4743412d2c966da369eef3b9e70d..a1017751e293e24ceafcbfd09485373e5e8f56a5 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 FFMPEG_RATECONTROL_H
-#define FFMPEG_RATECONTROL_H
+#ifndef AVCODEC_RATECONTROL_H
+#define AVCODEC_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 /* FFMPEG_RATECONTROL_H */
+#endif /* AVCODEC_RATECONTROL_H */
 
diff --git a/libavcodec/raw.h b/libavcodec/raw.h
index 1110114e2539908493fc40675f042faf393fe86c..e600dca395358544302748c523771fe826992541 100644
--- a/libavcodec/raw.h
+++ b/libavcodec/raw.h
@@ -24,8 +24,8 @@
  * Raw Video Codec
  */
 
-#ifndef FFMPEG_RAW_H
-#define FFMPEG_RAW_H
+#ifndef AVCODEC_RAW_H
+#define AVCODEC_RAW_H
 
 #include "avcodec.h"
 
@@ -36,4 +36,4 @@ typedef struct PixelFormatTag {
 
 extern const PixelFormatTag ff_raw_pixelFormatTags[];
 
-#endif /* FFMPEG_RAW_H */
+#endif /* AVCODEC_RAW_H */
diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index b2452abb2d8995c60c29a24cf1885336cb5515c7..a1dfb5cf990282e286b8b26034ecc1fde1e57e78 100644
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_RECTANGLE_H
-#define FFMPEG_RECTANGLE_H
+#ifndef AVCODEC_RECTANGLE_H
+#define AVCODEC_RECTANGLE_H
 
 #include "libavutil/common.h"
 
@@ -118,4 +118,4 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
     assert(h==4);
 }
 
-#endif /* FFMPEG_RECTANGLE_H */
+#endif /* AVCODEC_RECTANGLE_H */
diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index d71d3711bd306938f9a4d48bb4fd638e3ccc1ccc..20fd8c1c11315023fa3040d38c48691d92119686 100644
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -24,8 +24,8 @@
  * rl header.
  */
 
-#ifndef FFMPEG_RL_H
-#define FFMPEG_RL_H
+#ifndef AVCODEC_RL_H
+#define AVCODEC_RL_H
 
 #include <stdint.h>
 #include "bitstream.h"
@@ -83,4 +83,4 @@ static inline int get_rl_index(const RLTable *rl, int last, int run, int level)
     return index + level - 1;
 }
 
-#endif /* FFMPEG_RL_H */
+#endif /* AVCODEC_RL_H */
diff --git a/libavcodec/rle.h b/libavcodec/rle.h
index 14d07084f62573c24629ae741cb07738488d33aa..f892443266f270b303bc8ea9153e0bc71390daab 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 FFMPEG_RLE_H
-#define FFMPEG_RLE_H
+#ifndef AVCODEC_RLE_H
+#define AVCODEC_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 /* FFMPEG_RLE_H */
+#endif /* AVCODEC_RLE_H */
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index e7af474da8df6a4053c408f81d0b5c90ebe5c6a0..03c03ed5165fc1d080d3884001dfee599fc2d397 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 FFMPEG_ROQVIDEO_H
-#define FFMPEG_ROQVIDEO_H
+#ifndef AVCODEC_ROQVIDEO_H
+#define AVCODEC_ROQVIDEO_H
 
 #include "libavutil/random.h"
 #include "avcodec.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 /* FFMPEG_ROQVIDEO_H */
+#endif /* AVCODEC_ROQVIDEO_H */
diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h
index a5b377de5377f9e511c9da0f84cb75678fa25b75..02f2058b2c39d0260b69b8cf1c9ab949a1852652 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 FFMPEG_RTJPEG_H
-#define FFMPEG_RTJPEG_H
+#ifndef AVCODEC_RTJPEG_H
+#define AVCODEC_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,
                                const uint8_t *buf, int buf_size);
-#endif /* FFMPEG_RTJPEG_H */
+#endif /* AVCODEC_RTJPEG_H */
diff --git a/libavcodec/rv30data.h b/libavcodec/rv30data.h
index 98ccb352d1d5f4b4831909681c90aa5724643c9b..c16e51baeb03a1b97c5da267edc84a61c7adc591 100644
--- a/libavcodec/rv30data.h
+++ b/libavcodec/rv30data.h
@@ -24,8 +24,8 @@
  * miscellaneous RV30 tables
  */
 
-#ifndef FFMPEG_RV30DATA_H
-#define FFMPEG_RV30DATA_H
+#ifndef AVCODEC_RV30DATA_H
+#define AVCODEC_RV30DATA_H
 
 #include <stdint.h>
 
@@ -171,4 +171,4 @@ static const uint8_t rv30_itype_from_context[900] = {
     2, 7, 8, 4, 0, 6, 1, 5, 3,
     2, 8, 3, 0, 7, 4, 1, 6, 5,
 };
-#endif /* FFMPEG_RV30DATA_H */
+#endif /* AVCODEC_RV30DATA_H */
diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h
index df85fb89ecfbd89f1e8a483b52c5d49768d4df17..2dadedc4fc2a84a4f95b2808ecab51bdcb0684d5 100644
--- a/libavcodec/rv34.h
+++ b/libavcodec/rv34.h
@@ -24,8 +24,8 @@
  * RV30 and RV40 decoder common data declarations
  */
 
-#ifndef FFMPEG_RV34_H
-#define FFMPEG_RV34_H
+#ifndef AVCODEC_RV34_H
+#define AVCODEC_RV34_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -122,4 +122,4 @@ int ff_rv34_decode_init(AVCodecContext *avctx);
 int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size);
 int ff_rv34_decode_end(AVCodecContext *avctx);
 
-#endif /* FFMPEG_RV34_H */
+#endif /* AVCODEC_RV34_H */
diff --git a/libavcodec/rv34data.h b/libavcodec/rv34data.h
index 25256e23dd486d0effda88377901701cf52db6a9..e4862a3ba0d6b8753756b562ec71731c56a16a0d 100644
--- a/libavcodec/rv34data.h
+++ b/libavcodec/rv34data.h
@@ -24,8 +24,8 @@
  * miscellaneous RV30/40 tables
  */
 
-#ifndef FFMPEG_RV34DATA_H
-#define FFMPEG_RV34DATA_H
+#ifndef AVCODEC_RV34DATA_H
+#define AVCODEC_RV34DATA_H
 
 #include <stdint.h>
 
@@ -145,4 +145,4 @@ static const uint16_t rv34_mb_max_sizes[6] = { 0x2F, 0x68, 0x18B, 0x62F, 0x18BF,
  */
 static const uint8_t rv34_mb_bits_sizes[6] = { 6, 7, 9, 11, 13, 14 };
 
-#endif /* FFMPEG_RV34DATA_H */
+#endif /* AVCODEC_RV34DATA_H */
diff --git a/libavcodec/rv34vlc.h b/libavcodec/rv34vlc.h
index ef3cfbab31724ef25f8396d9870e44e71f419259..ffee907f957c5b67ea92245fcf596e6bd2176bbf 100644
--- a/libavcodec/rv34vlc.h
+++ b/libavcodec/rv34vlc.h
@@ -24,8 +24,8 @@
  * RV30/40 VLC tables
  */
 
-#ifndef FFMPEG_RV34VLC_H
-#define FFMPEG_RV34VLC_H
+#ifndef AVCODEC_RV34VLC_H
+#define AVCODEC_RV34VLC_H
 
 #include <stdint.h>
 
@@ -4051,4 +4051,4 @@ static const uint8_t rv34_inter_coeff[NUM_INTER_TABLES][COEFF_VLC_SIZE] = {
 }
 };
 
-#endif /* FFMPEG_RV34VLC_H */
+#endif /* AVCODEC_RV34VLC_H */
diff --git a/libavcodec/rv40data.h b/libavcodec/rv40data.h
index 17bcb04cff4eeb7a73a5450009033d78e7cee153..b81b393184749d43e990442ddaf6d29f77c47d01 100644
--- a/libavcodec/rv40data.h
+++ b/libavcodec/rv40data.h
@@ -24,8 +24,8 @@
  * miscellaneous RV40 tables
  */
 
-#ifndef FFMPEG_RV40DATA_H
-#define FFMPEG_RV40DATA_H
+#ifndef AVCODEC_RV40DATA_H
+#define AVCODEC_RV40DATA_H
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ static const uint8_t rv40_filter_clip_tbl[3][32] = {
 };
 /** @} */ // end loopfilter group
 
-#endif /* FFMPEG_RV40DATA_H */
+#endif /* AVCODEC_RV40DATA_H */
diff --git a/libavcodec/rv40vlc2.h b/libavcodec/rv40vlc2.h
index f1664fcd6a34e35636dbd7cebc19aba74534c8f0..3b17d8faa06badd09ba0154022bd824170c752d8 100644
--- a/libavcodec/rv40vlc2.h
+++ b/libavcodec/rv40vlc2.h
@@ -24,8 +24,8 @@
  * RV40 VLC tables used for macroblock information decoding
  */
 
-#ifndef FFMPEG_RV40VLC2_H
-#define FFMPEG_RV40VLC2_H
+#ifndef AVCODEC_RV40VLC2_H
+#define AVCODEC_RV40VLC2_H
 
 #include <stdint.h>
 
@@ -703,4 +703,4 @@ static const uint8_t block_num_to_btype_vlc_num[12] = {
  0, 1, 0, 0, 2, 3, 0, 5, 0, 0, 4, 0
 };
 //@}
-#endif /* FFMPEG_RV40VLC2_H */
+#endif /* AVCODEC_RV40VLC2_H */
diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h
index 9ead901b6e3b6d314dde04cd40dc976f02d41e9e..4919c0748a136ba6e91cdaa60fdde4f68114f5f8 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 FFMPEG_S3TC_H
-#define FFMPEG_S3TC_H
+#ifndef AVCODEC_S3TC_H
+#define AVCODEC_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 /* FFMPEG_S3TC_H */
+#endif /* AVCODEC_S3TC_H */
diff --git a/libavcodec/sgi.h b/libavcodec/sgi.h
index 8c658761dc4c7eb6345ed002714fdae9c884bf02..be17f2e237457684217d1ef07615013883ea0a34 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 FFMPEG_SGI_H
-#define FFMPEG_SGI_H
+#ifndef AVCODEC_SGI_H
+#define AVCODEC_SGI_H
 
 /**
  * SGI image file signature
@@ -33,4 +33,4 @@
 #define SGI_RGB 3
 #define SGI_RGBA 4
 
-#endif /* FFMPEG_SGI_H */
+#endif /* AVCODEC_SGI_H */
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index 6ae48a24e552e95c5d0742f3e4c7638d427064ea..c3611e2f50d7051ac67459784b5d710b885a3df9 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -25,8 +25,8 @@
  * simple idct header.
  */
 
-#ifndef FFMPEG_SIMPLE_IDCT_H
-#define FFMPEG_SIMPLE_IDCT_H
+#ifndef AVCODEC_SIMPLE_IDCT_H
+#define AVCODEC_SIMPLE_IDCT_H
 
 #include <stdint.h>
 #include "dsputil.h"
@@ -44,4 +44,4 @@ void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block);
 
-#endif /* FFMPEG_SIMPLE_IDCT_H */
+#endif /* AVCODEC_SIMPLE_IDCT_H */
diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index e9b988986c7f33e1055bdef2582e69d5cea9260c..6f0d79f12ae239d635a82f228e28af8c32486cce 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 FFMPEG_SNOW_H
-#define FFMPEG_SNOW_H
+#ifndef AVCODEC_SNOW_H
+#define AVCODEC_SNOW_H
 
 #include "dsputil.h"
 
@@ -171,4 +171,4 @@ static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTE
         }
 }
 
-#endif /* FFMPEG_SNOW_H */
+#endif /* AVCODEC_SNOW_H */
diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h
index e93408b34c4a5315af2e25e43e5e1aff54334ef5..b2c53cc4fecc9f38de859b4a08605ad20434dcee 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 FFMPEG_SP5X_H
-#define FFMPEG_SP5X_H
+#ifndef AVCODEC_SP5X_H
+#define AVCODEC_SP5X_H
 
 #include <stdint.h>
 
@@ -331,4 +331,4 @@ static const uint8_t sp5x_quant_table_orig[18][64] =
 };
 #endif
 
-#endif /* FFMPEG_SP5X_H */
+#endif /* AVCODEC_SP5X_H */
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h
index 2596f3e617cd09ead188d71a52b138ddaabcfc60..e0b7c951439e8a14533cdc2f896a2fdbf12ddea1 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 FFMPEG_VIS_H
-#define FFMPEG_VIS_H
+#ifndef AVCODEC_SPARC_VIS_H
+#define AVCODEC_SPARC_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 /* FFMPEG_VIS_H */
+#endif /* AVCODEC_SPARC_VIS_H */
diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h
index 7764dd8dd94ccba647d76f44ecc73764aec94b70..bf2ee79432e43cbed5df7a7e889f30aee092086e 100644
--- a/libavcodec/svq1.h
+++ b/libavcodec/svq1.h
@@ -32,8 +32,8 @@
  *   http://www.pcisys.net/~melanson/codecs/
  */
 
-#ifndef FFMPEG_SVQ1_H
-#define FFMPEG_SVQ1_H
+#ifndef AVCODEC_SVQ1_H
+#define AVCODEC_SVQ1_H
 
 #include <stdint.h>
 
@@ -58,4 +58,4 @@ extern const uint16_t ff_svq1_inter_mean_vlc[512][2];
 
 extern const svq1_frame_size_t ff_svq1_frame_size_table[8];
 
-#endif /* FFMPEG_SVQ1_H */
+#endif /* AVCODEC_SVQ1_H */
diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h
index f4a4054d1cf464b47289595ce366b95f55f74d47..87ac71e666fa9ab0889a6e2c2a7e987e28a12acb 100644
--- a/libavcodec/svq1_cb.h
+++ b/libavcodec/svq1_cb.h
@@ -28,8 +28,8 @@
  * svq1 code books.
  */
 
-#ifndef FFMPEG_SVQ1_CB_H
-#define FFMPEG_SVQ1_CB_H
+#ifndef AVCODEC_SVQ1_CB_H
+#define AVCODEC_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 /* FFMPEG_SVQ1_CB_H */
+#endif /* AVCODEC_SVQ1_CB_H */
diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h
index 05fb12aad20bd2589692f4303bfd72ba1f4e0a06..272597e1e0bdff4518d365a6ddc337f07cdc58d7 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 FFMPEG_SVQ1_VLC_H
-#define FFMPEG_SVQ1_VLC_H
+#ifndef AVCODEC_SVQ1_VLC_H
+#define AVCODEC_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 /* FFMPEG_SVQ1_VLC_H */
+#endif /* AVCODEC_SVQ1_VLC_H */
diff --git a/libavcodec/svq1enc_cb.h b/libavcodec/svq1enc_cb.h
index 1feeed0ab62bca4e09b682a2bbbb2bd52f670792..c97b92de89d255a853915e737b3458aa25232b36 100644
--- a/libavcodec/svq1enc_cb.h
+++ b/libavcodec/svq1enc_cb.h
@@ -24,8 +24,8 @@
  * svq1 code books.
  */
 
-#ifndef FFMPEG_SVQ1ENC_CB_H
-#define FFMPEG_SVQ1ENC_CB_H
+#ifndef AVCODEC_SVQ1ENC_CB_H
+#define AVCODEC_SVQ1ENC_CB_H
 
 #include <stdint.h>
 
@@ -93,4 +93,4 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = {
  }
 };
 
-#endif /* FFMPEG_SVQ1ENC_CB_H */
+#endif /* AVCODEC_SVQ1ENC_CB_H */
diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index c5687d7df65ecda86da79966e91bed057d1fc117..1c515927a55fe9ae3b515b5235fe5001da9559c1 100644
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -24,8 +24,8 @@
  * @file tiff.h
  * @author Konstantin Shishkov
  */
-#ifndef FFMPEG_TIFF_H
-#define FFMPEG_TIFF_H
+#ifndef AVCODEC_TIFF_H
+#define AVCODEC_TIFF_H
 
 #include <stdint.h>
 
@@ -83,4 +83,4 @@ static const uint8_t type_sizes[6] = {
     0, 1, 100, 2, 4, 8
 };
 
-#endif /* FFMPEG_TIFF_H */
+#endif /* AVCODEC_TIFF_H */
diff --git a/libavcodec/truemotion1data.h b/libavcodec/truemotion1data.h
index 033e25e059776c681dba0bd8953fad20eb33cbfd..4b35e9869cdf4eed2d010bd3e9ac8d3e86b37e30 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 FFMPEG_TRUEMOTION1DATA_H
-#define FFMPEG_TRUEMOTION1DATA_H
+#ifndef AVCODEC_TRUEMOTION1DATA_H
+#define AVCODEC_TRUEMOTION1DATA_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -830,4 +830,4 @@ static const uint8_t pc_tbl4[] = {
 
 static const uint8_t * const tables[] = { pc_tbl2, pc_tbl3, pc_tbl4 };
 
-#endif /* FFMPEG_TRUEMOTION1DATA_H */
+#endif /* AVCODEC_TRUEMOTION1DATA_H */
diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h
index 572387cd7a9a5fd8e7c6cdc7aca96d1052bbb5e1..eef7da8eee488c1a11573d0fb3f2ae049da98df8 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 FFMPEG_TRUESPEECH_DATA_H
-#define FFMPEG_TRUESPEECH_DATA_H
+#ifndef AVCODEC_TRUESPEECH_DATA_H
+#define AVCODEC_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 /* FFMPEG_TRUESPEECH_DATA_H */
+#endif /* AVCODEC_TRUESPEECH_DATA_H */
diff --git a/libavcodec/ulti_cb.h b/libavcodec/ulti_cb.h
index e7bd3b86b0041ae3ea3e46f92d58ad3348a1e3ca..7061d839a8f567c8ad0913fabddf9f564351ccbc 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 FFMPEG_ULTI_CB_H
-#define FFMPEG_ULTI_CB_H
+#ifndef AVCODEC_ULTI_CB_H
+#define AVCODEC_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 /* FFMPEG_ULTI_CB_H */
+#endif /* AVCODEC_ULTI_CB_H */
diff --git a/libavcodec/unary.h b/libavcodec/unary.h
index abd7a531b1e1dbf3e7e21989bdffcb98abe23d75..5484be4d5661bb749564b3b9b6085e9abd1cc127 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 FFMPEG_UNARY_H
-#define FFMPEG_UNARY_H
+#ifndef AVCODEC_UNARY_H
+#define AVCODEC_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 /* FFMPEG_UNARY_H */
+#endif /* AVCODEC_UNARY_H */
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index db9029add0d8945040d5e6ba4ac17cd161c3e12e..4cd7bb1912e0d7663518018d0f2d518a2156cf35 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 FFMPEG_VC1_H
-#define FFMPEG_VC1_H
+#ifndef AVCODEC_VC1_H
+#define AVCODEC_VC1_H
 
 #include "avcodec.h"
 #include "mpegvideo.h"
@@ -308,4 +308,4 @@ typedef struct VC1Context{
     uint32_t *cbp_base, *cbp;
 } VC1Context;
 
-#endif /* FFMPEG_VC1_H */
+#endif /* AVCODEC_VC1_H */
diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h
index f775283ddbc87afe3d107b513035c67ecfb4b229..78de0f9a243aaad05e304ff38d3be4500aa4f1fe 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 FFMPEG_VC1ACDATA_H
-#define FFMPEG_VC1ACDATA_H
+#ifndef AVCODEC_VC1ACDATA_H
+#define AVCODEC_VC1ACDATA_H
 
 #include <stdint.h>
 
@@ -589,4 +589,4 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = {
 }
 };
 
-#endif /* FFMPEG_VC1ACDATA_H */
+#endif /* AVCODEC_VC1ACDATA_H */
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index 98ffe574f5ebdba6622dca5093a7b8e40f10fdfe..714d83a3536e8920a81a70ed541e0725210ddcda 100644
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -25,8 +25,8 @@
  * VC-1 tables.
  */
 
-#ifndef FFMPEG_VC1DATA_H
-#define FFMPEG_VC1DATA_H
+#ifndef AVCODEC_VC1DATA_H
+#define AVCODEC_VC1DATA_H
 
 #include <stdint.h>
 #include "libavutil/rational.h"
@@ -154,4 +154,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 /* FFMPEG_VC1DATA_H */
+#endif /* AVCODEC_VC1DATA_H */
diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h
index 48d0030dfe09046d7f2f4b398e7156e3cf199aaf..b8a8410229040ee1484fed3f7699cb8c4dca1eee 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 FFMPEG_VORBIS_H
-#define FFMPEG_VORBIS_H
+#ifndef AVCODEC_VORBIS_H
+#define AVCODEC_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 /* FFMPEG_VORBIS_H */
+#endif /* AVCODEC_VORBIS_H */
diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h
index 1b4be9aaa1123675dfbec2bd29bad1adbc021bdb..7b6347cd872fba091a9b97302ea3a9ac8adea318 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 FFMPEG_VORBIS_ENC_DATA_H
-#define FFMPEG_VORBIS_ENC_DATA_H
+#ifndef AVCODEC_VORBIS_ENC_DATA_H
+#define AVCODEC_VORBIS_ENC_DATA_H
 
 #include <stdint.h>
 
@@ -502,4 +502,4 @@ static const struct {
     { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
 };
 
-#endif /* FFMPEG_VORBIS_ENC_DATA_H */
+#endif /* AVCODEC_VORBIS_ENC_DATA_H */
diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h
index b8ec3630eeb331e4b42edccbc23649876b3a6423..9f8588db6ec5187c2843ce3671efe5b74bd273b8 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 FFMPEG_VP3DATA_H
-#define FFMPEG_VP3DATA_H
+#ifndef AVCODEC_VP3DATA_H
+#define AVCODEC_VP3DATA_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -3178,4 +3178,4 @@ static const uint16_t ac_bias_3[16][32][2] = {
   }
 };
 
-#endif /* FFMPEG_VP3DATA_H */
+#endif /* AVCODEC_VP3DATA_H */
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 8167957ed5d2bb0e75a938368cabfd814f268dbc..991e94b5543a9f38d46f00187e9ec3b3b15c98c4 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 FFMPEG_VP56_H
-#define FFMPEG_VP56_H
+#ifndef AVCODEC_VP56_H
+#define AVCODEC_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 /* FFMPEG_VP56_H */
+#endif /* AVCODEC_VP56_H */
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index e9fe8bb68426771325e951dcaca71586e5b57300..95dc633dcda026a058735a010abcf2191734177e 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 FFMPEG_VP56DATA_H
-#define FFMPEG_VP56DATA_H
+#ifndef AVCODEC_VP56DATA_H
+#define AVCODEC_VP56DATA_H
 
 #include "libavutil/common.h"
 
@@ -249,4 +249,4 @@ static const int8_t vp56_candidate_predictor_pos[12][2] = {
     {  2, -2 },
 };
 
-#endif /* FFMPEG_VP56DATA_H */
+#endif /* AVCODEC_VP56DATA_H */
diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h
index c08688a21329c4c457428ed687912dcba2657a87..64ecb78b835cca049b0a47e8cbdf009bd085a8ba 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 FFMPEG_VP5DATA_H
-#define FFMPEG_VP5DATA_H
+#ifndef AVCODEC_VP5DATA_H
+#define AVCODEC_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 /* FFMPEG_VP5DATA_H */
+#endif /* AVCODEC_VP5DATA_H */
diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 8d4bb0b57f728aebb0864836b639297a29c1e493..31d6c98cdb44d6ffaba00fa8fdb8dbeeaa05124c 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 FFMPEG_VP6DATA_H
-#define FFMPEG_VP6DATA_H
+#ifndef AVCODEC_VP6DATA_H
+#define AVCODEC_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 /* FFMPEG_VP6DATA_H */
+#endif /* AVCODEC_VP6DATA_H */
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 43b5d0c339a1c257b07fe9f87b0ffcadee5d5011..0aa109c85744888bf36abde582388c3a890d6bd9 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 FFMPEG_WMA_H
-#define FFMPEG_WMA_H
+#ifndef AVCODEC_WMA_H
+#define AVCODEC_WMA_H
 
 #include "bitstream.h"
 #include "dsputil.h"
@@ -146,4 +146,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 /* FFMPEG_WMA_H */
+#endif /* AVCODEC_WMA_H */
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h
index aa2a120a2b22b9276d219259ec06a00b34289edd..fbe66eaca553b2ad0daed454ee5de980058c9db2 100644
--- a/libavcodec/wmadata.h
+++ b/libavcodec/wmadata.h
@@ -24,8 +24,8 @@
  * Various WMA tables.
  */
 
-#ifndef FFMPEG_WMADATA_H
-#define FFMPEG_WMADATA_H
+#ifndef AVCODEC_WMADATA_H
+#define AVCODEC_WMADATA_H
 
 #include <stdint.h>
 #include "wma.h"
@@ -1438,4 +1438,4 @@ static const CoefVLCTable coef_vlcs[6] = {
     },
 };
 
-#endif /* FFMPEG_WMADATA_H */
+#endif /* AVCODEC_WMADATA_H */
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h
index 9d43ec547eed2982eb53c86ab77af47eb95d7e51..7ed96ced7aba7bebeb91f1bb596e4766a43ed314 100644
--- a/libavcodec/wmv2.h
+++ b/libavcodec/wmv2.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_WMV2_H
-#define FFMPEG_WMV2_H
+#ifndef AVCODEC_WMV2_H
+#define AVCODEC_WMV2_H
 
 #include "avcodec.h"
 #include "dsputil.h"
@@ -55,4 +55,4 @@ typedef struct Wmv2Context{
 
 void ff_wmv2_common_init(Wmv2Context * w);
 
-#endif /* FFMPEG_WMV2_H */
+#endif /* AVCODEC_WMV2_H */
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 0a6b33530e1e6d38921ecd20f59e87d81d6565fd..60f4a95d1cc5b41483815eac66eb2422409bf167 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 FFMPEG_XIPH_H
-#define FFMPEG_XIPH_H
+#ifndef AVCODEC_XIPH_H
+#define AVCODEC_XIPH_H
 
 #include "libavutil/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 /* FFMPEG_XIPH_H */
+#endif /* AVCODEC_XIPH_H */
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h
index 10fd56ffaae6f6d156bbad3558fbf722f0511071..8db435784bec7ffcc4635af61e0967d0b2da05cb 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 FFMPEG_XVMC_RENDER_H
-#define FFMPEG_XVMC_RENDER_H
+#ifndef AVCODEC_XVMC_RENDER_H
+#define AVCODEC_XVMC_RENDER_H
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -72,4 +72,4 @@ typedef   struct{
 
 } xvmc_render_state_t;
 
-#endif /* FFMPEG_XVMC_RENDER_H */
+#endif /* AVCODEC_XVMC_RENDER_H */
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h
index 0291de58897f95ebdfd4fb3b68eee4908cff33e9..7e6d46114619ca011ddcae2e1a7a8ee759d53c70 100644
--- a/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVDEVICE_H
-#define FFMPEG_AVDEVICE_H
+#ifndef AVDEVICE_AVDEVICE_H
+#define AVDEVICE_AVDEVICE_H
 
 #define LIBAVDEVICE_VERSION_MAJOR 52
 #define LIBAVDEVICE_VERSION_MINOR  1
@@ -42,5 +42,5 @@ unsigned avdevice_version(void);
  */
 void avdevice_register_all(void);
 
-#endif /* FFMPEG_AVDEVICE_H */
+#endif /* AVDEVICE_AVDEVICE_H */
 
diff --git a/libavdevice/dv1394.h b/libavdevice/dv1394.h
index 7f3521d6e8e17b9e033eb5c0241866298c281bc0..9a4ee2ae8770bbdebba8c4aec81f28216169e453 100644
--- a/libavdevice/dv1394.h
+++ b/libavdevice/dv1394.h
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DV1394_H
-#define FFMPEG_DV1394_H
+#ifndef AVDEVICE_DV1394_H
+#define AVDEVICE_DV1394_H
 
 #define DV1394_DEFAULT_CHANNEL 63
 #define DV1394_DEFAULT_CARD    0
@@ -353,4 +353,4 @@ struct dv1394_status {
 };
 
 
-#endif /* FFMPEG_DV1394_H */
+#endif /* AVDEVICE_DV1394_H */
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 9267c4be4f7ea066db4bb2c0aea47e3b2915e96d..ff08f71ced0bd9f082ee4a0aaf0fa2dc8c4f1f22 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFILTER_H
-#define FFMPEG_AVFILTER_H
+#ifndef AVFILTER_AVFILTER_H
+#define AVFILTER_AVFILTER_H
 
 #define LIBAVFILTER_VERSION_MAJOR  0
 #define LIBAVFILTER_VERSION_MINOR  1
@@ -628,4 +628,4 @@ static inline void avfilter_insert_outpad(AVFilterContext *f, unsigned index,
                         &f->output_pads, &f->outputs, p);
 }
 
-#endif  /* FFMPEG_AVFILTER_H */
+#endif  /* AVFILTER_AVFILTER_H */
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h
index dbfad4fcc7d6ebdfe891b7d5a971a9ea446522ca..0558de3ac1208b2fb5dd95896ca867c54c3d4380 100644
--- a/libavfilter/avfiltergraph.h
+++ b/libavfilter/avfiltergraph.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFILTERGRAPH_H
-#define FFMPEG_AVFILTERGRAPH_H
+#ifndef AVFILTER_AVFILTERGRAPH_H
+#define AVFILTER_AVFILTERGRAPH_H
 
 #include "avfilter.h"
 
@@ -51,4 +51,4 @@ int avfilter_graph_config_formats(AVFilterGraph *graphctx);
  */
 void avfilter_destroy_graph(AVFilterGraph *graph);
 
-#endif  /* FFMPEG_AVFILTERGRAPH_H */
+#endif  /* AVFILTER_AVFILTERGRAPH_H */
diff --git a/libavfilter/graphparser.h b/libavfilter/graphparser.h
index dcf478bf45367286cd7c9341aeccf78316134130..eddc6b0b1b97c009c5f7eb1513a7c85f956f2aa3 100644
--- a/libavfilter/graphparser.h
+++ b/libavfilter/graphparser.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_GRAPHPARSER_H
-#define FFMPEG_GRAPHPARSER_H
+#ifndef AVFILTER_GRAPHPARSER_H
+#define AVFILTER_GRAPHPARSER_H
 
 #include "avfilter.h"
 #include "avfiltergraph.h"
@@ -48,4 +48,4 @@ int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
                          AVFilterInOut *inputs, AVFilterInOut *outputs,
                          AVClass *log_ctx);
 
-#endif  /* FFMPEG_GRAPHPARSER_H */
+#endif  /* AVFILTER_GRAPHPARSER_H */
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 2486d8a6faeb0a273459a45750e5c93c7ea99860..4ccae1091ad3a7cd6a9ec664e2252f7afb646584 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 FFMPEG_ASF_H
-#define FFMPEG_ASF_H
+#ifndef AVFORMAT_ASF_H
+#define AVFORMAT_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 /* FFMPEG_ASF_H */
+#endif /* AVFORMAT_ASF_H */
diff --git a/libavformat/asfcrypt.h b/libavformat/asfcrypt.h
index dcd9c1da7d1716c12ae74a4ef2d34f4e6a88cd71..8b80d63c5d509da625ecade61f461447354fb0f1 100644
--- a/libavformat/asfcrypt.h
+++ b/libavformat/asfcrypt.h
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ASFCRYPT_H
-#define FFMPEG_ASFCRYPT_H
+#ifndef AVFORMAT_ASFCRYPT_H
+#define AVFORMAT_ASFCRYPT_H
 
 #include <inttypes.h>
 
 void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len);
 
-#endif /* FFMPEG_ASFCRYPT_H */
+#endif /* AVFORMAT_ASFCRYPT_H */
diff --git a/libavformat/avc.h b/libavformat/avc.h
index f8732d6f0f9bce7345ecc5b54372afc6c6438a73..2ea938ca16b127bd4a8075aedb9339a2aa409ec6 100644
--- a/libavformat/avc.h
+++ b/libavformat/avc.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVC_H
-#define FFMPEG_AVC_H
+#ifndef AVFORMAT_AVC_H
+#define AVFORMAT_AVC_H
 
 #include <stdint.h>
 #include "avio.h"
@@ -29,4 +29,4 @@ int ff_avc_parse_nal_units(const uint8_t *buf_in, uint8_t **buf, int *size);
 int ff_isom_write_avcc(ByteIOContext *pb, const uint8_t *data, int len);
 const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end);
 
-#endif /* FFMPEG_AVC_H */
+#endif /* AVFORMAT_AVC_H */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 624266ce642643557347e276c538d095edb74fe2..efe6c2b2ae80e936c9004048cc9b6922f7c9543d 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 FFMPEG_AVFORMAT_H
-#define FFMPEG_AVFORMAT_H
+#ifndef AVFORMAT_AVFORMAT_H
+#define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
 #define LIBAVFORMAT_VERSION_MINOR 21
@@ -1104,4 +1104,4 @@ int match_ext(const char *filename, const char *extensions);
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#endif /* FFMPEG_AVFORMAT_H */
+#endif /* AVFORMAT_AVFORMAT_H */
diff --git a/libavformat/avi.h b/libavformat/avi.h
index 3d3dd549ffdba062ddc7ffd673c45c700d8c5d7a..2214c03b98fdb3257b4d7506fe147f7052dc5948 100644
--- a/libavformat/avi.h
+++ b/libavformat/avi.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVI_H
-#define FFMPEG_AVI_H
+#ifndef AVFORMAT_AVI_H
+#define AVFORMAT_AVI_H
 
 #define AVIF_HASINDEX           0x00000010        // Index at end of file?
 #define AVIF_MUSTUSEINDEX       0x00000020
@@ -34,4 +34,4 @@
 /* index flags */
 #define AVIIF_INDEX             0x10
 
-#endif /* FFMPEG_AVI_H */
+#endif /* AVFORMAT_AVI_H */
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8137cb54dc331ae9790fd3cffda6fc61a30dc4f3..ef53154ff075a59c9ef1e64083e5a09350b85f76 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 FFMPEG_AVIO_H
-#define FFMPEG_AVIO_H
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
 
 #include <stdint.h>
 
@@ -368,4 +368,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 /* FFMPEG_AVIO_H */
+#endif /* AVFORMAT_AVIO_H */
diff --git a/libavformat/dv.h b/libavformat/dv.h
index cfe93533a746466e89893155da5ee1af307792c0..a8c051456b9cd0231bb88ad3183de19f5ad2993b 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 FFMPEG_DV_H
-#define FFMPEG_DV_H
+#ifndef AVFORMAT_DV_H
+#define AVFORMAT_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 /* FFMPEG_DV_H */
+#endif /* AVFORMAT_DV_H */
diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index 1ede49a2857d90790953eaa12804df7ad08eda0b..0ed5c227f3c917a15fa26e6445ecd6e127e0bb0f 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FFM_H
-#define FFMPEG_FFM_H
+#ifndef AVFORMAT_FFM_H
+#define AVFORMAT_FFM_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -55,4 +55,4 @@ typedef struct FFMContext {
     uint8_t packet[FFM_PACKET_SIZE];
 } FFMContext;
 
-#endif /* FFMPEG_FFM_H */
+#endif /* AVFORMAT_FFM_H */
diff --git a/libavformat/flv.h b/libavformat/flv.h
index 938383e83e1c77e3df800e143770d4a9142ffe1c..efa8cebe8ac1b58d8766be9e6052b6bcf015fe17 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 FFMPEG_FLV_H
-#define FFMPEG_FLV_H
+#ifndef AVFORMAT_FLV_H
+#define AVFORMAT_FLV_H
 
 /* offsets for packed values */
 #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
@@ -110,4 +110,4 @@ typedef enum {
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FFMPEG_FLV_H */
+#endif /* AVFORMAT_FLV_H */
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index ce068d78d0e6a6b2ad11552fb123cff865f24775..9dc144b0d45d1f08573868335e4783cc47fe735b 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 FFMPEG_FRAMEHOOK_H
-#define FFMPEG_FRAMEHOOK_H
+#ifndef AVFORMAT_FRAMEHOOK_H
+#define AVFORMAT_FRAMEHOOK_H
 
 #warning VHOOK is deprecated. Please help finishing libavfilter instead of wasting your time writing new filters for this crappy filter system.
 
@@ -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 /* FFMPEG_FRAMEHOOK_H */
+#endif /* AVFORMAT_FRAMEHOOK_H */
diff --git a/libavformat/gxf.h b/libavformat/gxf.h
index ab37cb97fff62c1b859a1245fbc71fc62e7ea739..4212704bb9f162dd8b8db5721e114d862e8c15e3 100644
--- a/libavformat/gxf.h
+++ b/libavformat/gxf.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_GXF_H
-#define FFMPEG_GXF_H
+#ifndef AVFORMAT_GXF_H
+#define AVFORMAT_GXF_H
 
 /* gxf.c */
 typedef enum {
@@ -50,4 +50,4 @@ typedef enum {
     TRACK_FPF       = 0x52,
 } track_tag_t;
 
-#endif /* FFMPEG_GXF_H */
+#endif /* AVFORMAT_GXF_H */
diff --git a/libavformat/internal.h b/libavformat/internal.h
index a380ecefda7acbde199b0db01e33842a95e13862..4397b5326004a0004e51f50aa694d43dc164238e 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFORMAT_UTILS_H
-#define FFMPEG_AVFORMAT_UTILS_H
+#ifndef AVFORMAT_INTERNAL_H
+#define AVFORMAT_INTERNAL_H
 
 char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
 
-#endif /* FFMPEG_AVFORMAT_UTILS_H */
+#endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 7a66ce52400120ad0a62ae8b9e7fe36aff73e800..2fb4dbf2d35c5fb46ecb0eb79a1640a174781fc7 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ISOM_H
-#define FFMPEG_ISOM_H
+#ifndef AVFORMAT_ISOM_H
+#define AVFORMAT_ISOM_H
 
 #include "riff.h"
 
@@ -40,4 +40,4 @@ typedef struct {
     int duration;
 } MOV_stts_t;
 
-#endif /* FFMPEG_ISOM_H */
+#endif /* AVFORMAT_ISOM_H */
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 2e6aae20772d71950eefdda1332abf809c7a9f6b..e93447d144e3a131ece1876fabb273eb5054ee40 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 FFMPEG_MATROSKA_H
-#define FFMPEG_MATROSKA_H
+#ifndef AVFORMAT_MATROSKA_H
+#define AVFORMAT_MATROSKA_H
 
 #include "libavcodec/avcodec.h"
 
@@ -231,4 +231,4 @@ typedef struct CodecMime{
 extern const CodecTags ff_mkv_codec_tags[];
 extern const CodecMime ff_mkv_mime_tags[];
 
-#endif /* FFMPEG_MATROSKA_H */
+#endif /* AVFORMAT_MATROSKA_H */
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index c1675ee4428440f1ea16311bdca93971b034354a..ff146bba14c1b9cbde69df7fb0298d899343ee8b 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 FFMPEG_MPEG_H
-#define FFMPEG_MPEG_H
+#ifndef AVFORMAT_MPEG_H
+#define AVFORMAT_MPEG_H
 
 #include <stdint.h>
 #include "libavutil/intreadwrite.h"
@@ -69,4 +69,4 @@ static inline int64_t ff_parse_pes_pts(uint8_t *buf) {
              AV_RB16(buf+3) >> 1;
 }
 
-#endif /* FFMPEG_MPEG_H */
+#endif /* AVFORMAT_MPEG_H */
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 92cc491c83cbe9725bb1f51d1509fde60dc0911a..896836d7a1e4799273de1b42b241fa5ad5469e78 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 FFMPEG_MPEGTS_H
-#define FFMPEG_MPEGTS_H
+#ifndef AVFORMAT_MPEGTS_H
+#define AVFORMAT_MPEGTS_H
 
 #include "avformat.h"
 
@@ -67,4 +67,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif /* FFMPEG_MPEGTS_H */
+#endif /* AVFORMAT_MPEGTS_H */
diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 11b1821aec967a748a53e563f202c9ee8f9b5e0d..f4033de3dd0d93bc2e095deafed0221738e0b69e 100644
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -18,8 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_MXF_H
-#define FFMPEG_MXF_H
+#ifndef AVFORMAT_MXF_H
+#define AVFORMAT_MXF_H
 
 #include "avformat.h"
 #include "libavcodec/bytestream.h"
@@ -71,4 +71,4 @@ extern const MXFCodecUL ff_mxf_codec_uls[];
 #define PRINT_KEY(pc, s, x)
 #endif
 
-#endif /* FFMPEG_MXF_H */
+#endif /* AVFORMAT_MXF_H */
diff --git a/libavformat/network.h b/libavformat/network.h
index d897722c940678525835319ecf85ffdace197fae..a5904d93af552b8c09b584505a793ddd3754e7a5 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 FFMPEG_NETWORK_H
-#define FFMPEG_NETWORK_H
+#ifndef AVFORMAT_NETWORK_H
+#define AVFORMAT_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 /* FFMPEG_NETWORK_H */
+#endif /* AVFORMAT_NETWORK_H */
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 6acebc34b7402531c91c7f1bc5cc033b0350dc05..713d27dd3ba9bad23751d0ed7f09c5146a3bf98d 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 FFMPEG_NUT_H
-#define FFMPEG_NUT_H
+#ifndef AVFORMAT_NUT_H
+#define AVFORMAT_NUT_H
 
 //#include <limits.h>
 //#include "libavutil/adler32.h"
@@ -112,4 +112,4 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 
 extern const Dispositions ff_nut_dispositions[];
 
-#endif /* FFMPEG_NUT_H */
+#endif /* AVFORMAT_NUT_H */
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 997acdd4be55777f54f8a7bf5c19b7333bf75588..93ae444a6bd91db0f1654ed749b3905bab7661d3 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 **/
 
-#ifndef FFMPEG_OGGDEC_H
-#define FFMPEG_OGGDEC_H
+#ifndef AVFORMAT_OGGDEC_H
+#define AVFORMAT_OGGDEC_H
 
 #include "avformat.h"
 
@@ -87,4 +87,4 @@ extern const ogg_codec_t ff_vorbis_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* FFMPEG_OGGDEC_H */
+#endif /* AVFORMAT_OGGDEC_H */
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 34970e39520c8707ef322dac085b4bb7f7a07969..2b89fb58e22c88bbaa52ef26aec36adb514ffdb8 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 FFMPEG_OS_SUPPORT_H
-#define FFMPEG_OS_SUPPORT_H
+#ifndef AVFORMAT_OS_SUPPORT_H
+#define AVFORMAT_OS_SUPPORT_H
 
 /**
  * @file os_support.h
@@ -92,4 +92,4 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* CONFIG_FFSERVER */
 #endif /* CONFIG_NETWORK */
 
-#endif /* FFMPEG_OS_SUPPORT_H */
+#endif /* AVFORMAT_OS_SUPPORT_H */
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 0c6c44f47e06675154a99f727101e24767c9e66e..52c19079e8b3b2f7af65e3f5f550cbaa8654ecd1 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 FFMPEG_QTPALETTE_H
-#define FFMPEG_QTPALETTE_H
+#ifndef AVFORMAT_QTPALETTE_H
+#define AVFORMAT_QTPALETTE_H
 
 #include <inttypes.h>
 
@@ -310,4 +310,4 @@ static const uint8_t ff_qt_default_palette_256[256 * 4] = {
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif /* FFMPEG_QTPALETTE_H */
+#endif /* AVFORMAT_QTPALETTE_H */
diff --git a/libavformat/raw.h b/libavformat/raw.h
index 3d851c829b740797505a540cb6470acde23132cd..ce3e45c93275a338186665421f7ecfa9e0de4699 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 FFMPEG_RAW_H
-#define FFMPEG_RAW_H
+#ifndef AVFORMAT_RAW_H
+#define AVFORMAT_RAW_H
 
 #include "avformat.h"
 
 int pcm_read_seek(AVFormatContext *s,
                   int stream_index, int64_t timestamp, int flags);
 
-#endif /* FFMPEG_RAW_H */
+#endif /* AVFORMAT_RAW_H */
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 9d36715888a89a992397ebe862cb87d3a808bfaa..5fdb370d717fa4a45e639b2c52e3a3a21836f93d 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -25,8 +25,8 @@
  * do NOT include this in end user applications
  */
 
-#ifndef FFMPEG_RIFF_H
-#define FFMPEG_RIFF_H
+#ifndef AVFORMAT_RIFF_H
+#define AVFORMAT_RIFF_H
 
 #include "libavcodec/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 /* FFMPEG_RIFF_H */
+#endif /* AVFORMAT_RIFF_H */
diff --git a/libavformat/rm.h b/libavformat/rm.h
index 2f7f8df2eeb96dcf84caf39e9567b83acb7a42db..802af747753cfdb90359caa7a492f74be7d06c88 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 FFMPEG_RM_H
-#define FFMPEG_RM_H
+#ifndef AVFORMAT_RM_H
+#define AVFORMAT_RM_H
 
 #include "avformat.h"
 
@@ -105,4 +105,4 @@ int ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len,
  */
 void ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt);
 
-#endif /* FFMPEG_RM_H */
+#endif /* AVFORMAT_RM_H */
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 36affed42041f98aaf8f5578ecb4bbc815567527..0eb95653cbacdbd3a4af33abd1173ad30202996d 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 FFMPEG_RTP_H
-#define FFMPEG_RTP_H
+#ifndef AVFORMAT_RTP_H
+#define AVFORMAT_RTP_H
 
 #include "libavcodec/avcodec.h"
 #include "avformat.h"
@@ -110,4 +110,4 @@ typedef enum {
 } rtcp_sdes_type_t;
 #endif
 
-#endif /* FFMPEG_RTP_H */
+#endif /* AVFORMAT_RTP_H */
diff --git a/libavformat/rtp_aac.h b/libavformat/rtp_aac.h
index 24b41cc425513a022a520f2a135528b59ad68c00..df83d42427c708bc8495f55d36e9677c1c3ddfa8 100644
--- a/libavformat/rtp_aac.h
+++ b/libavformat/rtp_aac.h
@@ -17,11 +17,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 FFMPEG_RTP_AAC_H
-#define FFMPEG_RTP_AAC_H
+#ifndef AVFORMAT_RTP_AAC_H
+#define AVFORMAT_RTP_AAC_H
 
 #include "avformat.h"
 
 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
 
-#endif /* FFMPEG_RTP_AAC_H */
+#endif /* AVFORMAT_RTP_AAC_H */
diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h
index 0f23e525cc3a359b1ea628e078c76e293fd03019..07c4b5ef4bb3261d500dcdfb11f390103d5ed4cc 100644
--- a/libavformat/rtp_h264.h
+++ b/libavformat/rtp_h264.h
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RTP_H264_H
-#define FFMPEG_RTP_H264_H
+#ifndef AVFORMAT_RTP_H264_H
+#define AVFORMAT_RTP_H264_H
 
 #include "rtp_internal.h"
 
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
 
-#endif /* FFMPEG_RTP_H264_H */
+#endif /* AVFORMAT_RTP_H264_H */
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index c34212dc16c7dda6804017ca8f181d15504bca7f..dbf192c568d49d4a70d2413891cd2677881e62bb 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 FFMPEG_RTP_INTERNAL_H
-#define FFMPEG_RTP_INTERNAL_H
+#ifndef AVFORMAT_RTP_INTERNAL_H
+#define AVFORMAT_RTP_INTERNAL_H
 
 #include <stdint.h>
 #include "libavcodec/avcodec.h"
@@ -127,5 +127,5 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
 
 void av_register_rtp_dynamic_payload_handlers(void);
 
-#endif /* FFMPEG_RTP_INTERNAL_H */
+#endif /* AVFORMAT_RTP_INTERNAL_H */
 
diff --git a/libavformat/rtp_mpv.h b/libavformat/rtp_mpv.h
index 36e649a8916e9d49df10c88ea17b771d3c8cac88..378765a54683acae8c9bb1a2908010f0e1725d82 100644
--- a/libavformat/rtp_mpv.h
+++ b/libavformat/rtp_mpv.h
@@ -17,11 +17,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 FFMPEG_RTP_MPV_H
-#define FFMPEG_RTP_MPV_H
+#ifndef AVFORMAT_RTP_MPV_H
+#define AVFORMAT_RTP_MPV_H
 
 #include "avformat.h"
 
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
 
-#endif /* FFMPEG_RTP_MPV_H */
+#endif /* AVFORMAT_RTP_MPV_H */
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index 1923acbbc80181802bd119379932ff0170272f85..537d4bf333e35c875574d22e5d524bada6d462e0 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 FFMPEG_RTSP_H
-#define FFMPEG_RTSP_H
+#ifndef AVFORMAT_RTSP_H
+#define AVFORMAT_RTSP_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -95,4 +95,4 @@ extern int rtsp_rtp_port_max;
 int rtsp_pause(AVFormatContext *s);
 int rtsp_resume(AVFormatContext *s);
 
-#endif /* FFMPEG_RTSP_H */
+#endif /* AVFORMAT_RTSP_H */
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h
index d4ad25b76f7e6eb13bd2a8a675fbf7fab81bc913..9ee96bfcd0a8c5fac997ffb7eccf9684e2b1ed16 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 FFMPEG_RTSPCODES_H
-#define FFMPEG_RTSPCODES_H
+#ifndef AVFORMAT_RTSPCODES_H
+#define AVFORMAT_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 /* FFMPEG_RTSPCODES_H */
+#endif /* AVFORMAT_RTSPCODES_H */
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 4ae2b90ef3901b630820d6e1e8ebc3eee6cf4d38..a138987ca43865f1c037d4340fc2c51772ebd393 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_SWF_H
-#define FFMPEG_SWF_H
+#ifndef AVFORMAT_SWF_H
+#define AVFORMAT_SWF_H
 
 #include "libavutil/fifo.h"
 #include "avformat.h"
@@ -94,4 +94,4 @@ static const AVCodecTag swf_audio_codec_tags[] = {
     {0, 0},
 };
 
-#endif /* FFMPEG_SWF_H */
+#endif /* AVFORMAT_SWF_H */
diff --git a/libavformat/voc.h b/libavformat/voc.h
index 5f6998a0340f9f0a71081d62221e6d2c567144b3..0e8aa61af3a20cb4f0124e6cdfcd273008a208e6 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 FFMPEG_VOC_H
-#define FFMPEG_VOC_H
+#ifndef AVFORMAT_VOC_H
+#define AVFORMAT_VOC_H
 
 #include "avformat.h"
 #include "riff.h"    /* for CodecTag */
@@ -48,4 +48,4 @@ extern const AVCodecTag ff_voc_codec_tags[];
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif /* FFMPEG_VOC_H */
+#endif /* AVFORMAT_VOC_H */
diff --git a/libavutil/adler32.h b/libavutil/adler32.h
index 488669daa98502b77a719354ef6b3942a1905778..34f2b53e7dab0d7acb9281d757014fad56b6a7ad 100644
--- a/libavutil/adler32.h
+++ b/libavutil/adler32.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ADLER32_H
-#define FFMPEG_ADLER32_H
+#ifndef AVUTIL_ADLER32_H
+#define AVUTIL_ADLER32_H
 
 #include <stdint.h>
 #include "common.h"
@@ -27,4 +27,4 @@
 unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
                                 unsigned int len) av_pure;
 
-#endif /* FFMPEG_ADLER32_H */
+#endif /* AVUTIL_ADLER32_H */
diff --git a/libavutil/aes.h b/libavutil/aes.h
index 25efdf4d64152b2da1347570bcc056ae75bf42f0..c7a4aa033537e66b84da20d45a77f64f64251798 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 FFMPEG_AES_H
-#define FFMPEG_AES_H
+#ifndef AVUTIL_AES_H
+#define AVUTIL_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 /* FFMPEG_AES_H */
+#endif /* AVUTIL_AES_H */
diff --git a/libavutil/avstring.h b/libavutil/avstring.h
index ecac9e6230252c76ca84a2380c0b8fc73ef11c7c..954174555c015ab33e51b1bd4d812a83ccaa9f84 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 FFMPEG_AVSTRING_H
-#define FFMPEG_AVSTRING_H
+#ifndef AVUTIL_AVSTRING_H
+#define AVUTIL_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 /* FFMPEG_AVSTRING_H */
+#endif /* AVUTIL_AVSTRING_H */
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index cefc710de87de49bf715103723e5e9775172d59e..62b50550c4e9c839c1ec13b8899c0034ff9d70b1 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 FFMPEG_AVUTIL_H
-#define FFMPEG_AVUTIL_H
+#ifndef AVUTIL_AVUTIL_H
+#define AVUTIL_AVUTIL_H
 
 /**
  * @file avutil.h
@@ -144,4 +144,4 @@ enum PixelFormat {
 #define PIX_FMT_YUV422  PIX_FMT_YUYV422
 #endif
 
-#endif /* FFMPEG_AVUTIL_H */
+#endif /* AVUTIL_AVUTIL_H */
diff --git a/libavutil/base64.h b/libavutil/base64.h
index e95e4ea3e30579c7297355c3e49857a37614707c..91df541d59c8d4b2810ecfd8828549d5e06e9311 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 FFMPEG_BASE64_H
-#define FFMPEG_BASE64_H
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_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, const uint8_t * src, int len);
 
-#endif /* FFMPEG_BASE64_H */
+#endif /* AVUTIL_BASE64_H */
diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 2f1e768abea2c85b663771c84119e8f8f77ae311..86a2492a20194504952c1e0f5a1257fe78b270f6 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -23,8 +23,8 @@
  * byte swapping routines
  */
 
-#ifndef FFMPEG_BSWAP_H
-#define FFMPEG_BSWAP_H
+#ifndef AVUTIL_BSWAP_H
+#define AVUTIL_BSWAP_H
 
 #include <stdint.h>
 #include "config.h"
@@ -129,4 +129,4 @@ static inline uint64_t av_const bswap_64(uint64_t x)
 #define le2me_64(x) (x)
 #endif
 
-#endif /* FFMPEG_BSWAP_H */
+#endif /* AVUTIL_BSWAP_H */
diff --git a/libavutil/common.h b/libavutil/common.h
index 696b03e78b80d6d75ab840455a43d67441851e6f..42fe9515d51ce0ce768f932ebeab75a49ea7b5ac 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -23,8 +23,8 @@
  * common internal and external API header
  */
 
-#ifndef FFMPEG_COMMON_H
-#define FFMPEG_COMMON_H
+#ifndef AVUTIL_COMMON_H
+#define AVUTIL_COMMON_H
 
 #include <inttypes.h>
 
@@ -412,4 +412,4 @@ tend= AV_READ_TIME();\
 #   define NULL_IF_CONFIG_SMALL(x) x
 #endif
 
-#endif /* FFMPEG_COMMON_H */
+#endif /* AVUTIL_COMMON_H */
diff --git a/libavutil/crc.h b/libavutil/crc.h
index 5ebb2f54694dd6f9c6083b91026df277894d83f1..e07e65a5dcfeeb546be94051f51d32e5235ad352 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 FFMPEG_CRC_H
-#define FFMPEG_CRC_H
+#ifndef AVUTIL_CRC_H
+#define AVUTIL_CRC_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -40,5 +40,5 @@ int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
 const AVCRC *av_crc_get_table(AVCRCId crc_id);
 uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
 
-#endif /* FFMPEG_CRC_H */
+#endif /* AVUTIL_CRC_H */
 
diff --git a/libavutil/crc_data.h b/libavutil/crc_data.h
index 857678dd6fdb79a5cdae316de10797622ec023aa..afa25e7cfcf217f0aceb0b885996e498ae67350a 100644
--- a/libavutil/crc_data.h
+++ b/libavutil/crc_data.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_CRC_DATA_H
-#define FFMPEG_CRC_DATA_H
+#ifndef AVUTIL_CRC_DATA_H
+#define AVUTIL_CRC_DATA_H
 
 #include "crc.h"
 
@@ -210,4 +210,4 @@ static const AVCRC av_crc_table[AV_CRC_MAX][257] = {
     },
 };
 
-#endif /* FFMPEG_CRC_DATA_H */
+#endif /* AVUTIL_CRC_DATA_H */
diff --git a/libavutil/des.h b/libavutil/des.h
index 40d8aa18ef6497db989b31c30a712e28b79f05be..88240594ee40d041dea08ef7306a5a9abe77528c 100644
--- a/libavutil/des.h
+++ b/libavutil/des.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DES_H
-#define FFMPEG_DES_H
+#ifndef AVUTIL_DES_H
+#define AVUTIL_DES_H
 
 #include <stdint.h>
 #include "common.h"
@@ -37,4 +37,4 @@
  */
 uint64_t ff_des_encdec(uint64_t in, uint64_t key, int decrypt) av_const;
 
-#endif /* FFMPEG_DES_H */
+#endif /* AVUTIL_DES_H */
diff --git a/libavutil/fifo.h b/libavutil/fifo.h
index f35ccc348a8fbe4f96f4e46f0714aac85b9fd6b3..37338ca673a1e0412093726d5421aa405fce0985 100644
--- a/libavutil/fifo.h
+++ b/libavutil/fifo.h
@@ -21,8 +21,8 @@
  * A very simple circular buffer FIFO implementation.
  */
 
-#ifndef FFMPEG_FIFO_H
-#define FFMPEG_FIFO_H
+#ifndef AVUTIL_FIFO_H
+#define AVUTIL_FIFO_H
 
 #include <stdint.h>
 #include "common.h"
@@ -125,4 +125,4 @@ static inline uint8_t av_fifo_peek(AVFifoBuffer *f, int offs)
         ptr -= f->end - f->buffer;
     return *ptr;
 }
-#endif /* FFMPEG_FIFO_H */
+#endif /* AVUTIL_FIFO_H */
diff --git a/libavutil/integer.h b/libavutil/integer.h
index b38d5caa3213a9080b80f8e0c1a04bed7845e673..6c5c274141b0442d8b36b59e95369d9dd119d4fa 100644
--- a/libavutil/integer.h
+++ b/libavutil/integer.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_INTEGER_H
-#define FFMPEG_INTEGER_H
+#ifndef AVUTIL_INTEGER_H
+#define AVUTIL_INTEGER_H
 
 #include <stdint.h>
 #include "common.h"
@@ -81,4 +81,4 @@ AVInteger av_int2i(int64_t a) av_const;
  */
 int64_t av_i2int(AVInteger a) av_const;
 
-#endif /* FFMPEG_INTEGER_H */
+#endif /* AVUTIL_INTEGER_H */
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 798c55b87aa0ad45dfb755bc0d3af762a53410b9..7d55ac658da685480f94c06b0653b2b55076cd90 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -23,8 +23,8 @@
  * common internal api header.
  */
 
-#ifndef FFMPEG_INTERNAL_H
-#define FFMPEG_INTERNAL_H
+#ifndef AVUTIL_INTERNAL_H
+#define AVUTIL_INTERNAL_H
 
 #if !defined(DEBUG) && !defined(NDEBUG)
 #    define NDEBUG
@@ -297,4 +297,4 @@ static av_always_inline av_const float roundf(float x)
 }
 #endif /* HAVE_ROUNDF */
 
-#endif /* FFMPEG_INTERNAL_H */
+#endif /* AVUTIL_INTERNAL_H */
diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h
index 4b3f9b7bcf68e2bc2d72ddabf823669122f377ce..e2d5d5be0eaad13946e9cd15c57fd38f3893234a 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 FFMPEG_INTFLOAT_READWRITE_H
-#define FFMPEG_INTFLOAT_READWRITE_H
+#ifndef AVUTIL_INTFLOAT_READWRITE_H
+#define AVUTIL_INTFLOAT_READWRITE_H
 
 #include <stdint.h>
 #include "common.h"
@@ -37,4 +37,4 @@ int64_t av_dbl2int(double d) av_const;
 int32_t av_flt2int(float d) av_const;
 AVExtFloat av_dbl2ext(double d) av_const;
 
-#endif /* FFMPEG_INTFLOAT_READWRITE_H */
+#endif /* AVUTIL_INTFLOAT_READWRITE_H */
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index 72ad5b3af3daaf7f2e2ef4e6af63ebc7c0115c1b..535fdd2dfea50838ad2cacd6c8b193e650e92258 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 FFMPEG_INTREADWRITE_H
-#define FFMPEG_INTREADWRITE_H
+#ifndef AVUTIL_INTREADWRITE_H
+#define AVUTIL_INTREADWRITE_H
 
 #include <stdint.h>
 #include "config.h"
@@ -189,4 +189,4 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
                     ((uint8_t*)(p))[1] = (d)>>8; \
                     ((uint8_t*)(p))[2] = (d)>>16; } while(0)
 
-#endif /* FFMPEG_INTREADWRITE_H */
+#endif /* AVUTIL_INTREADWRITE_H */
diff --git a/libavutil/lfg.h b/libavutil/lfg.h
index 36f94e64b10038a1ae4cda470b82a85e469f5f13..f75491e3538d25800fd245d5e4e1492dec53f4b5 100644
--- a/libavutil/lfg.h
+++ b/libavutil/lfg.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_LFG_H
-#define FFMPEG_LFG_H
+#ifndef AVUTIL_LFG_H
+#define AVUTIL_LFG_H
 
 typedef struct {
     unsigned int state[64];
@@ -51,4 +51,4 @@ static inline unsigned int av_mlfg_get(AVLFG *c){
     return c->state[c->index++ & 63] = 2*a*b+a+b;
 }
 
-#endif //FFMPEG_LFG_H
+#endif /* AVUTIL_LFG_H */
diff --git a/libavutil/lls.h b/libavutil/lls.h
index 90b2332aa96a1e1b450b1c02cdf4a058ed728e4b..d168e5974926d98225e9946bbb31d4a55cf48763 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 FFMPEG_LLS_H
-#define FFMPEG_LLS_H
+#ifndef AVUTIL_LLS_H
+#define AVUTIL_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 /* FFMPEG_LLS_H */
+#endif /* AVUTIL_LLS_H */
diff --git a/libavutil/log.h b/libavutil/log.h
index e0ff1f6fff5ddd570ded6c687535b2610efc8eaa..152e773c2ca015caf78d07b1c53cf859bf0ca739 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 FFMPEG_LOG_H
-#define FFMPEG_LOG_H
+#ifndef AVUTIL_LOG_H
+#define AVUTIL_LOG_H
 
 #include <stdarg.h>
 
@@ -126,4 +126,4 @@ void av_log_set_level(int);
 void av_log_set_callback(void (*)(void*, int, const char*, va_list));
 void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
 
-#endif /* FFMPEG_LOG_H */
+#endif /* AVUTIL_LOG_H */
diff --git a/libavutil/lzo.h b/libavutil/lzo.h
index 183f9595ac80ef4662aa3e727f947be797139b46..2f09f9f2172ff0959a161b886d9b3e18ec0ef7d9 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 FFMPEG_LZO_H
-#define FFMPEG_LZO_H
+#ifndef AVUTIL_LZO_H
+#define AVUTIL_LZO_H
 
 #include <stdint.h>
 
@@ -36,4 +36,4 @@ int lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
 
 void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
 
-#endif /* FFMPEG_LZO_H */
+#endif /* AVUTIL_LZO_H */
diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
index 79d3f76ab6eea6ce2a487cb48551bcdd9a54e1d5..74385274b30a93432d9f6320cf21e05d35a38097 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 FFMPEG_MATHEMATICS_H
-#define FFMPEG_MATHEMATICS_H
+#ifndef AVUTIL_MATHEMATICS_H
+#define AVUTIL_MATHEMATICS_H
 
 #include <stdint.h>
 #include <math.h>
@@ -66,4 +66,4 @@ int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_cons
  */
 int64_t av_rescale_q(int64_t a, AVRational bq, AVRational cq) av_const;
 
-#endif /* FFMPEG_MATHEMATICS_H */
+#endif /* AVUTIL_MATHEMATICS_H */
diff --git a/libavutil/md5.h b/libavutil/md5.h
index 7d63df01b3eceb3ab70b7b8ed9c44dcbc22b3b9d..969202a807a64da28f748cedf06845247c57e8d4 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 FFMPEG_MD5_H
-#define FFMPEG_MD5_H
+#ifndef AVUTIL_MD5_H
+#define AVUTIL_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 /* FFMPEG_MD5_H */
+#endif /* AVUTIL_MD5_H */
 
diff --git a/libavutil/mem.h b/libavutil/mem.h
index 84d647d8ead861962c1b9751f75b188f85fc5350..149889b5faae8bc5834366ccd722a819c2046ed0 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -23,8 +23,8 @@
  * Memory handling functions.
  */
 
-#ifndef FFMPEG_MEM_H
-#define FFMPEG_MEM_H
+#ifndef AVUTIL_MEM_H
+#define AVUTIL_MEM_H
 
 #ifdef __ICC
     #define DECLARE_ALIGNED(n,t,v)      t v __attribute__ ((aligned (n)))
@@ -116,4 +116,4 @@ char *av_strdup(const char *s) av_malloc_attrib;
  */
 void av_freep(void *ptr);
 
-#endif /* FFMPEG_MEM_H */
+#endif /* AVUTIL_MEM_H */
diff --git a/libavutil/pca.h b/libavutil/pca.h
index c1a3d640f500ee0fc8fa3461376d45741f6a2a8e..651e90278030c64b906ce44b4ab338d9c206ad77 100644
--- a/libavutil/pca.h
+++ b/libavutil/pca.h
@@ -24,12 +24,12 @@
  * Principal component analysis
  */
 
-#ifndef FFMPEG_PCA_H
-#define FFMPEG_PCA_H
+#ifndef AVUTIL_PCA_H
+#define AVUTIL_PCA_H
 
 struct PCA *ff_pca_init(int n);
 void ff_pca_free(struct PCA *pca);
 void ff_pca_add(struct PCA *pca, double *v);
 int ff_pca(struct PCA *pca, double *eigenvector, double *eigenvalue);
 
-#endif /* FFMPEG_PCA_H */
+#endif /* AVUTIL_PCA_H */
diff --git a/libavutil/random.h b/libavutil/random.h
index 86e4f64e67baeae5327ef9a61d65946d0ebf3327..f243676e7c00aa366cacd583585887ca7aaf9838 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 FFMPEG_RANDOM_H
-#define FFMPEG_RANDOM_H
+#ifndef AVUTIL_RANDOM_H
+#define AVUTIL_RANDOM_H
 
 #define AV_RANDOM_N 624
 
@@ -70,4 +70,4 @@ static inline double av_random_real1(AVRandomState *state)
     return av_random(state) * (1.0 / 4294967296.0);
 }
 
-#endif /* FFMPEG_RANDOM_H */
+#endif /* AVUTIL_RANDOM_H */
diff --git a/libavutil/rational.h b/libavutil/rational.h
index 2f0017c868d913930e6a99f5c0cef79326f63d78..5957eee859e30471c0ce70c20ce5289f408fa82c 100644
--- a/libavutil/rational.h
+++ b/libavutil/rational.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_RATIONAL_H
-#define FFMPEG_RATIONAL_H
+#ifndef AVUTIL_RATIONAL_H
+#define AVUTIL_RATIONAL_H
 
 #include <stdint.h>
 #include "common.h"
@@ -113,4 +113,4 @@ AVRational av_sub_q(AVRational b, AVRational c) av_const;
  */
 AVRational av_d2q(double d, int max) av_const;
 
-#endif /* FFMPEG_RATIONAL_H */
+#endif /* AVUTIL_RATIONAL_H */
diff --git a/libavutil/rc4.h b/libavutil/rc4.h
index 882fa23b8aaaa1c7dc77b6a4eb2d4baef7ba80fb..a39dea9cf3dedd9d05860fadae9fc733e000b48d 100644
--- a/libavutil/rc4.h
+++ b/libavutil/rc4.h
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RC4_H
-#define FFMPEG_RC4_H
+#ifndef AVUTIL_RC4_H
+#define AVUTIL_RC4_H
 
 #include <stdint.h>
 
 void ff_rc4_enc(const uint8_t *key, int keylen, uint8_t *data, int datalen);
 
-#endif /* FFMPEG_RC4_H */
+#endif /* AVUTIL_RC4_H */
diff --git a/libavutil/sha1.h b/libavutil/sha1.h
index fc5bf0825166c00218143aa5bb9ce604f29c5900..0f14ca8960ae49d8f216b12b3b3128c659e831e8 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 FFMPEG_SHA1_H
-#define FFMPEG_SHA1_H
+#ifndef AVUTIL_SHA1_H
+#define AVUTIL_SHA1_H
 
 #include <stdint.h>
 
@@ -31,4 +31,4 @@ void av_sha1_init(struct AVSHA1* context);
 void av_sha1_update(struct AVSHA1* context, const uint8_t* data, unsigned int len);
 void av_sha1_final(struct AVSHA1* context, uint8_t digest[20]);
 
-#endif /* FFMPEG_SHA1_H */
+#endif /* AVUTIL_SHA1_H */
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 283cc6e69a026957a942f07d386d023d4e90b88f..e0bf1e75e33ad626d411ec51cdf8ccccf6aea36e 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 FFMPEG_SOFTFLOAT_H
-#define FFMPEG_SOFTFLOAT_H
+#ifndef AVUTIL_SOFTFLOAT_H
+#define AVUTIL_SOFTFLOAT_H
 
 #include <stdint.h>
 #include "common.h"
@@ -126,4 +126,4 @@ static inline av_const int av_sf2int(SoftFloat v, int frac_bits){
     else           return v.mant >>(-v.exp);
 }
 
-#endif /* FFMPEG_SOFTFLOAT_H */
+#endif /* AVUTIL_SOFTFLOAT_H */
diff --git a/libavutil/tree.h b/libavutil/tree.h
index 111ea81a047c1c6f37d8f492bfcd66d56b808d5c..c457234b09c4a249e297a28153897acf58b02725 100644
--- a/libavutil/tree.h
+++ b/libavutil/tree.h
@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_TREE_H
-#define FFMPEG_TREE_H
+#ifndef AVUTIL_TREE_H
+#define AVUTIL_TREE_H
 
 struct AVTreeNode;
 extern const int av_tree_node_size;
@@ -79,4 +79,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), struct AVTreeNode **next);
 void av_tree_destroy(struct AVTreeNode *t);
 
-#endif /* FFMPEG_TREE_H */
+#endif /* AVUTIL_TREE_H */
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index a60b0b56a80af08a82d47aaefdd81597f0217f7a..fb0c85784e36984dadb2a734e90cc82483ede51e 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 FFMPEG_X86CPU_H
-#define FFMPEG_X86CPU_H
+#ifndef AVUTIL_X86_CPU_H
+#define AVUTIL_X86_CPU_H
 
 #include <stdint.h>
 #include "config.h"
@@ -76,4 +76,4 @@ typedef int32_t x86_reg;
 #    define BROKEN_RELOCATIONS 1
 #endif
 
-#endif /* FFMPEG_X86CPU_H */
+#endif /* AVUTIL_X86_CPU_H */
diff --git a/libpostproc/postprocess.h b/libpostproc/postprocess.h
index 38baeecd6867f80801ac0b1c8f04088abc39ba8a..f4a83f0050c0f6bf020e6678233b0f7ad9e72468 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 FFMPEG_POSTPROCESS_H
-#define FFMPEG_POSTPROCESS_H
+#ifndef POSTPROCESS_POSTPROCESS_H
+#define POSTPROCESS_POSTPROCESS_H
 
 /**
  * @file postprocess.h
@@ -89,4 +89,4 @@ void pp_free_context(pp_context_t *ppContext);
 
 #define PP_PICT_TYPE_QP2  0x00000010 ///< MPEG2 style QScale
 
-#endif /* FFMPEG_POSTPROCESS_H */
+#endif /* POSTPROCESS_POSTPROCESS_H */
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index d3d2d6515e7986a43d0d9902d0a8540ebd664a12..6db07560c1ffde5d25830e36f79e6fa615c85918 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -23,8 +23,8 @@
  * internal api header.
  */
 
-#ifndef FFMPEG_POSTPROCESS_INTERNAL_H
-#define FFMPEG_POSTPROCESS_INTERNAL_H
+#ifndef POSTPROCESS_POSTPROCESS_INTERNAL_H
+#define POSTPROCESS_POSTPROCESS_INTERNAL_H
 
 #include "libavutil/avutil.h"
 #include "postprocess.h"
@@ -174,4 +174,4 @@ static inline void linecpy(void *dest, const void *src, int lines, int stride) {
     }
 }
 
-#endif /* FFMPEG_POSTPROCESS_INTERNAL_H */
+#endif /* POSTPROCESS_POSTPROCESS_INTERNAL_H */