From: Guillaume Poirier <gpoirier@mplayerhq.hu>
Date: Thu, 24 Apr 2008 12:44:24 +0000 (+0200)
Subject: fix illegal identifiers in multiple inclusion guards
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ee9642aef80b64f7b726ad245e6ab2ea631e896;p=libx264

fix illegal identifiers in multiple inclusion guards
patch by Diego Biurrun % diego A biurrun P de %
---

diff --git a/common/bs.h b/common/bs.h
index fa4002dd..22f53474 100644
--- a/common/bs.h
+++ b/common/bs.h
@@ -21,10 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifdef _BS_H
-#warning FIXME Multiple inclusion of bs.h
-#else
-#define _BS_H
+#ifndef X264_BS_H
+#define X264_BS_H
 
 typedef struct bs_s
 {
diff --git a/common/cabac.h b/common/cabac.h
index 091992fd..bfdc5b3f 100644
--- a/common/cabac.h
+++ b/common/cabac.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _CABAC_H
-#define _CABAC_H 1
+#ifndef X264_CABAC_H
+#define X264_CABAC_H
 
 typedef struct
 {
diff --git a/common/common.h b/common/common.h
index b9f4869f..5adcefcc 100644
--- a/common/common.h
+++ b/common/common.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _COMMON_H
-#define _COMMON_H 1
+#ifndef X264_COMMON_H
+#define X264_COMMON_H
 
 /****************************************************************************
  * Macros
diff --git a/common/cpu.h b/common/cpu.h
index 3be940b5..e78148ad 100644
--- a/common/cpu.h
+++ b/common/cpu.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _CPU_H
-#define _CPU_H 1
+#ifndef X264_CPU_H
+#define X264_CPU_H
 
 uint32_t x264_cpu_detect( void );
 int      x264_cpu_num_processors( void );
diff --git a/common/dct.h b/common/dct.h
index 38aa0788..ee9d7d1e 100644
--- a/common/dct.h
+++ b/common/dct.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _DCT_H
-#define _DCT_H 1
+#ifndef X264_DCT_H
+#define X264_DCT_H
 
 /* the inverse of the scaling factors introduced by 8x8 fdct */
 #define W(i) (i==0 ? FIX8(1.0000) :\
diff --git a/common/display.h b/common/display.h
index 6f2db0c7..31dcc289 100644
--- a/common/display.h
+++ b/common/display.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _DISPLAY_H
-#define _DISPLAY_H 1
+#ifndef X264_DISPLAY_H
+#define X264_DISPLAY_H
 
 void disp_sync(void);
 void disp_setcolor(unsigned char *name);
diff --git a/common/frame.h b/common/frame.h
index 6c8f991d..1cd7b645 100644
--- a/common/frame.h
+++ b/common/frame.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _FRAME_H
-#define _FRAME_H 1
+#ifndef X264_FRAME_H
+#define X264_FRAME_H
 
 /* number of pixels past the edge of the frame, for motion estimation/compensation */
 #define PADH 32
diff --git a/common/macroblock.h b/common/macroblock.h
index 442ce2a7..e127e2b7 100644
--- a/common/macroblock.h
+++ b/common/macroblock.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MACROBLOCK_H
-#define _MACROBLOCK_H 1
+#ifndef X264_MACROBLOCK_H
+#define X264_MACROBLOCK_H
 
 enum macroblock_position_e
 {
diff --git a/common/mc.h b/common/mc.h
index b2f5ed28..83b3e907 100644
--- a/common/mc.h
+++ b/common/mc.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MC_H
-#define _MC_H 1
+#ifndef X264_MC_H
+#define X264_MC_H
 
 /* Do the MC
  * XXX: Only width = 4, 8 or 16 are valid
diff --git a/common/osdep.h b/common/osdep.h
index 98170728..d914e784 100644
--- a/common/osdep.h
+++ b/common/osdep.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _OSDEP_H
-#define _OSDEP_H
+#ifndef X264_OSDEP_H
+#define X264_OSDEP_H
 
 #define _LARGEFILE_SOURCE 1
 #define _FILE_OFFSET_BITS 64
@@ -127,4 +127,4 @@
 #define x264_pthread_cond_wait(c,m)  usleep(100)
 #endif
 
-#endif //_OSDEP_H
+#endif /* X264_OSDEP_H */
diff --git a/common/pixel.h b/common/pixel.h
index d533620c..c95a3046 100644
--- a/common/pixel.h
+++ b/common/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PIXEL_H
-#define _PIXEL_H 1
+#ifndef X264_PIXEL_H
+#define X264_PIXEL_H
 
 // SSD assumes all args aligned
 // other cmp functions assume first arg aligned
diff --git a/common/ppc/dct.h b/common/ppc/dct.h
index 4902de57..859e4ea8 100644
--- a/common/ppc/dct.h
+++ b/common/ppc/dct.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_DCT_H
-#define _PPC_DCT_H 1
+#ifndef X264_PPC_DCT_H
+#define X264_PPC_DCT_H
 
 void x264_sub4x4_dct_altivec( int16_t dct[4][4],
         uint8_t *pix1, uint8_t *pix2 );
diff --git a/common/ppc/mc.h b/common/ppc/mc.h
index e3779217..a15e614d 100644
--- a/common/ppc/mc.h
+++ b/common/ppc/mc.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_MC_H
-#define _PPC_MC_H 1
+#ifndef X264_PPC_MC_H
+#define X264_PPC_MC_H
 
 void x264_mc_altivec_init( x264_mc_functions_t *pf );
 
diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h
index f2d6a181..b62e3a7e 100644
--- a/common/ppc/pixel.h
+++ b/common/ppc/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PPC_PIXEL_H
-#define _PPC_PIXEL_H 1
+#ifndef X264_PPC_PIXEL_H
+#define X264_PPC_PIXEL_H
 
 void x264_pixel_altivec_init( x264_pixel_function_t *pixf );
 
diff --git a/common/ppc/predict.h b/common/ppc/predict.h
index d78d0169..9a62ac82 100644
--- a/common/ppc/predict.h
+++ b/common/ppc/predict.h
@@ -20,9 +20,9 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ALTIVEC_PREDICT_H
-#define _ALTIVEC_PREDICT_H 1
+#ifndef X264_ALTIVEC_PREDICT_H
+#define X264_ALTIVEC_PREDICT_H
 
 void x264_predict_16x16_init_altivec ( x264_predict_t pf[7] );
 
-#endif // _ALTIVEC_PREDICT_H
+#endif /* X264_ALTIVEC_PREDICT_H */
diff --git a/common/ppc/quant.h b/common/ppc/quant.h
index f10955a8..1ec534c7 100644
--- a/common/ppc/quant.h
+++ b/common/ppc/quant.h
@@ -18,8 +18,8 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
 *****************************************************************************/
 
-#ifndef _PPC_QUANT_H
-#define _PPC_QUANT_H 1
+#ifndef X264_PPC_QUANT_H
+#define X264_PPC_QUANT_H
 
 void x264_quant_4x4_altivec( int16_t dct[4][4], uint16_t mf[16], uint16_t bias[16] );
 void x264_quant_8x8_altivec( int16_t dct[8][8], uint16_t mf[64], uint16_t bias[64] );
diff --git a/common/predict.h b/common/predict.h
index b034c04e..b9221680 100644
--- a/common/predict.h
+++ b/common/predict.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _PREDICT_H
-#define _PREDICT_H 1
+#ifndef X264_PREDICT_H
+#define X264_PREDICT_H
 
 typedef void (*x264_predict_t)( uint8_t *src );
 typedef void (*x264_predict8x8_t)( uint8_t *src, uint8_t edge[33] );
diff --git a/common/quant.h b/common/quant.h
index 0fe7d0c9..2e48c48d 100644
--- a/common/quant.h
+++ b/common/quant.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _QUANT_H
-#define _QUANT_H 1
+#ifndef X264_QUANT_H
+#define X264_QUANT_H
 
 typedef struct
 {
diff --git a/common/set.h b/common/set.h
index a018e7a0..e6173b0b 100644
--- a/common/set.h
+++ b/common/set.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _SET_H
-#define _SET_H 1
+#ifndef X264_SET_H
+#define X264_SET_H
 
 enum profile_e
 {
diff --git a/common/sparc/pixel.h b/common/sparc/pixel.h
index ee392c12..07af6843 100644
--- a/common/sparc/pixel.h
+++ b/common/sparc/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _SPARC_PIXEL_H
-#define _SPARC_PIXEL_H 1
+#ifndef X264_SPARC_PIXEL_H
+#define X264_SPARC_PIXEL_H
 
 int x264_pixel_sad_8x8_vis( uint8_t *, int, uint8_t *, int );
 int x264_pixel_sad_8x16_vis( uint8_t *, int, uint8_t *, int );
diff --git a/common/visualize.h b/common/visualize.h
index 92c8b008..34adccac 100644
--- a/common/visualize.h
+++ b/common/visualize.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _VISUALIZE_H
-#define _VISUALIZE_H 1
+#ifndef X264_VISUALIZE_H
+#define X264_VISUALIZE_H
 
 #include "common/common.h"
 
diff --git a/common/x86/dct.h b/common/x86/dct.h
index 7dd60e8e..859937c4 100644
--- a/common/x86/dct.h
+++ b/common/x86/dct.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_DCT_H
-#define _I386_DCT_H 1
+#ifndef X264_I386_DCT_H
+#define X264_I386_DCT_H
 
 void x264_sub4x4_dct_mmx( int16_t dct[4][4],  uint8_t *pix1, uint8_t *pix2 );
 void x264_sub8x8_dct_mmx( int16_t dct[4][4][4],  uint8_t *pix1, uint8_t *pix2 );
diff --git a/common/x86/mc.h b/common/x86/mc.h
index 7006aeae..c5d18659 100644
--- a/common/x86/mc.h
+++ b/common/x86/mc.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_MC_H
-#define _I386_MC_H 1
+#ifndef X264_I386_MC_H
+#define X264_I386_MC_H
 
 void x264_mc_init_mmx( int cpu, x264_mc_functions_t *pf );
 
diff --git a/common/x86/pixel.h b/common/x86/pixel.h
index bc4ee965..fcacaf22 100644
--- a/common/x86/pixel.h
+++ b/common/x86/pixel.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_PIXEL_H
-#define _I386_PIXEL_H 1
+#ifndef X264_I386_PIXEL_H
+#define X264_I386_PIXEL_H
 
 #define DECL_PIXELS( ret, name, suffix, args ) \
     ret x264_pixel_##name##_16x16_##suffix args;\
diff --git a/common/x86/predict.h b/common/x86/predict.h
index 9310313e..761aa58a 100644
--- a/common/x86/predict.h
+++ b/common/x86/predict.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_PREDICT_H
-#define _I386_PREDICT_H 1
+#ifndef X264_I386_PREDICT_H
+#define X264_I386_PREDICT_H
 
 void x264_predict_16x16_init_mmx ( int cpu, x264_predict_t pf[7] );
 void x264_predict_8x8c_init_mmx  ( int cpu, x264_predict_t pf[7] );
diff --git a/common/x86/quant.h b/common/x86/quant.h
index f860f6ab..42c9817e 100644
--- a/common/x86/quant.h
+++ b/common/x86/quant.h
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _I386_QUANT_H
-#define _I386_QUANT_H 1
+#ifndef X264_I386_QUANT_H
+#define X264_I386_QUANT_H
 
 void x264_quant_2x2_dc_mmxext( int16_t dct[2][2], int mf, int bias );
 void x264_quant_4x4_dc_mmxext( int16_t dct[4][4], int mf, int bias );
diff --git a/encoder/analyse.h b/encoder/analyse.h
index d68e7d6b..11995933 100644
--- a/encoder/analyse.h
+++ b/encoder/analyse.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ANALYSE_H
-#define _ANALYSE_H 1
+#ifndef X264_ANALYSE_H
+#define X264_ANALYSE_H
 
 void x264_macroblock_analyse( x264_t *h );
 void x264_slicetype_decide( x264_t *h );
diff --git a/encoder/macroblock.h b/encoder/macroblock.h
index ee69d407..e80995d7 100644
--- a/encoder/macroblock.h
+++ b/encoder/macroblock.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ENCODER_MACROBLOCK_H
-#define _ENCODER_MACROBLOCK_H 1
+#ifndef X264_ENCODER_MACROBLOCK_H
+#define X264_ENCODER_MACROBLOCK_H
 
 #include "common/macroblock.h"
 
diff --git a/encoder/me.h b/encoder/me.h
index e9760930..295dd14a 100644
--- a/encoder/me.h
+++ b/encoder/me.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ME_H
-#define _ME_H 1
+#ifndef X264_ME_H
+#define X264_ME_H
 
 #define COST_MAX (1<<28)
 
diff --git a/encoder/ratecontrol.h b/encoder/ratecontrol.h
index 2aabda7e..c55fd54c 100644
--- a/encoder/ratecontrol.h
+++ b/encoder/ratecontrol.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _RATECONTROL_H
-#define _RATECONTROL_H 1
+#ifndef X264_RATECONTROL_H
+#define X264_RATECONTROL_H
 
 int  x264_ratecontrol_new   ( x264_t * );
 void x264_ratecontrol_delete( x264_t * );
diff --git a/encoder/set.h b/encoder/set.h
index dac2d2fc..6672b449 100644
--- a/encoder/set.h
+++ b/encoder/set.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _ENCODER_SET_H
-#define _ENCODER_SET_H 1
+#ifndef X264_ENCODER_SET_H
+#define X264_ENCODER_SET_H
 
 void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param );
 void x264_sps_write( bs_t *s, x264_sps_t *sps );
diff --git a/gtk/x264_gtk.h b/gtk/x264_gtk.h
index c57c89a2..7174e6a5 100644
--- a/gtk/x264_gtk.h
+++ b/gtk/x264_gtk.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_H__
-#define __X264_GTK_H__
+#ifndef X264_GTK_H
+#define X264_GTK_H
 
 
 #include "x264_gtk_enum.h"
@@ -108,4 +108,4 @@ void          x264_gtk_shutdown (GtkWidget *dialog);
 void          x264_gtk_free (X264_Gtk *x264_gtk);
 
 
-#endif /* __X264_GTK_H__ */
+#endif /* X264_GTK_H */
diff --git a/gtk/x264_gtk_bitrate.h b/gtk/x264_gtk_bitrate.h
index f44937b5..98993ef9 100644
--- a/gtk/x264_gtk_bitrate.h
+++ b/gtk/x264_gtk_bitrate.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_BITRATE_H__
-#define __X264_GTK_BITRATE_H__
+#ifndef X264_GTK_BITRATE_H
+#define X264_GTK_BITRATE_H
 
 
 GtkWidget *_bitrate_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_BITRATE_H__ */
+#endif /* X264_GTK_BITRATE_H */
diff --git a/gtk/x264_gtk_cqm.h b/gtk/x264_gtk_cqm.h
index 8f6ebe1b..ea1633e2 100644
--- a/gtk/x264_gtk_cqm.h
+++ b/gtk/x264_gtk_cqm.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_CQM_H__
-#define __X264_GTK_CQM_H__
+#ifndef X264_GTK_CQM_H
+#define X264_GTK_CQM_H
 
 
 GtkWidget *_cqm_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_CQM_H__ */
+#endif /* X264_GTK_CQM_H */
diff --git a/gtk/x264_gtk_demuxers.h b/gtk/x264_gtk_demuxers.h
index 47fb38c4..de9ab016 100644
--- a/gtk/x264_gtk_demuxers.h
+++ b/gtk/x264_gtk_demuxers.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_MUXERS_H__
-#define __X264_GTK_MUXERS_H__
+#ifndef X264_GTK_MUXERS_H
+#define X264_GTK_MUXERS_H
 
 #include "../config.h"
 #include "../muxers.h"
@@ -15,4 +15,4 @@ typedef enum {
 } X264_Demuxer_Type;
 /* static int X264_Num_Demuxers = (int)X264_DEMUXER_UNKOWN; */
 
-#endif  /* __X264_GTK_MUXERS_H__ */
+#endif  /* X264_GTK_MUXERS_H */
diff --git a/gtk/x264_gtk_encode_encode.h b/gtk/x264_gtk_encode_encode.h
index e0754802..e1a31b1e 100644
--- a/gtk/x264_gtk_encode_encode.h
+++ b/gtk/x264_gtk_encode_encode.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_ENCODE_H__
-#define __X264_GTK_ENCODE_ENCODE_H__
+#ifndef X264_GTK_ENCODE_ENCODE_H
+#define X264_GTK_ENCODE_ENCODE_H
 
 
 gpointer x264_gtk_encode_encode (X264_Thread_Data *thread_data);
 
 
-#endif /* __X264_GTK_ENCODE_ENCODE_H__ */
+#endif /* X264_GTK_ENCODE_ENCODE_H */
diff --git a/gtk/x264_gtk_encode_main_window.h b/gtk/x264_gtk_encode_main_window.h
index 87af2dc7..6b5ad004 100644
--- a/gtk/x264_gtk_encode_main_window.h
+++ b/gtk/x264_gtk_encode_main_window.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_MAIN_WINDOW_H__
-#define __X264_GTK_ENCODE_MAIN_WINDOW_H__
+#ifndef X264_GTK_ENCODE_MAIN_WINDOW_H
+#define X264_GTK_ENCODE_MAIN_WINDOW_H
 
 
 void x264_gtk_encode_main_window ();
 
 
-#endif /* __X264_GTK_ENCODE_MAIN_WINDOW_H__ */
+#endif /* X264_GTK_ENCODE_MAIN_WINDOW_H */
diff --git a/gtk/x264_gtk_encode_private.h b/gtk/x264_gtk_encode_private.h
index a90dd3ea..cebfc4ae 100644
--- a/gtk/x264_gtk_encode_private.h
+++ b/gtk/x264_gtk_encode_private.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_ENCODE_PRIVATE_H__
-#define __X264_GTK_ENCODE_PRIVATE_H__
+#ifndef X264_GTK_ENCODE_PRIVATE_H
+#define X264_GTK_ENCODE_PRIVATE_H
 
 
 #define __UNUSED__ __attribute__((unused))
@@ -43,4 +43,4 @@ struct X264_Pipe_Data_
 };
 
 
-#endif /* __X264_GTK_ENCODE_PRIVATE_H__ */
+#endif /* X264_GTK_ENCODE_PRIVATE_H */
diff --git a/gtk/x264_gtk_encode_status_window.h b/gtk/x264_gtk_encode_status_window.h
index 13ce0351..ae657e5d 100644
--- a/gtk/x264_gtk_encode_status_window.h
+++ b/gtk/x264_gtk_encode_status_window.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_ENCODE_STATUS_WINDOW_H__
-#define __X264_GTK_ENCODE_STATUS_WINDOW_H__
+#ifndef X264_GTK_ENCODE_STATUS_WINDOW_H
+#define X264_GTK_ENCODE_STATUS_WINDOW_H
 
 
 GtkWidget *x264_gtk_encode_status_window (X264_Thread_Data *thread_data);
 
 
-#endif /* __X264_GTK_ENCODE_STATUS_WINDOW_H__ */
+#endif /* X264_GTK_ENCODE_STATUS_WINDOW_H */
diff --git a/gtk/x264_gtk_enum.h b/gtk/x264_gtk_enum.h
index 9e498cab..99e0048c 100644
--- a/gtk/x264_gtk_enum.h
+++ b/gtk/x264_gtk_enum.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_ENUM_H__
-#define __X264_GTK_ENUM_H__
+#ifndef X264_GTK_ENUM_H
+#define X264_GTK_ENUM_H
 
 typedef enum
 {
@@ -54,4 +54,4 @@ typedef enum
 }X264_Cqm_Preset;
 
 
-#endif /* __X264_GTK_ENUM_H__ */
+#endif /* X264_GTK_ENUM_H */
diff --git a/gtk/x264_gtk_i18n.h b/gtk/x264_gtk_i18n.h
index 1fa46e86..f3e5129a 100644
--- a/gtk/x264_gtk_i18n.h
+++ b/gtk/x264_gtk_i18n.h
@@ -1,5 +1,5 @@
-#ifndef _X264_GTK_I18N_
-#define _X264_GTK_I18N_
+#ifndef X264_GTK_I18N_H
+#define X264_GTK_I18N_H
 
 
 #include <libintl.h>
@@ -8,7 +8,7 @@
 #define _(X) gettext(X)
 #define GETTEXT_DOMAIN "x264_gtk"
 
-#ifdef __X264_GTK_PRIVATE_H__
+#ifdef X264_GTK_PRIVATE_H
 /* x264_path must be known for this to work */
 #  define BIND_X264_TEXTDOMAIN()                        \
   gchar* _tmp = x264_gtk_path("locale");                    \
@@ -21,4 +21,4 @@
 #endif
 
 
-#endif /* _X264_GTK_I18N_ */
+#endif /* X264_GTK_I18N_H */
diff --git a/gtk/x264_gtk_mb.h b/gtk/x264_gtk_mb.h
index 4649624a..0e7a3646 100644
--- a/gtk/x264_gtk_mb.h
+++ b/gtk/x264_gtk_mb.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_MB_H__
-#define __X264_GTK_MB_H__
+#ifndef X264_GTK_MB_H
+#define X264_GTK_MB_H
 
 
 GtkWidget *_mb_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_MB_H__ */
+#endif /* X264_GTK_MB_H */
diff --git a/gtk/x264_gtk_more.h b/gtk/x264_gtk_more.h
index f94134d9..cf88b289 100644
--- a/gtk/x264_gtk_more.h
+++ b/gtk/x264_gtk_more.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_MORE_H__
-#define __X264_GTK_MORE_H__
+#ifndef X264_GTK_MORE_H
+#define X264_GTK_MORE_H
 
 
 GtkWidget *_more_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_MORE_H__ */
+#endif /* X264_GTK_MORE_H */
diff --git a/gtk/x264_gtk_private.h b/gtk/x264_gtk_private.h
index 6d08f53f..8b8f4753 100644
--- a/gtk/x264_gtk_private.h
+++ b/gtk/x264_gtk_private.h
@@ -1,5 +1,5 @@
-#ifndef __X264_GTK_PRIVATE_H__
-#define __X264_GTK_PRIVATE_H__
+#ifndef X264_GTK_PRIVATE_H
+#define X264_GTK_PRIVATE_H
 
 
 #define __UNUSED__ __attribute__((unused))
@@ -171,4 +171,4 @@ struct X264_Gui_Zone_
 gchar *x264_gtk_path (const char* more_path);
 
 
-#endif /* __X264_GTK_PRIVATE_H__ */
+#endif /* X264_GTK_PRIVATE_H */
diff --git a/gtk/x264_gtk_rc.h b/gtk/x264_gtk_rc.h
index 865196f0..b2aa9e86 100644
--- a/gtk/x264_gtk_rc.h
+++ b/gtk/x264_gtk_rc.h
@@ -1,8 +1,8 @@
-#ifndef __X264_GTK_RC_H__
-#define __X264_GTK_RC_H__
+#ifndef X264_GTK_RC_H
+#define X264_GTK_RC_H
 
 
 GtkWidget *_rate_control_page (X264_Gui_Config *config);
 
 
-#endif /* __X264_GTK_RC_H__ */
+#endif /* X264_GTK_RC_H */
diff --git a/matroska.h b/matroska.h
index ee95d0b1..a23c43e6 100644
--- a/matroska.h
+++ b/matroska.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _MATROSKA_H
-#define _MATROSKA_H 1
+#ifndef X264_MATROSKA_H
+#define X264_MATROSKA_H
 
 typedef struct mk_Writer mk_Writer;
 
diff --git a/muxers.h b/muxers.h
index eef40cd4..372aa639 100644
--- a/muxers.h
+++ b/muxers.h
@@ -1,5 +1,5 @@
-#ifndef _X264_MUXERS_H_
-#define _X264_MUXERS_H_
+#ifndef X264_MUXERS_H
+#define X264_MUXERS_H
 
 typedef void *hnd_t;
 
diff --git a/x264.h b/x264.h
index e49f1a4c..d2c65103 100644
--- a/x264.h
+++ b/x264.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-#ifndef _X264_H
-#define _X264_H 1
+#ifndef X264_X264_H
+#define X264_X264_H
 
 #if !defined(_STDINT_H) && !defined(_STDINT_H_) && \
     !defined(_INTTYPES_H) && !defined(_INTTYPES_H_)