diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index 7ddd0ec6e3..6d5402a568 100644
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ARM_MATHOPS_H
+#define AVCODEC_ARM_MATHOPS_H
+
 #ifdef FRAC_BITS
 #   define MULL(a, b) \
         ({  int lo, hi;\
@@ -47,3 +50,5 @@
          __rt; })
 
 #endif
+
+#endif
diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h
index 8c12103993..5229f2f615 100644
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@@ -25,6 +25,9 @@
  * Atrac 3 AKA RealAudio 8 compatible decoder data
  */
 
+#ifndef AVCODEC_ATRAC3DATA_H
+#define AVCODEC_ATRAC3DATA_H
+
 #include <stdint.h>
 
 /* VLC tables */
@@ -133,3 +136,5 @@ 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
diff --git a/libavcodec/bethsoftvideo.h b/libavcodec/bethsoftvideo.h
index 6c62ac1b86..038e9c5e4d 100644
--- a/libavcodec/bethsoftvideo.h
+++ b/libavcodec/bethsoftvideo.h
@@ -1,3 +1,6 @@
+#ifndef AVCODEC_BETHSOFTVIDEO_H
+#define AVCODEC_BETHSOFTVIDEO_H
+
 enum BethsoftVidBlockType
 {
     PALETTE_BLOCK       = 0x02,
@@ -8,3 +11,5 @@ enum BethsoftVidBlockType
     VIDEO_YOFF_P_FRAME  = 0x04,
     EOF_BLOCK           = 0x14,
 };
+
+#endif
diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h
index 2f0440aba6..702ad0b893 100644
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_BMP_H
+#define AVCODEC_BMP_H
+
 #include "avcodec.h"
 
 typedef struct BMPContext {
@@ -31,3 +34,5 @@ typedef enum {
     BMP_RLE4        =2,
     BMP_BITFIELDS   =3,
 } BiCompression;
+
+#endif
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h
index 12bbfeede2..c9d41465ec 100644
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef AVCODEC_CAVSDATA_H
+#define AVCODEC_CAVSDATA_H
+
 #include "cavs.h"
 
 static const uint8_t partition_flags[30] = {
@@ -514,3 +517,5 @@ static const int_fast8_t left_modifier_l[8] = { 0,-1, 6,-1,-1, 7, 6, 7};
 static const int_fast8_t top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 static const int_fast8_t left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 static const int_fast8_t top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
+
+#endif
diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h
index c376ec8ef5..1c22e8a1c0 100644
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@@ -26,6 +26,9 @@
  * Cook AKA RealAudio G2 compatible decoderdata
  */
 
+#ifndef AVCODEC_COOKDATA_H
+#define AVCODEC_COOKDATA_H
+
 #include <stdint.h>
 
 /* various data tables */
@@ -559,3 +562,5 @@ static const float cplscale6[63] = {
 static const float* cplscales[5] = {
     cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };
+
+#endif
diff --git a/libavcodec/dca.h b/libavcodec/dca.h
index 5e9b8a9cf0..f4da56a8e6 100644
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@@ -22,8 +22,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DCA_H
+#define AVCODEC_DCA_H
+
 /** DCA syncwords, also used for bitstream type detection */
 #define DCA_MARKER_RAW_BE 0x7FFE8001
 #define DCA_MARKER_RAW_LE 0xFE7F0180
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8
+
+#endif
diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h
index 288401baec..6686277ec3 100644
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@@ -24,6 +24,9 @@
  * @file dcadata.c
  */
 
+#ifndef AVCODEC_DCADATA_H
+#define AVCODEC_DCADATA_H
+
 #include <stdint.h>
 
 /* Generic tables */
@@ -8467,3 +8470,5 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
 
 
 */
+
+#endif
diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h
index 2833d6789a..159520874b 100644
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -1069,3 +1072,5 @@ static const uint8_t* bitalloc_bits[10][8] = {
   { bitalloc_129_bits_a, bitalloc_129_bits_b, bitalloc_129_bits_c, bitalloc_129_bits_d,
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
+
+#endif
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
index cc0c07dd2f..a17cbfd747 100644
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_DNXHDDATA_H
+#define AVCODEC_DNXHDDATA_H
+
 #include <stdint.h>
 
 static const uint8_t dnxhd_1238_luma_weigth[] = {
@@ -106,3 +109,5 @@ static const uint8_t dnxhd_1238_run_bits[62] = {
 static const uint8_t dnxhd_1238_run[62] = {
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 20, 21, 17, 18, 19, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
 };
+
+#endif
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 4484933a01..f493da1be7 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -24,6 +24,9 @@
  * Constants for DV codec.
  */
 
+#ifndef AVCODEC_DVDATA_H
+#define AVCODEC_DVDATA_H
+
 #include "avcodec.h"
 #include "rational.h"
 
@@ -2725,3 +2728,5 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
     buf[2] = 0xff;             /* reserved -- always 1 */
     return 3;
 }
+
+#endif
diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h
index ab711b5b7c..08dac0b16f 100644
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ELBG_H
+#define AVCODEC_ELBG_H
+
 #include "random.h"
 
 /**
@@ -48,3 +51,5 @@ void ff_do_elbg(int *points, int dim, int numpoints, int *codebook,
 void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                   int numCB, int num_steps, int *closest_cb,
                   AVRandomState *rand_state);
+
+#endif
diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h
index a7b11dc365..0fbbb58c14 100644
--- a/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@@ -27,9 +27,14 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#ifndef AVCODEC_FAANDCT_H
+#define AVCODEC_FAANDCT_H
+
 #include "dsputil.h"
 
 #define FAAN_POSTSCALE
 
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
+
+#endif
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index b4382d236b..5c34c30929 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -28,6 +28,9 @@
  * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
  */
 
+#ifndef AVCODEC_GOLOMB_H
+#define AVCODEC_GOLOMB_H
+
 #include <stdint.h>
 #include "bitstream.h"
 
@@ -480,3 +483,5 @@ 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
diff --git a/libavcodec/h261.h b/libavcodec/h261.h
index 1d4fc848a0..7f86bc4383 100644
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@@ -25,6 +25,9 @@
  * h261codec.
  */
 
+#ifndef AVCODEC_H261_H
+#define AVCODEC_H261_H
+
 #include "mpegvideo.h"
 
 /**
@@ -44,3 +47,5 @@ typedef struct H261Context{
 }H261Context;
 
 #define MB_TYPE_H261_FIL 0x800000
+
+#endif
diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h
index a7074eb0c6..1831c894ac 100644
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@@ -24,6 +24,9 @@
  * H.261 tables.
  */
 
+#ifndef AVCODEC_H261DATA_H
+#define AVCODEC_H261DATA_H
+
 #include <stdint.h>
 #include "h261.h"
 
@@ -157,3 +160,5 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_run,
     h261_tcoeff_level,
 };
+
+#endif
diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h
index afd46fda05..da25d4b75b 100644
--- a/libavcodec/h263_parser.h
+++ b/libavcodec/h263_parser.h
@@ -19,6 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#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
diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index e0366aaf98..ebe4e56d2e 100644
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -26,6 +26,9 @@
  * H.263 tables.
  */
 
+#ifndef AVCODEC_H263DATA_H
+#define AVCODEC_H263DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -308,3 +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
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index c9e71853fc..6a15aa239f 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -27,6 +27,9 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
+#ifndef AVCODEC_H264DATA_H
+#define AVCODEC_H264DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 #include "rational.h"
@@ -1325,3 +1328,5 @@ static const int cabac_context_init_PB[3][460][2] =
         {  31,  12 }, {  37,  23 }, {  31,  38 }, {  20,  64 },
     }
 };
+
+#endif
diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h
index 3553a4025a..9cd616879f 100644
--- a/libavcodec/i386/mathops.h
+++ b/libavcodec/i386/mathops.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_X86_MATHOPS_H
+#define AVCODEC_X86_MATHOPS_H
+
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
         ({ int rt, dummy; asm (\
@@ -39,3 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
      rt; })
 
+#endif
diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h
index 446bf0b176..5e22123e6c 100644
--- a/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@@ -22,6 +22,9 @@
  *
  */
 
+#ifndef AVCODEC_IMCDATA_H
+#define AVCODEC_IMCDATA_H
+
 #include <stdint.h>
 
 static const uint16_t band_tab[33] = {
@@ -164,3 +167,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = {
     }
 };
 
+#endif
diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h
index 83d1227b3f..bfc6e8a959 100644
--- a/libavcodec/indeo2data.h
+++ b/libavcodec/indeo2data.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_INDEO2DATA_H
+#define AVCODEC_INDEO2DATA_H
+
 #include <stdint.h>
 
 #define IR2_CODES 143
@@ -134,3 +137,5 @@ static const uint8_t ir2_luma_table[256] = {
  0x28, 0x5C, 0x6C, 0xC1, 0x94, 0x3F, 0xC1, 0x6C,
  0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
 };
+
+#endif
diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h
index 095e3f00d0..e071da4ae6 100644
--- a/libavcodec/indeo3data.h
+++ b/libavcodec/indeo3data.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_INDEO3DATA_H
+#define AVCODEC_INDEO3DATA_H
+
 #include <stdint.h>
 
 static const uint32_t correction[] = {
@@ -2335,3 +2338,5 @@ static const uint32_t correctionhighorder[] = {
         0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2, 0xd1d1d1d2,
         0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
+
+#endif
diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h
index 6316627fd9..ef49c39f4c 100644
--- a/libavcodec/mpcdata.h
+++ b/libavcodec/mpcdata.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef AVCODEC_MPCDATA_H
+#define AVCODEC_MPCDATA_H
+
 #include <stdint.h>
 
 static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1};
@@ -206,3 +209,5 @@ static const float mpc7_SCF[128] = {
     0.000000092001613439, 0.000000076635565449, 0.000000063835940978, 0.000000053174105119,
     0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };
+
+#endif
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index 2cbc37fa98..bd5c9ed9bf 100644
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -25,6 +25,9 @@
  * MPEG1/2 tables.
  */
 
+#ifndef AVCODEC_MPEG12DATA_H
+#define AVCODEC_MPEG12DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -475,3 +478,5 @@ static const uint8_t svcd_scan_offset_placeholder[14]={
     0xff, 0xff, 0xff,
     0xff, 0xff, 0xff,
 };
+
+#endif
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index 17a52dd021..eb8c625649 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -25,6 +25,9 @@
  * mpeg4 tables.
  */
 
+#ifndef AVCODEC_MPEG4DATA_H
+#define AVCODEC_MPEG4DATA_H
+
 #include <stdint.h>
 #include "mpegvideo.h"
 
@@ -425,3 +428,5 @@ const uint16_t ff_mpeg4_resync_prefix[8]={
 static const uint8_t mpeg4_dc_threshold[8]={
     99, 13, 15, 17, 19, 21, 23, 0
 };
+
+#endif
diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h
index 7dac9e64c3..4057f52d31 100644
--- a/libavcodec/mpegaudiodectab.h
+++ b/libavcodec/mpegaudiodectab.h
@@ -24,6 +24,9 @@
  * mpeg audio layer decoder tables.
  */
 
+#ifndef AVCODEC_MPEGAUDIODECTAB_H
+#define AVCODEC_MPEGAUDIODECTAB_H
+
 #include <stdint.h>
 #include "mpegaudio.h"
 
@@ -599,3 +602,5 @@ static const uint8_t mpa_pretab[2][22] = {
 static const float ci_table[8] = {
     -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037,
 };
+
+#endif
diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h
index 6833f3c70a..7bce7280b4 100644
--- a/libavcodec/mpegaudiotab.h
+++ b/libavcodec/mpegaudiotab.h
@@ -27,6 +27,9 @@
  * Most of them come from the mpeg audio specification.
  */
 
+#ifndef AVCODEC_MPEGAUDIOTAB_H
+#define AVCODEC_MPEGAUDIOTAB_H
+
 #include <stdint.h>
 #include "mpegaudio.h"
 
@@ -112,3 +115,4 @@ static const float fixed_smr[SBLIMIT] =  {
 
 static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
 
+#endif
diff --git a/libavcodec/msmpeg4tab.h b/libavcodec/msmpeg4tab.h
index 5db3f35c3d..b9bfcec440 100644
--- a/libavcodec/msmpeg4tab.h
+++ b/libavcodec/msmpeg4tab.h
@@ -27,6 +27,9 @@
  * MSMPEG4 data tables.
  */
 
+#ifndef AVCODEC_MSMPEG4TAB_H
+#define AVCODEC_MSMPEG4TAB_H
+
 #include <stdint.h>
 #include "bitstream.h"
 #include "rl.h"
@@ -2016,3 +2019,5 @@ static const uint8_t wmv2_scantableB[64]={
 0x38, 0x29, 0x22, 0x03, 0x31, 0x39, 0x0B, 0x2A,
 0x13, 0x32, 0x1B, 0x3A, 0x23, 0x2B, 0x33, 0x3B,
 };
+
+#endif
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 6af23f246b..e339231a4d 100644
--- a/libavcodec/ppc/mathops.h
+++ b/libavcodec/ppc/mathops.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_PPC_MATHOPS_H
+#define AVCODEC_PPC_MATHOPS_H
+
 #if defined(ARCH_POWERPC_405)
 /* signed 16x16 -> 32 multiply add accumulate */
 #   define MAC16(rt, ra, rb) \
@@ -31,3 +34,5 @@
          asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb));
          __rt; })
 #endif
+
+#endif
diff --git a/libavcodec/ppc/types_altivec.h b/libavcodec/ppc/types_altivec.h
index f29026e047..ca15609a2f 100644
--- a/libavcodec/ppc/types_altivec.h
+++ b/libavcodec/ppc/types_altivec.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_TYPES_ALTIVEC_H
+#define AVCODEC_TYPES_ALTIVEC_H
+
 /***********************************************************************
  * Vector types
  **********************************************************************/
@@ -39,3 +42,5 @@
 #define zero_s16v (vec_s16_t) zerov
 #define zero_u32v (vec_u32_t) zerov
 #define zero_s32v (vec_s32_t) zerov
+
+#endif
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index a2fac35519..4f8bbf5880 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -25,6 +25,9 @@
  * Range coder.
  */
 
+#ifndef AVCODEC_RANGECODER_H
+#define AVCODEC_RANGECODER_H
+
 #include <stdint.h>
 #include <assert.h>
 #include "common.h"
@@ -136,3 +139,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
 #endif
 }
 
+#endif
diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h
index 09ed3c6acf..8ce9297b22 100644
--- a/libavcodec/roqvideo.h
+++ b/libavcodec/roqvideo.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef AVCODEC_ROQVIDEO_H
+#define AVCODEC_ROQVIDEO_H
+
 #include "avcodec.h"
 #include "dsputil.h"
 
@@ -66,3 +69,5 @@ void ff_apply_vector_4x4(RoqContext *ri, int x, int y, roq_cell *cell);
 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
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index 63e19519f0..7bc245504f 100644
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -25,6 +25,9 @@
  * simple idct header.
  */
 
+#ifndef AVCODEC_SIMPLE_IDCT_H
+#define AVCODEC_SIMPLE_IDCT_H
+
 #include <stdint.h>
 #include "dsputil.h"
 
@@ -39,3 +42,5 @@ void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block);
 
 void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
+
+#endif
diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h
index d4a8ce0928..16c1b44751 100644
--- a/libavcodec/sparc/vis.h
+++ b/libavcodec/sparc/vis.h
@@ -40,6 +40,9 @@
  * the assembler to keep the binary from becoming tainted.
  */
 
+#ifndef AVCODEC_VIS_H
+#define AVCODEC_VIS_H
+
 #define vis_opc_base    ((0x1 << 31) | (0x36 << 19))
 #define vis_opf(X)      ((X) << 5)
 #define vis_sreg(X)     (X)
@@ -325,3 +328,5 @@ static inline void vis_alignaddrl_g0(void *_ptr)
 /* Pixel component distance.  */
 
 #define vis_pdist(rs1,rs2,rd)           vis_dd2d(0x3e, rs1, rs2, rd)
+
+#endif
diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h
index 9b23d8ebdb..735bfade52 100644
--- a/libavcodec/svq1_cb.h
+++ b/libavcodec/svq1_cb.h
@@ -29,6 +29,9 @@
  * svq1 code books.
  */
 
+#ifndef AVCODEC_SVQ1_CB_H
+#define AVCODEC_SVQ1_CB_H
+
 #include <stdint.h>
 #include <stdlib.h>
 
@@ -1581,3 +1584,5 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = {
  -1,  5, -2, -2, -3,  2, -3, -1,  3, -3,  0,  4,  3,  0,  1, -2,
  }
 };
+
+#endif
diff --git a/libavcodec/ulti_cb.h b/libavcodec/ulti_cb.h
index 2d8c9082c8..ffaa9a1e5e 100644
--- a/libavcodec/ulti_cb.h
+++ b/libavcodec/ulti_cb.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_ULTI_CB_H
+#define AVCODEC_ULTI_CB_H
+
 static const unsigned char ulti_codebook[16384]={
     0x00, 0x01, 0x01, 0x02,
     0x00, 0x01, 0x02, 0x03,
@@ -4117,3 +4120,5 @@ static const unsigned char ulti_codebook[16384]={
     0x3C, 0x3D, 0x3E, 0x3F,
     0x3D, 0x3E, 0x3E, 0x3F
 };
+
+#endif
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h
index 04568ca492..f898265905 100644
--- a/libavcodec/vc1.h
+++ b/libavcodec/vc1.h
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1_H
+#define AVCODEC_VC1_H
+
 #include "avcodec.h"
 #include "mpegvideo.h"
 
@@ -300,3 +303,5 @@ typedef struct VC1Context{
     int p_frame_skipped;
     int bi_type;
 } VC1Context;
+
+#endif
diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h
index 72f1a8fc7f..3a2713b347 100644
--- a/libavcodec/vc1acdata.h
+++ b/libavcodec/vc1acdata.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_VC1ACDATA_H
+#define AVCODEC_VC1ACDATA_H
+
 #include <stdint.h>
 
 #define AC_MODES 8
@@ -585,3 +588,5 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = {
       -1,    30,    28,     3,     0
 }
 };
+
+#endif
diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h
index 5d5e4cad90..82ca514df0 100644
--- a/libavcodec/vorbis_enc_data.h
+++ b/libavcodec/vorbis_enc_data.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef AVCODEC_VORBIS_ENC_DATA_H
+#define AVCODEC_VORBIS_ENC_DATA_H
+
 #include <stdint.h>
 
 static const uint8_t codebook0[] = {
@@ -498,3 +501,5 @@ static const struct {
     { 4, 2, 2, (const int[]){ -1,  9, 10, 11 } },
     { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } },
 };
+
+#endif
diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h
index d81ba8496b..5d092a9eb3 100644
--- a/libavcodec/wmadata.h
+++ b/libavcodec/wmadata.h
@@ -24,6 +24,9 @@
  * Various WMA tables.
  */
 
+#ifndef AVCODEC_WMADATA_H
+#define AVCODEC_WMADATA_H
+
 #include <stdint.h>
 #include "wma.h"
 
@@ -1434,3 +1437,5 @@ static const CoefVLCTable coef_vlcs[6] = {
         sizeof(coef5_huffbits), sizeof(levels5)/2, coef5_huffcodes, coef5_huffbits, levels5,
     },
 };
+
+#endif
diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 85cfeebaf7..99d43f59de 100644
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVCODEC_XIPH_H
+#define AVCODEC_XIPH_H
+
 #include "common.h"
 
 /**
@@ -36,3 +39,5 @@
 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
diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h
index 37b3422945..0b61c157ff 100644
--- a/libavcodec/xvmc_render.h
+++ b/libavcodec/xvmc_render.h
@@ -1,3 +1,6 @@
+#ifndef AVCODEC_XVMC_RENDER_H
+#define AVCODEC_XVMC_RENDER_H
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -48,3 +51,5 @@ typedef   struct{
   void * p_osd_target_surface_render;//pointer to the surface where subpicture is rendered
 
 } xvmc_render_state_t;
+
+#endif
diff --git a/libavformat/asf.h b/libavformat/asf.h
index 3421a08962..6df02c24f1 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFORMAT_ASF_H
+#define AVFORMAT_ASF_H
+
 #include <stdint.h>
 #include "avformat.h"
 
@@ -282,3 +285,5 @@ static const GUID my_guid = {
 #define ASF_PL_MASK_PAYLOAD_LENGTH_FIELD_SIZE     0xc0 //1100 0000
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
+
+#endif
diff --git a/libavformat/dv.h b/libavformat/dv.h
index 5bc12865e8..e7ad3d53b5 100644
--- a/libavformat/dv.h
+++ b/libavformat/dv.h
@@ -25,6 +25,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFORMAT_DV_H
+#define AVFORMAT_DV_H
+
 #include "avformat.h"
 
 typedef struct DVDemuxContext DVDemuxContext;
@@ -37,3 +40,5 @@ typedef struct DVMuxContext DVMuxContext;
 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
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index fc0fd11548..178988a994 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFORMAT_MPEGTS_H
+#define AVFORMAT_MPEGTS_H
+
 #include "avformat.h"
 
 #define TS_FEC_PACKET_SIZE 204
@@ -63,3 +66,5 @@ MpegTSContext *mpegts_parse_open(AVFormatContext *s);
 int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
+
+#endif
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 1a4473789c..b18ac2dc0d 100644
--- a/libavformat/nut.h
+++ b/libavformat/nut.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef AVFORMAT_NUT_H
+#define AVFORMAT_NUT_H
+
 //#include <limits.h>
 #include "avformat.h"
 #include "crc.h"
@@ -95,3 +98,5 @@ typedef struct {
 static unsigned long av_crc04C11DB7_update(unsigned long checksum, const uint8_t *buf, unsigned int len){
     return av_crc(av_crc04C11DB7, checksum, buf, len);
 }
+
+#endif
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h
index 74cfb5d5b9..8e3b326059 100644
--- a/libavformat/rtspcodes.h
+++ b/libavformat/rtspcodes.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVFORMAT_RTSPCODES_H
+#define AVFORMAT_RTSPCODES_H
+
 /** RTSP handling */
 enum RTSPStatusCode {
 RTSP_STATUS_OK              =200, /**< OK */
@@ -34,3 +37,4 @@ RTSP_STATUS_SERVICE         =503, /**< Service Unavailable */
 RTSP_STATUS_VERSION         =505, /**< RTSP Version not supported */
 };
 
+#endif
diff --git a/libavutil/base64.h b/libavutil/base64.h
index 7f21c71c71..ff755a4cdf 100644
--- a/libavutil/base64.h
+++ b/libavutil/base64.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef AVUTIL_BASE64_H
+#define AVUTIL_BASE64_H
+
 #include <stdint.h>
 
 /**
@@ -34,3 +37,4 @@ int av_base64_decode(uint8_t * out, const char *in, int out_length);
  */
 char *av_base64_encode(char * buf, int buf_len, uint8_t * src, int len);
 
+#endif
diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
index 422c1b3d6d..acf29b2ac5 100644
--- a/libavutil/softfloat.h
+++ b/libavutil/softfloat.h
@@ -19,6 +19,9 @@
  *
  */
 
+#ifndef AVUTIL_SOFTFLOAT_H
+#define AVUTIL_SOFTFLOAT_H
+
 #include <stdint.h>
 
 #define MIN_EXP -126
@@ -122,3 +125,5 @@ static inline int av_sf2int(SoftFloat v, int frac_bits){
     if(v.exp >= 0) return v.mant <<  v.exp ;
     else           return v.mant >>(-v.exp);
 }
+
+#endif
diff --git a/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h
index b4bf0ca05e..9ec2f3500d 100644
--- a/libpostproc/postprocess_internal.h
+++ b/libpostproc/postprocess_internal.h
@@ -23,6 +23,9 @@
  * internal api header.
  */
 
+#ifndef POSTPROCESS_INTERNAL_H
+#define POSTPROCESS_INTERNAL_H
+
 #include "avutil.h"
 
 #define V_DEBLOCK       0x01
@@ -181,3 +184,5 @@ static inline void linecpy(void *dest, void *src, int lines, int stride)
                 memcpy(dest+(lines-1)*stride, src+(lines-1)*stride, -lines*stride);
         }
 }
+
+#endif