Add multiple inclusion guards to all header files that lack them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2

60 files changed, 256 insertions, 10 deletions

diff --git a/access_mpcontext.h b/access_mpcontext.h
index 08c2181c11..e15ed6c885 100644
--- a/access_mpcontext.h
+++ b/access_mpcontext.h
@@ -1,3 +1,6 @@
+#ifndef ACCESS_MPCONTEXT_H
+#define ACCESS_MPCONTEXT_H
+
 struct MPContext;
 void *mpctx_get_video_out(struct MPContext *mpctx);
 void *mpctx_get_audio_out(struct MPContext *mpctx);
@@ -6,3 +9,5 @@ void *mpctx_get_playtree_iter(struct MPContext *mpctx);
 void *mpctx_get_mixer(struct MPContext *mpctx);
 int mpctx_get_global_sub_size(struct MPContext *mpctx);
 int mpctx_get_osd_function(struct MPContext *mpctx);
+
+#endif /* ACCESS_MPCONTEXT_H */
diff --git a/asxparser.h b/asxparser.h
index 22663065b7..cc3c6eeb16 100644
--- a/asxparser.h
+++ b/asxparser.h
@@ -1,4 +1,5 @@
-
+#ifndef ASXPARSER_H
+#define ASXPARSER_H
 
 typedef struct _ASX_Parser_t ASX_Parser_t;
 
@@ -47,3 +48,5 @@ typedef void (*ASX_FreeFunc)(void* arg);
 
 void
 asx_list_free(void* list_ptr,ASX_FreeFunc free_func);
+
+#endif /* ASXPARSER_H */
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 00d2fae451..b933bdfcb0 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -1,3 +1,5 @@
+#ifndef CFG_MENCODER_H
+#define CFG_MENCODER_H
 
 /*
  * config for cfgparser
@@ -265,3 +267,5 @@ const m_option_t mencoder_opts[]={
 //	{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
+
+#endif /* CFG_MENCODER.H */
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index e968dd6d34..1728328161 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -1,3 +1,6 @@
+#ifndef CFG_MPLAYER_H
+#define CFG_MPLAYER_H
+
 /*
  * config for cfgparser
  */
@@ -363,3 +366,6 @@ const m_option_t mplayer_opts[]={
 	{"vd", vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
+
+#endif /* CFG_MPLAYER_H */
+
diff --git a/command.h b/command.h
index ab282a6d52..5e0e69334d 100644
--- a/command.h
+++ b/command.h
@@ -1,3 +1,8 @@
+#ifndef COMMAND_H
+#define COMMAND_H
+
 int run_command(struct MPContext *mpctx, mp_cmd_t *cmd);
 char *property_expand_string(struct MPContext *mpctx, char *str);
 void property_print_help(void);
+
+#endif /* COMMAND_H */
diff --git a/cputable.h b/cputable.h
index f30611dca7..26eb56f781 100644
--- a/cputable.h
+++ b/cputable.h
@@ -4,6 +4,9 @@
  * Family F codenames owe much thanks to Neil Phillips, author of x86test.
  */
 
+#ifndef CPUTABLE_H
+#define CPUTABLE_H
+
 #define MAX_VENDORS 8 /* Number of CPU Vendors */
 
 //#define N_UNKNOWN "unknown"
@@ -526,3 +529,4 @@ static const struct {
 	{"GenuineTMx86","Transmeta"}
 };	
 
+#endif /* CPUTABLE_H */
diff --git a/drivers/3dfx.h b/drivers/3dfx.h
index eb0130ce38..ab8dbdfe0a 100644
--- a/drivers/3dfx.h
+++ b/drivers/3dfx.h
@@ -20,6 +20,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#ifndef MPLAYER_3DFX_H
+#define MPLAYER_3DFX_H
 
 #define VOODOO_IO_REG_OFFSET     ((unsigned long int)0x0000000)
 #define VOODOO_YUV_REG_OFFSET    ((unsigned long int)0x0080100)
@@ -370,4 +372,4 @@ typedef struct voodoo_yuv_fb_t voodoo_yuv_fb;
 
 /* ------------------------------------------------------------------------- */
 
-
+#endif /* MPLAYER_3DFX_H */
diff --git a/drivers/tdfx_vid.h b/drivers/tdfx_vid.h
index 152f5359e8..42fbeb5639 100644
--- a/drivers/tdfx_vid.h
+++ b/drivers/tdfx_vid.h
@@ -1,4 +1,5 @@
-
+#ifndef TDFX_VID_H
+#define TDFX_VID_H
 
 #define TDFX_VID_VERSION 1
 
@@ -104,3 +105,4 @@ typedef struct tdfx_vid_overlay_s {
 #define TDFX_VID_OVERLAY_ON _IO ('J', 8)
 #define TDFX_VID_OVERLAY_OFF _IO ('J', 9)
 
+#endif /* TDFX_VID_H */
diff --git a/input/input.h b/input/input.h
index f07d9142ea..86266ac590 100644
--- a/input/input.h
+++ b/input/input.h
@@ -1,3 +1,6 @@
+#ifndef INPUT_H
+#define INPUT_H
+
 // All command IDs
 #define MP_CMD_SEEK   0
 #define MP_CMD_AUDIO_DELAY 1
@@ -294,3 +297,4 @@ mp_input_uninit(void);
 int
 mp_input_check_interrupt(int time);
 
+#endif /* INPUT_H */
diff --git a/input/joystick.h b/input/joystick.h
index 9e017b321d..f7b8cb323d 100644
--- a/input/joystick.h
+++ b/input/joystick.h
@@ -1,3 +1,5 @@
+#ifndef JOYSTICK_H
+#define JOYSTICK_H
 
 #define JOY_BASE   (0x100+128)
 #define JOY_AXIS0_PLUS (JOY_BASE+0)
@@ -37,3 +39,4 @@ int mp_input_joystick_init(char* dev);
 
 int mp_input_joystick_read(int fd);
 
+#endif /* JOYSTICK_H */
diff --git a/input/lirc.h b/input/lirc.h
index 6271aaaeb2..08cb6e741a 100644
--- a/input/lirc.h
+++ b/input/lirc.h
@@ -1,4 +1,5 @@
-
+#ifndef LIRC_H
+#define LIRC_H
 
 int 
 mp_input_lirc_init(void);
@@ -8,3 +9,5 @@ mp_input_lirc_read(int fd,char* dest, int s);
 
 void
 mp_input_lirc_close(int fd);
+
+#define /* LIRC_H */
diff --git a/input/mouse.h b/input/mouse.h
index 18b2dfa5d3..0b61efeaa2 100644
--- a/input/mouse.h
+++ b/input/mouse.h
@@ -1,4 +1,5 @@
-
+#ifndef MOUSE_H
+#define MOUSE_H
 
 #define MOUSE_BASE ((0x100+256)|MP_NO_REPEAT_KEY)
 #define MOUSE_BTN0 (MOUSE_BASE+0)
@@ -23,3 +24,5 @@
 #define MOUSE_BTN7_DBL (MOUSE_BASE_DBL+7)
 #define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8)
 #define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9)
+
+#endif /* MOUSE_H */
diff --git a/libaf/af_hrtf.h b/libaf/af_hrtf.h
index 7501cbf194..59e5a44ee9 100644
--- a/libaf/af_hrtf.h
+++ b/libaf/af_hrtf.h
@@ -1,3 +1,6 @@
+#ifndef AF_HRTF_H
+#define AF_HRTF_H
+
 #define HRTF_MIX_51 0
 #define HRTF_MIX_STEREO 1
 #define HRTF_MIX_MATRIX2CH 2
@@ -486,3 +489,5 @@ float cr_filt[128] = {
    -0.00255615052036616, -0.0017721562881944813,
    -0.0002379619297227554, 0.0007130120121089036
 };
+
+#endif /* AF_HRTF_H */
diff --git a/libaf/af_resample.h b/libaf/af_resample.h
index 28df93ecfd..5f20b2e696 100644
--- a/libaf/af_resample.h
+++ b/libaf/af_resample.h
@@ -14,6 +14,9 @@
    only be included by af_resample.c 
 */ 
 
+#ifndef AF_RESAMPLE_H
+#define AF_RESAMPLE_H
+
 #undef L
 #undef SHIFT
 #undef FORMAT
@@ -159,3 +162,5 @@
   s->xi = xi;
   s->i = i;
 #endif /* DN */
+
+#endif /* AF_RESAMPLE_H */
diff --git a/libaf/equalizer.h b/libaf/equalizer.h
index 29bc6d49c1..45a4757d16 100644
--- a/libaf/equalizer.h
+++ b/libaf/equalizer.h
@@ -8,6 +8,9 @@
 //=============================================================================
 */
 
+#ifndef EQUALIZER_H
+#define EQUALIZER_H
+
 /* Equalizer plugin header file defines struct used for setting or
    getting the gain of a specific channel and frequency */
 
@@ -31,3 +34,5 @@ nr.    	center frequency
 8	8.000 kHz
 9       16.00 kHz
 */
+
+#endif /* EQUALIZER_H */
diff --git a/libao2/audio_out_internal.h b/libao2/audio_out_internal.h
index 4ddd564914..829f2736a5 100644
--- a/libao2/audio_out_internal.h
+++ b/libao2/audio_out_internal.h
@@ -1,3 +1,5 @@
+#ifndef AUDIO_OUT_INTERNAL_H
+#define AUDIO_OUT_INTERNAL_H
 
 // prototypes:
 //static ao_info_t info;
@@ -25,3 +27,4 @@ static void audio_resume(void);
 	audio_resume\
 };
 
+#endif /* AUDIO_OUT_INTERNAL_H */
diff --git a/libmenu/menu.h b/libmenu/menu.h
index 7d4defaacf..0f1403b7f8 100644
--- a/libmenu/menu.h
+++ b/libmenu/menu.h
@@ -1,3 +1,5 @@
+#ifndef MENU_H
+#define MENU_H
 
 struct menu_priv_s;
 typedef struct  menu_s menu_t;
@@ -89,3 +91,5 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
 			 int vspace, int warp, int align, int anchor);
 
 void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h);
+
+#endif /* MENU_H */
diff --git a/libmenu/menu_list.h b/libmenu/menu_list.h
index 22c560ccee..4540eb999b 100644
--- a/libmenu/menu_list.h
+++ b/libmenu/menu_list.h
@@ -1,3 +1,5 @@
+#ifndef MENU_LIST_H
+#define MENU_LIST_H
 
 typedef struct list_entry_s list_entry_t;
 
@@ -80,5 +82,5 @@ extern const menu_list_priv_t menu_list_priv_dflt;
   { "ptr-bg", M_ST_OFF(menu_list_priv_t,ptr_bg), CONF_TYPE_INT, M_OPT_RANGE, -1, 255, NULL }, \
   { "ptr-bg-alpha", M_ST_OFF(menu_list_priv_t,ptr_bg_alpha), \
     CONF_TYPE_INT, M_OPT_RANGE, 0, 255, NULL } \
-  
 
+#endif /* MENU_LIST_H */
diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h
index d15cdb5b96..d9178a85c2 100644
--- a/libmpcodecs/ad.h
+++ b/libmpcodecs/ad.h
@@ -1,3 +1,5 @@
+#ifndef AD_H
+#define AD_H
 
 #include "mpc_info.h"
 typedef mp_codec_info_t ad_info_t;
@@ -28,3 +30,4 @@ extern ad_functions_t* mpcodecs_ad_drivers[];
 // fallback: use hw mixer in libao
 #define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */
 
+#endif /* AD_H */
diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h
index 5dd3122d96..c7a2457535 100644
--- a/libmpcodecs/ad_internal.h
+++ b/libmpcodecs/ad_internal.h
@@ -1,3 +1,5 @@
+#ifndef AD_INTERNAL_H
+#define AD_INTERNAL_H
 
 #include "codec-cfg.h"
 #include "libaf/af_format.h"
@@ -24,3 +26,4 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxl
 	decode_audio\
 };
 
+#endif /* AD_INTERNAL_H */
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h
index 37b3c27db7..0c325ced62 100644
--- a/libmpcodecs/dec_audio.h
+++ b/libmpcodecs/dec_audio.h
@@ -1,3 +1,5 @@
+#ifndef DEC_AUDIO_H
+#define DEC_AUDIO_H
 
 // dec_audio.c:
 extern void afm_help(void);
@@ -9,3 +11,5 @@ extern void uninit_audio(sh_audio_t *sh_audio);
 
 extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
 		int *out_samplerate, int *out_channels, int *out_format);
+
+#endif /* DEC_AUDIO_H */
diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h
index cb5ac8b651..7e73133144 100644
--- a/libmpcodecs/dec_video.h
+++ b/libmpcodecs/dec_video.h
@@ -1,3 +1,5 @@
+#ifndef DEC_VIDEO_H
+#define DEC_VIDEO_H
 
 // dec_video.c:
 extern void vfm_help(void);
@@ -18,3 +20,5 @@ extern void resync_video_stream(sh_video_t *sh_video);
 extern int get_current_video_decoder_lag(sh_video_t *sh_video);
 
 extern int divx_quality;
+
+#endif /* DEC_VIDEO_H */
diff --git a/libmpcodecs/pullup.h b/libmpcodecs/pullup.h
index 2f5b119949..04a2f95bb7 100644
--- a/libmpcodecs/pullup.h
+++ b/libmpcodecs/pullup.h
@@ -1,4 +1,5 @@
-
+#ifndef PULLUP_H
+#define PULLUP_H
 
 #define PULLUP_CPU_MMX 1
 #define PULLUP_CPU_MMX2 2
@@ -80,4 +81,4 @@ void pullup_preinit_context(struct pullup_context *c);
 void pullup_init_context(struct pullup_context *c);
 void pullup_free_context(struct pullup_context *c);
 
-
+#endif /* PULLUP_H */
diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index d660ff84fd..c37c0e40cf 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -1,3 +1,5 @@
+#ifndef VD_H
+#define VD_H
 
 #include "mp_image.h"
 #include "mpc_info.h"
@@ -32,3 +34,5 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
 void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
 
 #define VDFLAGS_DROPFRAME 3
+
+#endif /* VD_H */
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index 57aede310b..f83913473b 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -1,3 +1,5 @@
+#ifndef VD_INTERNAL
+#define VD_INTERNAL
 
 #include "codec-cfg.h"
 #include "img_format.h"
@@ -25,3 +27,4 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags);
 	decode\
 };
 
+#endif /* VD_INTERNAL */
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 9a72aa0b3d..d4451f4b5b 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -1,3 +1,5 @@
+#ifndef VF_H
+#define VF_H
 
 struct vf_instance_s;
 struct vf_priv_s;
@@ -120,3 +122,5 @@ void vf_uninit_filter_chain(vf_instance_t* vf);
 int vf_config_wrapper(struct vf_instance_s* vf,
 		      int width, int height, int d_width, int d_height,
 		      unsigned int flags, unsigned int outfmt);
+
+#endif /* VF_H */
diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h
index 5b6db0a06e..18c1f3af1f 100644
--- a/libmpcodecs/vf_scale.h
+++ b/libmpcodecs/vf_scale.h
@@ -1,4 +1,9 @@
 //GPL
 
+#ifndef VF_SCALE_H
+#define VF_SCALE_H
+
 int get_sws_cpuflags(void);
 struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
+
+#endif /* VF_SCALE_H */
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h
index 0cc9c4ec4d..88a2c8737b 100644
--- a/libmpcodecs/vfcap.h
+++ b/libmpcodecs/vfcap.h
@@ -1,5 +1,8 @@
 // VFCAP_* values: they are flags, returned by query_format():
 
+#ifndef VFCAP_H
+#define VFCAP_H
+
 // set, if the given colorspace is supported (with or without conversion)
 #define VFCAP_CSP_SUPPORTED 0x1
 // set, if the given colorspace is supported _without_ conversion
@@ -30,3 +33,5 @@
 #define VFCAP_EOSD 0x2000
 // filter will draw EOSD at screen resolution (without scaling)
 #define VFCAP_EOSD_UNSCALED 0x4000
+
+#endif /* VFCAP_H */
diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h
index 11e94dd798..b45f8cc575 100644
--- a/libmpdemux/demux_avs.h
+++ b/libmpdemux/demux_avs.h
@@ -21,6 +21,9 @@
  * Boston, MA 02110-1301 USA.
  */
 
+#ifndef DEMUX_AVS_H
+#define DEMUX_AVS_H
+
 enum { AVISYNTH_INTERFACE_VERSION = 2 };
 
 enum
@@ -162,3 +165,5 @@ static inline int avs_bits_per_pixel(const AVS_VideoInfo * p)
       default:           return 0;
     }
 }
+
+#endif /* DEMUX_AVS_H */
diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h
index 6cddf0d816..8133b5ed29 100644
--- a/libmpdemux/mp3_hdr.h
+++ b/libmpdemux/mp3_hdr.h
@@ -1,3 +1,5 @@
+#ifndef MP3_HDR_H
+#define MP3_HDR_H
 
 int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br);
 
@@ -9,3 +11,5 @@ static inline int mp_check_mp3_header(unsigned int head){
     if(mp_decode_mp3_header((unsigned char*)(&head))<=0) return 0;
     return 1;
 }
+
+#endif /* MP3_HDR_H */
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
index b5a189c5a5..31ac33378c 100644
--- a/libmpdemux/mpeg_hdr.h
+++ b/libmpdemux/mpeg_hdr.h
@@ -1,3 +1,5 @@
+#ifndef MPEG_HDR_H
+#define MPEG_HDR_H
 
 typedef struct {
     // video info:
@@ -27,3 +29,5 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer);
 void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer);
 int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len);
 int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len);
+
+#endif /* MPEG_HDR_H */
diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h
index 9839eaa338..a01206af44 100644
--- a/libmpdemux/muxer.h
+++ b/libmpdemux/muxer.h
@@ -1,3 +1,5 @@
+#ifndef MUXER_H
+#define MUXER_H
 
 #define MUXER_MAX_STREAMS 16
 
@@ -113,3 +115,5 @@ int muxer_init_muxer_mpeg(muxer_t *);
 int muxer_init_muxer_rawvideo(muxer_t *);
 int muxer_init_muxer_lavf(muxer_t *);
 int muxer_init_muxer_rawaudio(muxer_t *);
+
+#endif /* MUXER_H */
diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h
index 14e72b9581..f1b81cced5 100644
--- a/libmpdemux/nuppelvideo.h
+++ b/libmpdemux/nuppelvideo.h
@@ -1,5 +1,8 @@
 /* nuppelvideo.h  rh */
 
+#ifndef NUPPELVIDEO_H
+#define NUPPELVIDEO_H
+
 #include "libavutil/intfloat_readwrite.h"
 
 typedef struct  __attribute__((packed)) rtfileheader
@@ -156,3 +159,4 @@ typedef struct audbuffertype
    (h)->lavc_maxqdiff = le2me_32((h)->lavc_maxqdiff);		\
   }
 
+#endif /* NUPPELVIDEO_H */
diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h
index 45936b396a..fceed0c895 100644
--- a/libmpdemux/parse_es.h
+++ b/libmpdemux/parse_es.h
@@ -1,3 +1,5 @@
+#ifndef PARSE_ES_H
+#define PARSE_ES_H
 
 #define MAX_VIDEO_PACKET_SIZE (224*1024+4)
 #define VIDEOBUFFER_SIZE 0x100000
@@ -16,3 +18,4 @@ int read_video_packet(demux_stream_t *ds);
 // return: next packet code
 int skip_video_packet(demux_stream_t *ds);
 
+#endif /* PARSE_ES_H */
diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h
index 2c04cc0847..923b431a9b 100644
--- a/libvo/jpeg_enc.h
+++ b/libvo/jpeg_enc.h
@@ -22,6 +22,8 @@
  * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf
  */
 
+#ifndef JPEG_ENC_H
+#define JPEG_ENC_H
 
 typedef struct {
 	struct MpegEncContext *s;
@@ -43,3 +45,5 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data,
 		unsigned char *u_data, unsigned char *v_data, char *bufr);
 
 void jpeg_enc_uninit(jpeg_enc_t *j);
+
+#endif /* JPEG_ENC_H */
diff --git a/libvo/osd_font.h b/libvo/osd_font.h
index cf69ebc5b3..1ba24e9056 100644
--- a/libvo/osd_font.h
+++ b/libvo/osd_font.h
@@ -1,3 +1,6 @@
+#ifndef OSD_FONT_H
+#define OSD_FONT_H
+
 const unsigned char osd_font_pfb[] = {
 0x80,0x01,0x02,0x17,0x00,0x00,0x25,0x21,0x50,0x53,0x2d,0x41,0x64,0x6f,0x62,0x65,
 0x46,0x6f,0x6e,0x74,0x2d,0x31,0x2e,0x30,0x3a,0x20,0x4f,0x53,0x44,0x20,0x31,0x2e,
@@ -520,3 +523,5 @@ const unsigned char osd_font_pfb[] = {
 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,
 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x0a,
 0x80,0x03,};
+
+#endif /* OSD_FONT_H */
diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h
index 58329dfdee..5d51909b95 100644
--- a/libvo/video_out_internal.h
+++ b/libvo/video_out_internal.h
@@ -20,6 +20,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef VIDEO_OUT_INTERNAL_H
+#define VIDEO_OUT_INTERNAL_H
+
 /* All video drivers will want this */
 #include "libmpcodecs/vfcap.h"
 #include "libmpcodecs/mp_image.h"
@@ -54,5 +57,4 @@ static int preinit(const char *);
 
 #include "osd.h"
 
-
-
+#endif /* VIDEO_OUT_INTERNAL_H */
diff --git a/libvo/videodev_mjpeg.h b/libvo/videodev_mjpeg.h
index 68fd79c576..9f8c30234c 100644
--- a/libvo/videodev_mjpeg.h
+++ b/libvo/videodev_mjpeg.h
@@ -3,6 +3,9 @@
    <rainer@johanni.de>
 */
 
+#ifndef VIDEODEV_MJPEG_H
+#define VIDEODEV_MJPEG_H
+
 /* This is identical with the mgavideo internal params struct, 
    please tell me if you change this struct here ! <gz@lysator.liu.se) */
 struct mjpeg_params
@@ -116,3 +119,5 @@ Private IOCTL to set up for displaying MJPEG
 #define MJPIOC_QBUF_PLAY      _IOW ('v', BASE_VIDIOCPRIVATE+4,  int)
 #define MJPIOC_SYNC           _IOR ('v', BASE_VIDIOCPRIVATE+5,  struct mjpeg_sync)
 #define MJPIOC_G_STATUS       _IOWR('v', BASE_VIDIOCPRIVATE+6,  struct mjpeg_status)
+
+#endif /* VIDEODEV_MJPEG_H */
diff --git a/libvo/w32_common.h b/libvo/w32_common.h
index 6d657d6b88..1dcb3e8b88 100644
--- a/libvo/w32_common.h
+++ b/libvo/w32_common.h
@@ -1,3 +1,6 @@
+#ifndef W32COMMON_H
+#define W32COMMON_H
+
 extern int vo_depthonscreen;
 extern int vo_screenwidth;
 extern int vo_screenheight;
@@ -17,3 +20,5 @@ extern int vo_w32_check_events(void);
 extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
 extern void destroyRenderingContext(void);
 extern void w32_update_xinerama_info(void);
+
+#endif /* W32COMMON_H */
diff --git a/loader/debug.h b/loader/debug.h
index 6ab7cd36f2..f9d0e6b9c4 100644
--- a/loader/debug.h
+++ b/loader/debug.h
@@ -1,3 +1,6 @@
+#ifndef DEBUG_H
+#define DEBUG_H
+
 #ifdef DEBUG
 #define TRACE printf
 #define dbg_printf printf
@@ -5,3 +8,5 @@
 #define TRACE(...)
 #define dbg_printf(...)
 #endif
+
+#endif /* DEBUG_H */
diff --git a/loader/qt_comp.h b/loader/qt_comp.h
index 7ceeb5dbbb..dc20506625 100644
--- a/loader/qt_comp.h
+++ b/loader/qt_comp.h
@@ -1,3 +1,5 @@
+#ifndef QT_COMP_H
+#define QT_COMP_H
 
 DECL_COMPONENT(sorenson3,"SMD_ComponentDispatch",1)
 DECL_COMPONENT(sorenson,"SorensonYUV9Dispatcher",1)
@@ -25,3 +27,4 @@ DECL_COMPONENT(mace3d,"Mace3DecompDispatch",0)
 
 //DECL_COMPONENT(,"",0)
 
+#endif /* QT_COMP_H */
diff --git a/loader/qt_fv.h b/loader/qt_fv.h
index 6531e4a1c1..354b12c98b 100644
--- a/loader/qt_fv.h
+++ b/loader/qt_fv.h
@@ -1,3 +1,6 @@
+#ifndef QT_FV_H
+#define QT_FV_H
+
 typedef struct qt_fv_s {
     unsigned int id;
     char* name;
@@ -1584,3 +1587,5 @@ qt_fv_t qt_fv_list[]={
 { 0x270028, "TENumStyles"},
 { 0x270029, "TEFeatureFlag"},
 { 0,NULL } };
+
+#endif /* QT_FV_H */
diff --git a/loader/qtx/qtxsdk/components.h b/loader/qtx/qtxsdk/components.h
index 4609124304..ac7d192a38 100644
--- a/loader/qtx/qtxsdk/components.h
+++ b/loader/qtx/qtxsdk/components.h
@@ -1,3 +1,6 @@
+#ifndef COMPONENTS_H
+#define COMPONENTS_H
+
 // Basic types:
 
 typedef char *                          Ptr;
@@ -739,3 +742,4 @@ static inline void dump_CodecDecompressParams(void* xxx){
 
 }
 
+#endif /* COMPONENTS_H */
diff --git a/loader/qtx/qtxsdk/select.h b/loader/qtx/qtxsdk/select.h
index 14e216528e..cf0b890224 100644
--- a/loader/qtx/qtxsdk/select.h
+++ b/loader/qtx/qtxsdk/select.h
@@ -1,3 +1,5 @@
+#ifndef SELECT_H
+#define SELECT_H
 
 enum {
     kComponentOpenSelect        = -1,                           /* ComponentInstance for this open */
@@ -66,3 +68,5 @@ enum {
     kImageCodecScheduleFrameSelect             = 0x0208,
     kImageCodecCancelTriggerSelect             = 0x0209
 };
+
+#endif /* SELECT_H */
diff --git a/m_property.h b/m_property.h
index b28b9f3b8b..d0d499623a 100644
--- a/m_property.h
+++ b/m_property.h
@@ -1,3 +1,5 @@
+#ifndef M_PROPERTY_H
+#define M_PROPERTY_H
 
 /// \defgroup Properties
 ///
@@ -198,3 +200,5 @@ int m_property_bitrate(m_option_t* prop,int action,void* arg,int rate);
 ///@}
 
 ///@}
+
+#endif /* M_PROPERTY_H */
diff --git a/mp_core.h b/mp_core.h
index 9efa0fc1cd..f7079aa7a1 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -1,3 +1,6 @@
+#ifndef MP_CORE_H
+#define MP_CORE_H
+
 // definitions used internally by the core player code
 
 #define INITED_VO 1
@@ -127,3 +130,5 @@ void exit_player_with_rc(const char* how, int rc);
 void rm_osd_msg(int id);
 void add_subtitles(char *filename, float fps, int noerr);
 int reinit_video_chain(void);
+
+#endif /* MP_CORE_H */
diff --git a/mpcommon.h b/mpcommon.h
index 49c450ae2b..853149e626 100644
--- a/mpcommon.h
+++ b/mpcommon.h
@@ -1,3 +1,6 @@
+#ifndef MPCOMMON_H
+#define MPCOMMON_H
+
 extern double sub_last_pts;
 #ifdef USE_ASS
 extern ass_track_t *ass_track;
@@ -5,3 +8,5 @@ extern ass_track_t *ass_track;
 extern subtitle *vo_sub_last;
 void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset);
 void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
+
+#endif /* MPCOMMON_H */
diff --git a/osdep/getch2.h b/osdep/getch2.h
index eb1ae49fa3..bc3402a498 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -1,6 +1,9 @@
 /* GyS-TermIO v2.0 (for GySmail v3)          (C) 1999 A'rpi/ESP-team */
 /* a very small replacement of ncurses library */
 
+#ifndef GETCH2_H
+#define GETCH2_H
+
 /* Screen size. Initialized by load_termcap() and get_screen_size() */
 extern int screen_width;
 extern int screen_height;
@@ -24,3 +27,5 @@ extern void getch2(void);
 #ifdef __MINGW32__
 extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
 #endif
+
+#endif /* GETCH2_H */
diff --git a/osdep/glob.h b/osdep/glob.h
index d65dca4142..57a2d1f949 100644
--- a/osdep/glob.h
+++ b/osdep/glob.h
@@ -1,3 +1,6 @@
+#ifndef GLOB_H
+#define GLOB_H
+
 #include "config.h"
 
 typedef struct {
@@ -9,3 +12,5 @@ typedef struct {
 void globfree(glob_t *pglob);
 
 int  glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);
+
+#endif /* GLOB_H */
diff --git a/osdep/keycodes.h b/osdep/keycodes.h
index 306227743d..fdd6343f78 100644
--- a/osdep/keycodes.h
+++ b/osdep/keycodes.h
@@ -1,5 +1,8 @@
 /*  KEY code definitions for GyS-TermIO v2.0  (C) 1999 A'rpi/ESP-team */
 
+#ifndef KEYCODES_H
+#define KEYCODES_H
+
 #define KEY_ENTER 13
 #define KEY_TAB 9
 
@@ -70,3 +73,5 @@
 /* Special keys */
 #define KEY_INTERN (0x1000)
 #define KEY_CLOSE_WIN (KEY_INTERN+0)
+
+#endif /* KEYCODES_H */
diff --git a/osdep/shmem.h b/osdep/shmem.h
index f3ed9b26bb..8d71288b97 100644
--- a/osdep/shmem.h
+++ b/osdep/shmem.h
@@ -1,4 +1,7 @@
+#ifndef SHMEM_H
+#define SHMEM_H
 
 void* shmem_alloc(int size);
 void shmem_free(void* p,int size);
 
+#endif /* SHMEM_H */
diff --git a/parser-mecmd.h b/parser-mecmd.h
index 73da87fd5b..7323b16ee5 100644
--- a/parser-mecmd.h
+++ b/parser-mecmd.h
@@ -1,3 +1,5 @@
+#ifndef PARSER_MECMD_H
+#define PARSER_MECMD_H
 
 /// \file
 /// \ingroup ConfigParsers MEntry
@@ -29,3 +31,5 @@ m_entry_t*
 m_config_parse_me_command_line(m_config_t *config, int argc, char **argv);
 
 ///@}
+
+#endif /* PARSER_MECMD_H */
diff --git a/stream/frequencies.h b/stream/frequencies.h
index 13cf111f44..234a2adb86 100644
--- a/stream/frequencies.h
+++ b/stream/frequencies.h
@@ -5,6 +5,10 @@
  *
  * Frequencies are given in kHz 
  */
+
+#ifndef FREQUENCIES_H
+#define FREQUENCIES_H
+
 #define NTSC_AUDIO_CARRIER	4500
 #define PAL_AUDIO_CARRIER_I	6000
 #define PAL_AUDIO_CARRIER_BGHN	5500
@@ -109,3 +113,5 @@ extern const struct CHANLISTS   chanlists[];
 extern int                chantab;
 extern const struct CHANLIST *chanlist;
 extern int                chancount;
+
+#endif /* FREQUENCIES_H */
diff --git a/stream/netstream.h b/stream/netstream.h
index 61abfc8e8a..75fe94cdd5 100644
--- a/stream/netstream.h
+++ b/stream/netstream.h
@@ -7,6 +7,9 @@
  * Data is always low endian
  */
 
+#ifndef NETSTREAM_H
+#define NETSTREAM_H
+
 typedef struct mp_net_stream_packet_st {
   uint16_t len;
   uint8_t cmd;
@@ -134,3 +137,5 @@ static void net_stream_opened_2_me(mp_net_stream_opened_t* o) {
   o->start_pos = le2me_64(o->start_pos);
   o->end_pos = le2me_64(o->end_pos);
 }
+
+#endif /* NETSTREAM_H */
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 89987a88bd..020c45f8b7 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -1,3 +1,6 @@
+#ifndef STREAM_DVD_H
+#define STREAM_DVD_H
+
 #ifdef USE_DVDREAD_INTERNAL
 #include "dvdread/dvd_reader.h"
 #include "dvdread/ifo_types.h"
@@ -44,3 +47,5 @@ int dvd_lang_from_sid(stream_t *stream, int id);
 int dvd_aid_from_lang(stream_t *stream, unsigned char* lang);
 int dvd_sid_from_lang(stream_t *stream, unsigned char* lang);
 int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
+
+#endif /* STREAM_DVD_H */
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index ff3fc745f5..30a2a10fbc 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -1 +1,6 @@
+#ifndef STREAM_DVD_COMMON_H
+#define STREAM_DVD_COMMON_H
+
 int mp_dvdtimetomsec(dvd_time_t *dt);
+
+#endif /* STREAM_DVD_COMMON_H */
diff --git a/vidix/AsmMacros.h b/vidix/AsmMacros.h
index 5e4e1addc4..b6b5f99f8f 100644
--- a/vidix/AsmMacros.h
+++ b/vidix/AsmMacros.h
@@ -63,6 +63,9 @@
  *   Modified for readability by Nick Kurshev
 */
 
+#ifndef ASMMACROS_H
+#define ASMMACROS_H
+
 #if defined(__GNUC__)
 #if defined(__alpha__)
 #include "sysdep/AsmMacros_alpha.h"
@@ -115,3 +118,5 @@ void outl(U16_t, U32_t);
 
 #endif /* _MINIX and _ACK */
 #endif /* __GNUC__ */
+
+#endif /* ASMMACROS_H */
diff --git a/vidix/cyberblade_regs.h b/vidix/cyberblade_regs.h
index 049fde6aa5..b4411c3d90 100644
--- a/vidix/cyberblade_regs.h
+++ b/vidix/cyberblade_regs.h
@@ -23,6 +23,9 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.22 2002/01/11 13:06:30 alanh Exp $ */
 
+#ifndef CYBERBLADE_REGS_H
+#define CYBERBLADE_REGS_H
+
 #define DEBUG 1
 
 #define NTSC 14.31818
@@ -134,3 +137,4 @@
 
 /* --- */
 
+#endif /* CYBERBLADE_REGS_H */
diff --git a/vidix/dhahelperwin/ntverp.h b/vidix/dhahelperwin/ntverp.h
index bfcc43240d..807f123055 100644
--- a/vidix/dhahelperwin/ntverp.h
+++ b/vidix/dhahelperwin/ntverp.h
@@ -13,6 +13,9 @@
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)

  */

 

+#ifndef NTVERP_H

+#define NTVERP_H

+

 //

 // Windows NT Build 3790.1830

 //

@@ -149,3 +152,5 @@
     "ReactOS(R) Operating System"

 #define VER_LEGALTRADEMARKS_STR             \

     "ReactOS(R) is a registered trademark of the ReactOS Foundation."

+

+#define /* NTVERP_H */

diff --git a/xvmc_render.h b/xvmc_render.h
index 0283ffaea8..f43a9c8d67 100644
--- a/xvmc_render.h
+++ b/xvmc_render.h
@@ -1,3 +1,6 @@
+#ifndef XVMC_RENDER_H
+#define 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 /* XVMC_RENDER_H */