*.h: Revert indenting

Original commit message from CVS:
* *.h: Revert indenting

23 files changed, 591 insertions, 619 deletions

diff --git a/ext/aalib/gstaasink.h b/ext/aalib/gstaasink.h
index d11ff20e..e50362f6 100644
--- a/ext/aalib/gstaasink.h
+++ b/ext/aalib/gstaasink.h
@@ -26,9 +26,8 @@
 #include <aalib.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_AASINK \
@@ -42,51 +41,48 @@ extern "C"
 #define GST_IS_AASINK_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AASINK))
 
-  typedef enum
-  {
-    GST_AASINK_OPEN = GST_ELEMENT_FLAG_LAST,
+typedef enum {
+  GST_AASINK_OPEN              = GST_ELEMENT_FLAG_LAST,
 
-    GST_AASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
-  } GstAASinkFlags;
+  GST_AASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+} GstAASinkFlags;
 
-  typedef struct _GstAASink GstAASink;
-  typedef struct _GstAASinkClass GstAASinkClass;
+typedef struct _GstAASink GstAASink;
+typedef struct _GstAASinkClass GstAASinkClass;
 
-  struct _GstAASink
-  {
-    GstElement element;
+struct _GstAASink {
+  GstElement element;
 
-    GstPad *sinkpad;
+  GstPad *sinkpad;
 
-    gulong format;
-    gint width, height;
+  gulong format;
+  gint width, height;
 
-    gint frames_displayed;
-    guint64 frame_time;
+  gint frames_displayed;
+  guint64 frame_time;
 
-    GstClock *clock;
+  GstClock *clock;
 
-    aa_context *context;
-    struct aa_hardware_params ascii_surf;
-    struct aa_renderparams ascii_parms;
-    aa_palette palette;
-    gint aa_driver;
-  };
+  aa_context *context;
+  struct aa_hardware_params ascii_surf;
+  struct aa_renderparams ascii_parms;
+  aa_palette palette;
+  gint aa_driver;
+};
 
-  struct _GstAASinkClass
-  {
-    GstElementClass parent_class;
+struct _GstAASinkClass {
+  GstElementClass parent_class;
 
-    /* signals */
-    void (*frame_displayed) (GstElement * element);
-    void (*have_size) (GstElement * element, guint width, guint height);
-  };
+  /* signals */
+  void (*frame_displayed) (GstElement *element);
+  void (*have_size) 	  (GstElement *element, guint width, guint height);
+};
 
-  GType gst_aasink_get_type (void);
+GType gst_aasink_get_type(void);
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_AASINKE_H__ */
+#endif /* __GST_AASINKE_H__ */
diff --git a/ext/dv/gstdvdec.h b/ext/dv/gstdvdec.h
index 6052c76f..4dffd96f 100644
--- a/ext/dv/gstdvdec.h
+++ b/ext/dv/gstdvdec.h
@@ -24,9 +24,8 @@
 #include <gst/gst.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #include <libdv/dv.h>
@@ -34,55 +33,55 @@ extern "C"
 
 
 /* This is the definition of the element's object structure. */
-  typedef struct _GstDVDec GstDVDec;
+typedef struct _GstDVDec GstDVDec;
 
 /* The structure itself is derived from GstElement, as can be seen by the
  * fact that there's a complete instance of the GstElement structure at
  * the beginning of the object.  This allows the element to be cast to
  * an Element or even an Object.
  */
-  struct _GstDVDec
-  {
-    GstElement element;
-
-    /* We need to keep track of our pads, so we do so here. */
-    GstPad *sinkpad, *videosrcpad, *audiosrcpad;
-
-    dv_decoder_t *decoder;
-    gboolean clamp_luma;
-    gboolean clamp_chroma;
-    gint quality;
-
-    GstByteStream *bs;
-    dv_color_space_t space;
-    gint bpp;
-    gboolean PAL;
-    gdouble framerate;
-    gint height;
-    gint frequency;
-    gint channels;
-
-    gint length;
-    guint64 next_ts;
-    guint64 end_position;
-    gboolean need_discont;
-    gboolean loop;
-
-    gboolean found_header;
-
-    gint16 *audio_buffers[4];
-  };
+struct _GstDVDec {
+  GstElement 	 element;
+
+  /* We need to keep track of our pads, so we do so here. */
+  GstPad 	*sinkpad,
+  		*videosrcpad,
+		  *audiosrcpad;
+
+  dv_decoder_t 	*decoder;
+  gboolean	 clamp_luma;
+  gboolean	 clamp_chroma;
+  gint		 quality;
+
+  GstByteStream *bs;
+  dv_color_space_t space;
+  gint 		 bpp;
+  gboolean PAL;
+  gdouble	 framerate;
+  gint		 height;
+  gint     frequency;
+  gint     channels;
+  
+  gint 		 length;
+  guint64	 next_ts;
+  guint64	 end_position;
+  gboolean	 need_discont;
+  gboolean	 loop;
+  
+  gboolean found_header;
+
+  gint16 	*audio_buffers[4];
+};
 
 /* The other half of the object is its class.  The class also derives from
  * the same parent, though it must be the class structure this time.
  * Function pointers for polymophic methods and signals are placed in this
  * structure. */
-  typedef struct _GstDVDecClass GstDVDecClass;
+typedef struct _GstDVDecClass GstDVDecClass;
 
-  struct _GstDVDecClass
-  {
-    GstElementClass parent_class;
-  };
+struct _GstDVDecClass {
+  GstElementClass parent_class;
+};
 
 /* Five standard preprocessing macros are used in the Gtk+ object system.
  * The first uses the object's _get_type function to return the GType
@@ -108,12 +107,12 @@ extern "C"
 /* This is the only prototype needed, because it is used in the above
  * GST_TYPE_DVDEC macro.
  */
-  GType gst_dvdec_get_type (void);
+GType gst_dvdec_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_DVDEC_H__ */
+#endif /* __GST_DVDEC_H__ */
diff --git a/ext/esd/esdmon.h b/ext/esd/esdmon.h
index 5b8c7e49..f50e6544 100644
--- a/ext/esd/esdmon.h
+++ b/ext/esd/esdmon.h
@@ -26,6 +26,7 @@
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
+
 #define GST_TYPE_ESDMON \
   (gst_esdmon_get_type())
 #define GST_ESDMON(obj) \
@@ -36,22 +37,21 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDMON))
 #define GST_IS_ESDMON_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDMON))
-    typedef enum
-{
-  GST_ESDMON_OPEN = GST_ELEMENT_FLAG_LAST,
-  GST_ESDMON_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+
+typedef enum {
+  GST_ESDMON_OPEN            = GST_ELEMENT_FLAG_LAST,
+  GST_ESDMON_FLAG_LAST       = GST_ELEMENT_FLAG_LAST+2,
 } GstEsdSrcFlags;
 
 typedef struct _GstEsdmon GstEsdmon;
 typedef struct _GstEsdmonClass GstEsdmonClass;
 
-struct _GstEsdmon
-{
+struct _GstEsdmon {
   GstElement element;
 
   GstPad *srcpad;
 
-  gchar *host;
+  gchar* host;
 
   int fd;
 
@@ -65,13 +65,14 @@ struct _GstEsdmon
   guint64 bytes_per_read;
 };
 
-struct _GstEsdmonClass
-{
+struct _GstEsdmonClass {
   GstElementClass parent_class;
 };
 
-GType gst_esdmon_get_type (void);
-gboolean gst_esdmon_factory_init (GstPlugin * plugin);
+GType gst_esdmon_get_type(void);
+gboolean gst_esdmon_factory_init(GstPlugin *plugin);
 
 G_END_DECLS
+
 #endif /* __GST_ESDMON_H__ */
+
diff --git a/ext/esd/esdsink.h b/ext/esd/esdsink.h
index f88f29b1..9bf81641 100644
--- a/ext/esd/esdsink.h
+++ b/ext/esd/esdsink.h
@@ -25,6 +25,7 @@
 #include <gst/audio/audioclock.h>
 
 G_BEGIN_DECLS
+
 #define GST_TYPE_ESDSINK \
   (gst_esdsink_get_type())
 #define GST_ESDSINK(obj) \
@@ -35,41 +36,41 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDSINK))
 #define GST_IS_ESDSINK_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDSINK))
+
 typedef struct _GstEsdsink GstEsdsink;
 typedef struct _GstEsdsinkClass GstEsdsinkClass;
 
-struct _GstEsdsink
-{
-  GstElement element;
+struct _GstEsdsink {
+  GstElement 	 element;
 
-  GstPad *sinkpad;
+  GstPad 	*sinkpad;
 
-  GstClock *provided_clock;
-  GstClock *clock;
+  GstClock	*provided_clock;
+  GstClock	*clock;
 
-  gboolean mute;
-  int fd;
-  gint format;
-  gint depth;
-  gint channels;
-  gint frequency;
-  gboolean negotiated;
-  gchar *host;
-  int handled;
-  int bytes_per_sample;
-  gboolean sync;
-  gboolean resync;
-  gboolean fallback;
+  gboolean 	 mute;
+  int 		 fd;
+  gint 		 format;
+  gint 		 depth;
+  gint 		 channels;
+  gint 		 frequency;
+  gboolean 	 negotiated;
+  gchar		*host;
+  int		 handled;
+  int		 bytes_per_sample;
+  gboolean	 sync;
+  gboolean	 resync;
+  gboolean	 fallback;
 };
 
-struct _GstEsdsinkClass
-{
+struct _GstEsdsinkClass {
   GstElementClass parent_class;
 };
 
-GType gst_esdsink_get_type (void);
-gboolean gst_esdsink_factory_init (GstPlugin * plugin);
+GType gst_esdsink_get_type(void);
+gboolean gst_esdsink_factory_init (GstPlugin *plugin);
 
 
 G_END_DECLS
+
 #endif /* __GST_ESDSINK_H__ */
diff --git a/ext/flac/flac_compat.h b/ext/flac/flac_compat.h
index defa969d..87b5b864 100644
--- a/ext/flac/flac_compat.h
+++ b/ext/flac/flac_compat.h
@@ -16,7 +16,7 @@
 /* FIXME when there's a autoconf symbol */
 #ifndef FLAC_VERSION
 
-#ifndef FLAC__VERSION_STRING	/* removed in 1.0.4 */
+#ifndef FLAC__VERSION_STRING /* removed in 1.0.4 */
 #define FLAC_VERSION 0x010004
 #else
 #ifdef FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE
diff --git a/ext/flac/gstflacdec.h b/ext/flac/gstflacdec.h
index c525c3a2..5b5fd110 100644
--- a/ext/flac/gstflacdec.h
+++ b/ext/flac/gstflacdec.h
@@ -28,9 +28,8 @@
 #include <FLAC/all.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_FLACDEC flacdec_get_type()
@@ -39,42 +38,40 @@ extern "C"
 #define GST_IS_FLACDEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACDEC)
 #define GST_IS_FLACDEC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACDEC)
 
-  typedef struct _FlacDec FlacDec;
-  typedef struct _FlacDecClass FlacDecClass;
+typedef struct _FlacDec FlacDec;
+typedef struct _FlacDecClass FlacDecClass;
 
-  struct _FlacDec
-  {
-    GstElement element;
+struct _FlacDec {
+  GstElement 	 element;
 
-    GstPad *sinkpad, *srcpad;
-    GstByteStream *bs;
+  GstPad 	*sinkpad,*srcpad;
+  GstByteStream *bs;
 
-    FLAC__SeekableStreamDecoder *decoder;
-    gint channels;
-    gint depth;
-    gint frequency;
+  FLAC__SeekableStreamDecoder *decoder;
+  gint		 channels;
+  gint		 depth;
+  gint		 frequency;
 
-    gboolean need_discont;
-    gboolean seek_pending;
-    gint64 seek_value;
+  gboolean	 need_discont;
+  gboolean 	 seek_pending;
+  gint64	 seek_value;
 
-    gboolean init;
-    guint64 total_samples;
-    guint64 stream_samples;
+  gboolean	 init;
+  guint64	 total_samples;
+  guint64	 stream_samples;
 
-    gboolean eos;
-  };
+  gboolean	 eos;
+};
 
-  struct _FlacDecClass
-  {
-    GstElementClass parent_class;
-  };
+struct _FlacDecClass {
+  GstElementClass parent_class;
+};
 
-  GType flacdec_get_type (void);
+GType flacdec_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
-#endif				/* __FLACDEC_H__ */
+#endif /* __FLACDEC_H__ */
diff --git a/ext/flac/gstflacenc.h b/ext/flac/gstflacenc.h
index 1337a6fe..27dbb3b0 100644
--- a/ext/flac/gstflacenc.h
+++ b/ext/flac/gstflacenc.h
@@ -27,9 +27,8 @@
 #include <FLAC/all.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 #define GST_TYPE_FLACENC flacenc_get_type()
 #define GST_FLACENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLACENC, FlacEnc)
@@ -37,42 +36,40 @@ extern "C"
 #define GST_IS_FLACENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACENC)
 #define GST_IS_FLACENC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACENC)
 
-  typedef struct _FlacEnc FlacEnc;
-  typedef struct _FlacEncClass FlacEncClass;
+typedef struct _FlacEnc FlacEnc;
+typedef struct _FlacEncClass FlacEncClass;
 
-  struct _FlacEnc
-  {
-    GstElement element;
+struct _FlacEnc {
+  GstElement 	 element;
 
-    GstPad *sinkpad, *srcpad;
+  GstPad *sinkpad,*srcpad;
 
-    gboolean first;
-    GstBuffer *first_buf;
-    gboolean eos;
-    gint channels;
-    gint depth;
-    gint sample_rate;
-    gboolean negotiated;
-    gint quality;
-    gboolean stopped;
-    FLAC__int32 *data;
+  gboolean 	 first;
+  GstBuffer	*first_buf;
+  gboolean 	 eos;
+  gint 		 channels;
+  gint 		 depth;
+  gint 		 sample_rate;
+  gboolean	 negotiated;
+  gint 		 quality;
+  gboolean	 stopped;
+  FLAC__int32 	*data;
 
-    FLAC__SeekableStreamEncoder *encoder;
-    FLAC__StreamMetadata **meta;
+  FLAC__SeekableStreamEncoder *encoder;
+  FLAC__StreamMetadata **meta;
 
-    GstTagList *tags;
-  };
+  GstTagList *	   tags;
+};
 
-  struct _FlacEncClass
-  {
-    GstElementClass parent_class;
-  };
+struct _FlacEncClass {
+  GstElementClass parent_class;
+};
 
-  GType flacenc_get_type (void);
+GType flacenc_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
-#endif				/* __FLACENC_H__ */
+#endif /* __FLACENC_H__ */
diff --git a/ext/gdk_pixbuf/gstgdkanimation.h b/ext/gdk_pixbuf/gstgdkanimation.h
index 8dc0d4ef..183d335e 100644
--- a/ext/gdk_pixbuf/gstgdkanimation.h
+++ b/ext/gdk_pixbuf/gstgdkanimation.h
@@ -27,16 +27,20 @@
 #include <stdio.h>
 
 G_BEGIN_DECLS
+
 /* how many bytes we need to have available before we dare to start a new iteration */
 #define GST_GDK_BUFFER_SIZE (102400)
 /* how far behind we need to be before we attempt to seek */
 #define GST_GDK_MAX_DELAY_TO_SEEK (GST_SECOND / 4)
+
+
 #define GST_TYPE_GDK_ANIMATION			(gst_gdk_animation_get_type())
 #define GST_GDK_ANIMATION(obj)			(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_ANIMATION,GstGdkAnimation))
 #define GST_GDK_ANIMATION_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_ANIMATION,GstGdkAnimation))
 #define GST_IS_GDK_ANIMATION(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_ANIMATION))
 #define GST_IS_GDK_ANIMATION_CLASS(obj)		(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_ANIMATION))
-typedef struct _GstGdkAnimation GstGdkAnimation;
+
+typedef struct _GstGdkAnimation      GstGdkAnimation;
 typedef struct _GstGdkAnimationClass GstGdkAnimationClass;
 
 typedef struct _GstGdkAnimationIter GstGdkAnimationIter;
@@ -44,33 +48,34 @@ typedef struct _GstGdkAnimationIterClass GstGdkAnimationIterClass;
 
 struct _GstGdkAnimation
 {
-  GdkPixbufAnimation parent;
+  GdkPixbufAnimation		parent;
 
   /* name of temporary buffer file */
-  gchar *temp_location;
+  gchar *			temp_location;
   /* file descriptor to temporary file or 0 if we're done writing */
-  int temp_fd;
+  int				temp_fd;
 
   /* size of image */
-  gint width;
-  gint height;
-  gint bpp;
+  gint				width;
+  gint				height;
+  gint				bpp;
   /* static image we use */
-  GdkPixbuf *pixbuf;
+  GdkPixbuf *			pixbuf;
 };
 
-struct _GstGdkAnimationClass
+struct _GstGdkAnimationClass 
 {
-  GdkPixbufAnimationClass parent_class;
+  GdkPixbufAnimationClass	parent_class;
 };
 
-GType gst_gdk_animation_get_type (void);
+GType			gst_gdk_animation_get_type	(void);
 
-GstGdkAnimation *gst_gdk_animation_new (GError ** error);
+GstGdkAnimation *	gst_gdk_animation_new		(GError **error);
 
-gboolean gst_gdk_animation_add_data (GstGdkAnimation * ani,
-    const guint8 * data, guint size);
-void gst_gdk_animation_done_adding (GstGdkAnimation * ani);
+gboolean		gst_gdk_animation_add_data	(GstGdkAnimation *	ani,
+							 const guint8 *		data,
+							 guint			size);
+void			gst_gdk_animation_done_adding	(GstGdkAnimation *	ani);
 
 
 #define GST_TYPE_GDK_ANIMATION_ITER		(gst_gdk_animation_iter_get_type ())
@@ -81,35 +86,32 @@ void gst_gdk_animation_done_adding (GstGdkAnimation * ani);
 #define GST_IS_GDK_ANIMATION_ITER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GDK_ANIMATION_ITER))
 #define GST_GDK_ANIMATION_ITER_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_GDK_ANIMATION_ITER, GstGdkAnimationIterClass))
 
-struct _GstGdkAnimationIter
-{
-  GdkPixbufAnimationIter parent;
-
+struct _GstGdkAnimationIter {
+  GdkPixbufAnimationIter	parent;
+        
   /* our animation */
-  GstGdkAnimation *ani;
+  GstGdkAnimation *		ani;
   /* start timeval */
-  GTimeVal start;
+  GTimeVal			start;
   /* timestamp of last buffer */
-  GstClockTime last_timestamp;
-
+  GstClockTime			last_timestamp;
+  
   /* pipeline we're using */
-  GstElement *pipeline;
-  gboolean eos;
-  gboolean just_seeked;
-
+  GstElement *			pipeline;
+  gboolean			eos;
+  gboolean			just_seeked;
+  
   /* current image and the buffers containing the data */
-  GdkPixbuf *pixbuf;
-  GQueue *buffers;
+  GdkPixbuf *			pixbuf;
+  GQueue *			buffers;
 };
 
-struct _GstGdkAnimationIterClass
-{
-  GdkPixbufAnimationIterClass parent_class;
+struct _GstGdkAnimationIterClass {
+  GdkPixbufAnimationIterClass	parent_class;
 };
 
-GType
-gst_gdk_animation_iter_get_type (void)
-    G_GNUC_CONST;
+GType gst_gdk_animation_iter_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
+
 #endif /* __GST_GDK_ANIMATION_H__ */
diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.h b/ext/gdk_pixbuf/gstgdkpixbuf.h
index f239bf72..62e11aac 100644
--- a/ext/gdk_pixbuf/gstgdkpixbuf.h
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.h
@@ -26,6 +26,7 @@
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
+
 /* #define's don't like whitespacey bits */
 #define GST_TYPE_GDK_PIXBUF \
   (gst_gdk_pixbuf_get_type())
@@ -37,7 +38,8 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF))
 #define GST_IS_GDK_PIXBUF_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF))
-typedef struct _GstGdkPixbuf GstGdkPixbuf;
+
+typedef struct _GstGdkPixbuf      GstGdkPixbuf;
 typedef struct _GstGdkPixbufClass GstGdkPixbufClass;
 
 struct _GstGdkPixbuf
@@ -46,7 +48,7 @@ struct _GstGdkPixbuf
 
   GstPad *sinkpad, *srcpad;
 
-  GstClockTime last_timestamp;
+  GstClockTime    last_timestamp;
   GdkPixbufLoader *pixbuf_loader;
 
   int width;
@@ -57,7 +59,7 @@ struct _GstGdkPixbuf
   double framerate;
 };
 
-struct _GstGdkPixbufClass
+struct _GstGdkPixbufClass 
 {
   GstElementClass parent_class;
 };
@@ -65,4 +67,5 @@ struct _GstGdkPixbufClass
 GType gst_gdk_pixbuf_get_type (void);
 
 G_END_DECLS
+
 #endif /* __GST_GDK_PIXBUF_H__ */
diff --git a/ext/jpeg/gstjpegdec.h b/ext/jpeg/gstjpegdec.h
index 9a864eba..05187873 100644
--- a/ext/jpeg/gstjpegdec.h
+++ b/ext/jpeg/gstjpegdec.h
@@ -30,9 +30,8 @@
 #include <jpeglib.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_JPEGDEC \
@@ -46,48 +45,46 @@ extern "C"
 #define GST_IS_JPEGDEC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JPEGDEC))
 
-  typedef struct _GstJpegDec GstJpegDec;
-  typedef struct _GstJpegDecClass GstJpegDecClass;
+typedef struct _GstJpegDec GstJpegDec;
+typedef struct _GstJpegDecClass GstJpegDecClass;
 
-  struct _GstJpegDec
-  {
-    GstElement element;
+struct _GstJpegDec {
+  GstElement element;
 
-    /* pads */
-    GstPad *sinkpad, *srcpad;
+  /* pads */
+  GstPad *sinkpad,*srcpad;
 
-    int parse_state;
-    /* the timestamp of the next frame */
-    guint64 next_time;
-    /* the interval between frames */
-    guint64 time_interval;
+  int parse_state;
+  /* the timestamp of the next frame */
+  guint64 next_time;
+  /* the interval between frames */
+  guint64 time_interval;
 
-    /* video state */
-    gint format;
-    gint width;
-    gint height;
-    gdouble fps;
-    /* the size of the output buffer */
-    gint outsize;
-    /* the jpeg line buffer */
-    guchar **line[3];
+  /* video state */
+  gint format;
+  gint width;
+  gint height;
+  gdouble fps;
+  /* the size of the output buffer */
+  gint outsize;
+  /* the jpeg line buffer */
+  guchar **line[3];
 
-    struct jpeg_decompress_struct cinfo;
-    struct jpeg_error_mgr jerr;
-    struct jpeg_source_mgr jsrc;
-  };
+  struct jpeg_decompress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  struct jpeg_source_mgr jsrc;
+};
 
-  struct _GstJpegDecClass
-  {
-    GstElementClass parent_class;
-  };
+struct _GstJpegDecClass {
+  GstElementClass parent_class;
+};
 
-  GType gst_jpegdec_get_type (void);
+GType gst_jpegdec_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_JPEGDEC_H__ */
+#endif /* __GST_JPEGDEC_H__ */
diff --git a/ext/jpeg/gstjpegenc.h b/ext/jpeg/gstjpegenc.h
index beeaf6f9..b68b4859 100644
--- a/ext/jpeg/gstjpegenc.h
+++ b/ext/jpeg/gstjpegenc.h
@@ -30,9 +30,8 @@
 #include <jpeglib.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_JPEGENC \
@@ -46,50 +45,48 @@ extern "C"
 #define GST_IS_JPEGENC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_JPEGENC))
 
-  typedef struct _GstJpegEnc GstJpegEnc;
-  typedef struct _GstJpegEncClass GstJpegEncClass;
+typedef struct _GstJpegEnc GstJpegEnc;
+typedef struct _GstJpegEncClass GstJpegEncClass;
 
-  struct _GstJpegEnc
-  {
-    GstElement element;
+struct _GstJpegEnc {
+  GstElement element;
 
-    /* pads */
-    GstPad *sinkpad, *srcpad;
+  /* pads */
+  GstPad *sinkpad,*srcpad;
 
-    /* video state */
-    gint format;
-    gint width;
-    gint height;
-    gdouble fps;
-    /* the video buffer */
-    gint bufsize;
-    GstBuffer *buffer;
-    guint row_stride;
-    /* the jpeg line buffer */
-    guchar **line[3];
+  /* video state */
+  gint format;
+  gint width;
+  gint height;
+  gdouble fps;
+  /* the video buffer */
+  gint bufsize;
+  GstBuffer *buffer;
+  guint row_stride;
+  /* the jpeg line buffer */
+  guchar **line[3];
 
-    struct jpeg_compress_struct cinfo;
-    struct jpeg_error_mgr jerr;
-    struct jpeg_destination_mgr jdest;
+  struct jpeg_compress_struct cinfo;
+  struct jpeg_error_mgr jerr;
+  struct jpeg_destination_mgr jdest;
 
-    int quality;
-    int smoothing;
-  };
+  int quality;
+  int smoothing;
+};
 
-  struct _GstJpegEncClass
-  {
-    GstElementClass parent_class;
+struct _GstJpegEncClass {
+  GstElementClass parent_class;
 
-    /* signals */
-    void (*frame_encoded) (GstElement * element);
-  };
+  /* signals */
+  void (*frame_encoded) (GstElement *element);
+};
 
-  GType gst_jpegenc_get_type (void);
+GType gst_jpegenc_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_JPEGENC_H__ */
+#endif /* __GST_JPEGENC_H__ */
diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h
index b40cd145..f3556f74 100644
--- a/ext/ladspa/gstladspa.h
+++ b/ext/ladspa/gstladspa.h
@@ -31,60 +31,62 @@
 
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
-  typedef struct _ladspa_control_info
-  {
-    gchar *name;
-    gchar *param_name;
-    gfloat lowerbound, upperbound;
-    gfloat def;
-    gboolean lower, upper, samplerate;
-    gboolean toggled, logarithmic, integer, writable;
-  } ladspa_control_info;
+typedef struct _ladspa_control_info {
+  gchar *name;
+  gchar *param_name;
+  gfloat lowerbound, upperbound;
+  gfloat def;
+  gboolean lower,upper,samplerate;
+  gboolean toggled, logarithmic, integer, writable;
+} ladspa_control_info;
 
-  typedef struct _GstLADSPA GstLADSPA;
-  typedef struct _GstLADSPAClass GstLADSPAClass;
+typedef struct _GstLADSPA GstLADSPA;
+typedef struct _GstLADSPAClass GstLADSPAClass;
 
-  struct _GstLADSPA
-  {
-    GstElement element;
+struct _GstLADSPA {
+  GstElement element;
 
-    LADSPA_Descriptor *descriptor;
-    LADSPA_Handle *handle;
+  LADSPA_Descriptor *descriptor;
+  LADSPA_Handle *handle;
 
-    GstDParamManager *dpman;
+  GstDParamManager *dpman;
 
-    gfloat *controls;
+  gfloat *controls;
+  
+  GstPad **sinkpads, 
+         **srcpads;
 
-    GstPad **sinkpads, **srcpads;
+  gboolean activated;
 
-    gboolean activated;
+  gint samplerate, buffer_frames;
+  gint64 timestamp;
+  gboolean inplace_broken;
+};
 
-    gint samplerate, buffer_frames;
-    gint64 timestamp;
-    gboolean inplace_broken;
-  };
+struct _GstLADSPAClass {
+  GstElementClass parent_class;
 
-  struct _GstLADSPAClass
-  {
-    GstElementClass parent_class;
+  LADSPA_Descriptor *descriptor;
 
-    LADSPA_Descriptor *descriptor;
+  gint numports,
+       numsinkpads, 
+       numsrcpads, 
+       numcontrols;
 
-    gint numports, numsinkpads, numsrcpads, numcontrols;
+  gint *sinkpad_portnums, 
+       *srcpad_portnums, 
+       *control_portnums;
 
-    gint *sinkpad_portnums, *srcpad_portnums, *control_portnums;
-
-    ladspa_control_info *control_info;
-  };
+  ladspa_control_info *control_info;
+};
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_LADSPA_H__ */
+#endif /* __GST_LADSPA_H__ */
diff --git a/ext/ladspa/utils.h b/ext/ladspa/utils.h
index 7a22b50b..d470eb0d 100644
--- a/ext/ladspa/utils.h
+++ b/ext/ladspa/utils.h
@@ -20,19 +20,20 @@
    unloadLADSPAPluginLibrary(). Errors are handled by writing a
    message to stderr and calling exit(1). It is alright (although
    inefficient) to call this more than once for the same file. */
-void *loadLADSPAPluginLibrary (const char *pcPluginFilename);
+void * loadLADSPAPluginLibrary(const char * pcPluginFilename);
 
 /* This function unloads a LADSPA plugin library. */
-void unloadLADSPAPluginLibrary (void *pvLADSPAPluginLibrary);
+void unloadLADSPAPluginLibrary(void * pvLADSPAPluginLibrary);
 
 /* This function locates a LADSPA plugin within a plugin library
    loaded with loadLADSPAPluginLibrary(). Errors are handled by
    writing a message to stderr and calling exit(1). Note that the
    plugin library filename is only included to help provide
    informative error messages. */
-const LADSPA_Descriptor *findLADSPAPluginDescriptor (void
-    *pvLADSPAPluginLibrary, const char *pcPluginLibraryFilename,
-    const char *pcPluginLabel);
+const LADSPA_Descriptor *
+findLADSPAPluginDescriptor(void * pvLADSPAPluginLibrary,
+			   const char * pcPluginLibraryFilename,
+			   const char * pcPluginLabel);
 
 /*****************************************************************************/
 
@@ -43,15 +44,16 @@ const LADSPA_Descriptor *findLADSPAPluginDescriptor (void
    style) and a LADSPA_DescriptorFunction (from which
    LADSPA_Descriptors can be acquired). */
 typedef void LADSPAPluginSearchCallbackFunction
-    (const char *pcFullFilename,
-    void *pvPluginHandle, LADSPA_Descriptor_Function fDescriptorFunction);
+(const char * pcFullFilename, 
+ void * pvPluginHandle,
+ LADSPA_Descriptor_Function fDescriptorFunction);
 
 /* Search through the $(LADSPA_PATH) (or a default path) for any
    LADSPA plugin libraries. Each plugin library is tested using
    dlopen() and dlsym(,"ladspa_descriptor"). After loading each
    library, the callback function is called to process it. This
    function leaves items passed to the callback function open. */
-void LADSPAPluginSearch (LADSPAPluginSearchCallbackFunction fCallbackFunction);
+void LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction);
 
 /*****************************************************************************/
 
diff --git a/ext/libcaca/gstcacasink.h b/ext/libcaca/gstcacasink.h
index 2080c284..3a6d4f23 100644
--- a/ext/libcaca/gstcacasink.h
+++ b/ext/libcaca/gstcacasink.h
@@ -28,9 +28,8 @@
 #include <caca.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 #define GST_CACA_DEFAULT_SCREEN_WIDTH 80
 #define GST_CACA_DEFAULT_SCREEN_HEIGHT 25
@@ -54,47 +53,44 @@ extern "C"
 #define GST_IS_CACASINK_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CACASINK))
 
-  typedef enum
-  {
-    GST_CACASINK_OPEN = GST_ELEMENT_FLAG_LAST,
+typedef enum {
+  GST_CACASINK_OPEN              = GST_ELEMENT_FLAG_LAST,
 
-    GST_CACASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
-  } GstCACASinkFlags;
+  GST_CACASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+} GstCACASinkFlags;
 
-  typedef struct _GstCACASink GstCACASink;
-  typedef struct _GstCACASinkClass GstCACASinkClass;
+typedef struct _GstCACASink GstCACASink;
+typedef struct _GstCACASinkClass GstCACASinkClass;
 
-  struct _GstCACASink
-  {
-    GstVideoSink videosink;
+struct _GstCACASink {
+  GstVideoSink videosink;
 
-    GstPad *sinkpad;
+  GstPad *sinkpad;
 
-    gulong format;
-    gint screen_width, screen_height;
-    guint bpp;
-    guint dither;
-    gboolean antialiasing;
-    guint red_mask, green_mask, blue_mask;
+  gulong format;
+  gint screen_width, screen_height;
+  guint bpp;
+  guint dither;
+  gboolean antialiasing;
+  guint red_mask, green_mask, blue_mask;
 
-    gint64 correction;
-    GstClockID id;
+  gint64 correction;
+  GstClockID id;
 
-    struct caca_bitmap *bitmap;
-  };
+  struct caca_bitmap *bitmap;
+};
 
-  struct _GstCACASinkClass
-  {
-    GstVideoSinkClass parent_class;
+struct _GstCACASinkClass {
+  GstVideoSinkClass parent_class;
 
-    /* signals */
-  };
+  /* signals */
+};
 
-  GType gst_cacasink_get_type (void);
+GType gst_cacasink_get_type(void);
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_CACASINKE_H__ */
+#endif /* __GST_CACASINKE_H__ */
diff --git a/ext/libpng/gstpngenc.h b/ext/libpng/gstpngenc.h
index 1c521260..59bc4ab4 100644
--- a/ext/libpng/gstpngenc.h
+++ b/ext/libpng/gstpngenc.h
@@ -25,9 +25,8 @@
 #include <png.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_PNGENC  	(gst_pngenc_get_type())
@@ -36,37 +35,37 @@ extern "C"
 #define GST_IS_PNGENC(obj) 	(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PNGENC))
 #define GST_IS_PNGENC_CLASS(obj)(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PNGENC))
 
-  typedef struct _GstPngEnc GstPngEnc;
-  typedef struct _GstPngEncClass GstPngEncClass;
+typedef struct _GstPngEnc GstPngEnc;
+typedef struct _GstPngEncClass GstPngEncClass;
 
-  extern GstPadTemplate *pngenc_src_template, *pngenc_sink_template;
+extern GstPadTemplate *pngenc_src_template, *pngenc_sink_template;
 
-  struct _GstPngEnc
-  {
-    GstElement element;
+struct _GstPngEnc
+{
+  GstElement element;
 
-    GstPad *sinkpad, *srcpad;
-    GstBuffer *buffer_out;
+  GstPad *sinkpad, *srcpad;
+  GstBuffer *buffer_out;
 
-    png_structp png_struct_ptr;
-    png_infop png_info_ptr;
+  png_structp png_struct_ptr;
+  png_infop png_info_ptr;
 
-    gint width;
-    gint height;
-    gint bpp;
-  };
+  gint width;
+  gint height;
+  gint bpp;
+};
 
-  struct _GstPngEncClass
-  {
-    GstElementClass parent_class;
-  };
+struct _GstPngEncClass
+{
+  GstElementClass parent_class;
+};
 
-  GType gst_pngenc_get_type (void);
+GType gst_pngenc_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_PNGENC_H__ */
+#endif /* __GST_PNGENC_H__ */
diff --git a/ext/mikmod/gstmikmod.h b/ext/mikmod/gstmikmod.h
index ce65f8e8..208fc5b9 100644
--- a/ext/mikmod/gstmikmod.h
+++ b/ext/mikmod/gstmikmod.h
@@ -25,14 +25,13 @@
 #include <gst/gst.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_MIKMOD \
   (gst_mikmod_get_type())
-
+  
 #define GST_MIKMOD(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIKMOD,GstMikMod))
 #define GST_MIKMOD_CLASS(klass) \
@@ -41,70 +40,68 @@ extern "C"
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIKMOD))
 #define GST_IS_MIKMOD_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIKMOD))
-
-  struct _GstMikMod
-  {
-    GstElement element;
-    GstPad *sinkpad, *srcpad;
-    GstBuffer *Buffer;
-
-    gchar *songname;
-    gchar *modtype;
-    gint musicvolume;
-    gint pansep;
-    gint reverb;
-    gint sndfxvolume;
-    gint volume;
-    gint mixfreq;
-    gint mode;
-    gboolean interp;
-    gboolean reverse;
-    gboolean surround;
-    gboolean _16bit;
-    gboolean hqmixer;
-    gboolean soft_music;
-    gboolean soft_sndfx;
-    gboolean stereo;
-
-    gboolean initialized;
-  };
-
-  struct _GstMikModClass
-  {
-    GstElementClass parent_class;
-  };
-
-  typedef struct _GstMikMod GstMikMod;
-  typedef struct _GstMikModClass GstMikModClass;
-
-  extern MODULE *module;
-  extern MREADER *reader;
-  extern GstPad *srcpad;
-  extern GstClockTime timestamp;
-  extern int need_sync;
-
-  GType gst_mikmod_get_type (void);
+  
+struct _GstMikMod {
+  GstElement element;
+  GstPad *sinkpad, *srcpad;
+  GstBuffer *Buffer;
+
+  gchar *songname;
+  gchar *modtype;
+  gint musicvolume;
+  gint pansep;
+  gint reverb;
+  gint sndfxvolume;
+  gint volume;
+  gint mixfreq;
+  gint mode;
+  gboolean interp;
+  gboolean reverse;
+  gboolean surround;
+  gboolean _16bit;
+  gboolean hqmixer;
+  gboolean soft_music;
+  gboolean soft_sndfx;
+  gboolean stereo;
+
+  gboolean initialized;
+};
+
+struct _GstMikModClass {
+  GstElementClass parent_class;
+};
+
+typedef struct _GstMikMod GstMikMod;
+typedef struct _GstMikModClass GstMikModClass;
+
+extern MODULE *module;
+extern MREADER *reader;
+extern GstPad *srcpad;
+extern GstClockTime timestamp;
+extern int need_sync;
+
+GType gst_mikmod_get_type(void);
 
 /* symbols for mikmod_reader.h */
-  struct _GST_READER
-  {
-    MREADER core;
-    GstMikMod *mik;
-    guint64 offset;
-    gshort eof;
-  };
+struct _GST_READER
+{
+  MREADER core;
+  GstMikMod *mik;
+  guint64 offset;
+  gshort  eof;
+};
 
 
-  typedef struct _GST_READER GST_READER;
+typedef struct _GST_READER GST_READER;
 
 
-  MREADER *GST_READER_new (GstMikMod * mik);
+MREADER *GST_READER_new( GstMikMod *mik );
 
 /* symbols for drv_gst.c */
-  extern MDRIVER drv_gst;
+extern MDRIVER drv_gst;
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
-#endif				/* __GST_MIKMOD_H__ */
+#endif /* __GST_MIKMOD_H__ */
diff --git a/ext/mikmod/mikmod_types.h b/ext/mikmod/mikmod_types.h
index 8559455c..c431faf9 100644
--- a/ext/mikmod/mikmod_types.h
+++ b/ext/mikmod/mikmod_types.h
@@ -20,26 +20,25 @@
 #define __MIKMOD_TYPES_H__
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
-  gboolean MOD_CheckType (GstBuffer * buf);
-  gboolean Mod_669_CheckType (GstBuffer * buf);
-  gboolean Amf_CheckType (GstBuffer * buf);
-  gboolean Dsm_CheckType (GstBuffer * buf);
-  gboolean Fam_CheckType (GstBuffer * buf);
-  gboolean Gdm_CheckType (GstBuffer * buf);
-  gboolean Imf_CheckType (GstBuffer * buf);
-  gboolean It_CheckType (GstBuffer * buf);
-  gboolean M15_CheckType (GstBuffer * buf);
-  gboolean Mtm_CheckType (GstBuffer * buf);
-  gboolean Okt_CheckType (GstBuffer * buf);
-  gboolean S3m_CheckType (GstBuffer * buf);
-  gboolean Xm_CheckType (GstBuffer * buf);
+gboolean MOD_CheckType (GstBuffer *buf);
+gboolean Mod_669_CheckType (GstBuffer *buf);
+gboolean Amf_CheckType (GstBuffer *buf);
+gboolean Dsm_CheckType (GstBuffer *buf);
+gboolean Fam_CheckType (GstBuffer *buf);
+gboolean Gdm_CheckType (GstBuffer *buf);
+gboolean Imf_CheckType (GstBuffer *buf);
+gboolean It_CheckType (GstBuffer *buf);
+gboolean M15_CheckType (GstBuffer *buf);
+gboolean Mtm_CheckType (GstBuffer *buf);
+gboolean Okt_CheckType (GstBuffer *buf);
+gboolean S3m_CheckType (GstBuffer *buf);
+gboolean Xm_CheckType (GstBuffer *buf);
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
-#endif				/* __MIKMOD_TYPES_H__ */
+#endif /* __MIKMOD_TYPES_H__ */
diff --git a/ext/pango/gsttextoverlay.h b/ext/pango/gsttextoverlay.h
index 08ad8145..b039acac 100644
--- a/ext/pango/gsttextoverlay.h
+++ b/ext/pango/gsttextoverlay.h
@@ -6,6 +6,7 @@
 #include <pango/pangoft2.h>
 
 G_BEGIN_DECLS
+
 #define GST_TYPE_TEXTOVERLAY           (gst_textoverlay_get_type())
 #define GST_TEXTOVERLAY(obj)           (G_TYPE_CHECK_INSTANCE_CAST((obj),\
                                         GST_TYPE_TEXTOVERLAY, GstTextOverlay))
@@ -17,60 +18,56 @@ G_BEGIN_DECLS
                                         GST_TYPE_TEXTOVERLAY))
 #define GST_IS_TEXTOVERLAY_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE((klass),\
                                         GST_TYPE_TEXTOVERLAY))
-typedef struct _GstTextOverlay GstTextOverlay;
+
+typedef struct _GstTextOverlay      GstTextOverlay;
 typedef struct _GstTextOverlayClass GstTextOverlayClass;
 
 typedef enum _GstTextOverlayVAlign GstTextOverlayVAlign;
 typedef enum _GstTextOverlayHAlign GstTextOverlayHAlign;
 
-enum _GstTextOverlayVAlign
-{
-  GST_TEXT_OVERLAY_VALIGN_BASELINE,
-  GST_TEXT_OVERLAY_VALIGN_BOTTOM,
-  GST_TEXT_OVERLAY_VALIGN_TOP,
+enum _GstTextOverlayVAlign {
+    GST_TEXT_OVERLAY_VALIGN_BASELINE,
+    GST_TEXT_OVERLAY_VALIGN_BOTTOM,
+    GST_TEXT_OVERLAY_VALIGN_TOP,
 };
 
-enum _GstTextOverlayHAlign
-{
-  GST_TEXT_OVERLAY_HALIGN_LEFT,
-  GST_TEXT_OVERLAY_HALIGN_CENTER,
-  GST_TEXT_OVERLAY_HALIGN_RIGHT,
+enum _GstTextOverlayHAlign {
+    GST_TEXT_OVERLAY_HALIGN_LEFT,
+    GST_TEXT_OVERLAY_HALIGN_CENTER,
+    GST_TEXT_OVERLAY_HALIGN_RIGHT,
 };
 
 
-struct _GstTextOverlay
-{
-  GstElement element;
+struct _GstTextOverlay {
+    GstElement            element;
 
-  GstPad *video_sinkpad;
-  GstPad *text_sinkpad;
-  GstPad *srcpad;
-  gint width;
-  gint height;
-  PangoLayout *layout;
-  FT_Bitmap bitmap;
-  gint bitmap_buffer_size;
-  gint baseline_y;
-  GstTextOverlayVAlign valign;
-  GstTextOverlayHAlign halign;
-  gint x0;
-  gint y0;
-  GstBuffer *current_buffer;
-  GstBuffer *next_buffer;
-  gchar *default_text;
-  gboolean need_render;
+    GstPad               *video_sinkpad;
+    GstPad               *text_sinkpad;
+    GstPad               *srcpad;
+    gint                  width;
+    gint                  height;
+    PangoLayout          *layout;
+    FT_Bitmap             bitmap;
+    gint                  bitmap_buffer_size;
+    gint                  baseline_y;
+    GstTextOverlayVAlign  valign;
+    GstTextOverlayHAlign  halign;
+    gint                  x0;
+    gint                  y0;
+    GstBuffer		 *current_buffer;
+    GstBuffer		 *next_buffer;
+    gchar		 *default_text;
+    gboolean		  need_render;
 };
 
-struct _GstTextOverlayClass
-{
-  GstElementClass parent_class;
+struct _GstTextOverlayClass {
+    GstElementClass parent_class;
 
-  PangoContext *pango_context;
+    PangoContext *pango_context;
 };
 
-GType
-gst_textoverlay_get_type (void)
-    G_GNUC_CONST;
+GType gst_textoverlay_get_type(void) G_GNUC_CONST;
 
 G_END_DECLS
+
 #endif /* __GST_TEXTOVERLAY_H */
diff --git a/ext/pango/gsttimeoverlay.h b/ext/pango/gsttimeoverlay.h
index a591bd6a..505f8f04 100644
--- a/ext/pango/gsttimeoverlay.h
+++ b/ext/pango/gsttimeoverlay.h
@@ -29,6 +29,7 @@
 
 
 G_BEGIN_DECLS
+
 #define GST_TYPE_TIMEOVERLAY \
   (gst_timeoverlay_get_type())
 #define GST_TIMEOVERLAY(obj) \
@@ -39,11 +40,11 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TIMEOVERLAY))
 #define GST_IS_TIMEOVERLAY_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TIMEOVERLAY))
+
 typedef struct _GstTimeoverlay GstTimeoverlay;
 typedef struct _GstTimeoverlayClass GstTimeoverlayClass;
 
-struct _GstTimeoverlay
-{
+struct _GstTimeoverlay {
   GstVideofilter videofilter;
 
   PangoFontDescription *font_description;
@@ -51,12 +52,13 @@ struct _GstTimeoverlay
 
 };
 
-struct _GstTimeoverlayClass
-{
+struct _GstTimeoverlayClass {
   GstVideofilterClass parent_class;
 };
 
-GType gst_timeoverlay_get_type (void);
+GType gst_timeoverlay_get_type(void);
 
 G_END_DECLS
+
 #endif /* __GST_TIMEOVERLAY_H__ */
+
diff --git a/ext/raw1394/gstdv1394src.h b/ext/raw1394/gstdv1394src.h
index 2ba4ab3d..7d384fd0 100644
--- a/ext/raw1394/gstdv1394src.h
+++ b/ext/raw1394/gstdv1394src.h
@@ -27,9 +27,8 @@
 
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_DV1394SRC \
@@ -43,47 +42,45 @@ extern "C"
 #define GST_IS_DV1394SRC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DV1394SRC))
 
-  typedef struct _GstDV1394Src GstDV1394Src;
-  typedef struct _GstDV1394SrcClass GstDV1394SrcClass;
+typedef struct _GstDV1394Src GstDV1394Src;
+typedef struct _GstDV1394SrcClass GstDV1394SrcClass;
 
-  struct _GstDV1394Src
-  {
-    GstElement element;
+struct _GstDV1394Src {
+  GstElement element;
 
-    GstPad *srcpad;
+  GstPad *srcpad;
 
-    // consecutive=2, skip=4 will skip 4 frames, then let 2 consecutive ones thru
-    gint consecutive;
-    gint skip;
-    gboolean drop_incomplete;
+  // consecutive=2, skip=4 will skip 4 frames, then let 2 consecutive ones thru
+  gint consecutive;
+  gint skip;
+  gboolean drop_incomplete;
 
-    int numcards, numports;
-    int card, port, channel;
+  int numcards,numports;
+  int card,port,channel;
 
-    struct raw1394_portinfo pinfo[16];
-    raw1394handle_t handle;
+  struct raw1394_portinfo pinfo[16];
+  raw1394handle_t handle;
 
-    gboolean started;
-    GstBuffer *buf;
+  gboolean started;
+  GstBuffer *buf;
+  
+  GstBuffer *frame;
+  guint frameSize;
+  guint bytesInFrame;
+  guint frameSequence;
 
-    GstBuffer *frame;
-    guint frameSize;
-    guint bytesInFrame;
-    guint frameSequence;
+  gboolean negotiated;
+};
 
-    gboolean negotiated;
-  };
+struct _GstDV1394SrcClass {
+  GstElementClass parent_class;
+};
 
-  struct _GstDV1394SrcClass
-  {
-    GstElementClass parent_class;
-  };
-
-  GType gst_dv1394src_get_type (void);
+GType gst_dv1394src_get_type(void);
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_GST1394_H__ */
+#endif /* __GST_GST1394_H__ */
diff --git a/ext/shout2/gstshout2.h b/ext/shout2/gstshout2.h
index 62ff44b9..70631298 100644
--- a/ext/shout2/gstshout2.h
+++ b/ext/shout2/gstshout2.h
@@ -25,51 +25,47 @@
 #include <shout/shout.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
   /* Protocol type enum */
-  typedef enum
-  {
-    SHOUT2SEND_PROTOCOL_ICE = 1,
-    SHOUT2SEND_PROTOCOL_XAUDIOCAST,
-    SHOUT2SEND_PROTOCOL_ICY,
-    SHOUT2SEND_PROTOCOL_HTTP
-  } GstShout2SendProtocol;
+typedef enum {
+  SHOUT2SEND_PROTOCOL_ICE = 1,
+  SHOUT2SEND_PROTOCOL_XAUDIOCAST,
+  SHOUT2SEND_PROTOCOL_ICY,
+  SHOUT2SEND_PROTOCOL_HTTP
+} GstShout2SendProtocol;
 
 
 /* Definition of structure storing data for this element. */
-  typedef struct _GstShout2send GstShout2send;
-  struct _GstShout2send
-  {
-    GstElement element;
+typedef struct _GstShout2send GstShout2send;
+struct _GstShout2send {
+  GstElement element;
 
-    GstPad *sinkpad, *srcpad;
+  GstPad *sinkpad,*srcpad;
 
-    GstShout2SendProtocol protocol;
+  GstShout2SendProtocol protocol;
 
-    shout_t *conn;
+  shout_t *conn;
 
-    gchar *ip;
-    guint port;
-    gchar *password;
-    gchar *name;
-    gchar *description;
-    gchar *genre;
-    gchar *mount;
-    gchar *url;
+  gchar *ip;
+  guint port;
+  gchar *password;
+  gchar *name;
+  gchar *description;
+  gchar *genre;
+  gchar *mount;
+  gchar *url;
 
-  };
+};
 
 
 
 /* Standard definition defining a class for this element. */
-  typedef struct _GstShout2sendClass GstShout2sendClass;
-  struct _GstShout2sendClass
-  {
-    GstElementClass parent_class;
-  };
+typedef struct _GstShout2sendClass GstShout2sendClass;
+struct _GstShout2sendClass {
+  GstElementClass parent_class;
+};
 
 /* Standard macros for defining types for this element.  */
 #define GST_TYPE_SHOUT2SEND \
@@ -84,12 +80,12 @@ extern "C"
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SHOUT2SEND))
 
 /* Standard function returning type information. */
-  GType gst_shout2send_get_type (void);
+GType gst_shout2send_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_SHOUT2SEND_H__ */
+#endif /* __GST_SHOUT2SEND_H__ */
diff --git a/ext/speex/gstspeexdec.h b/ext/speex/gstspeexdec.h
index 6723742c..c679dc18 100644
--- a/ext/speex/gstspeexdec.h
+++ b/ext/speex/gstspeexdec.h
@@ -26,9 +26,8 @@
 #include <speex.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_SPEEXDEC \
@@ -42,28 +41,26 @@ extern "C"
 #define GST_IS_SPEEXDEC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEEXDEC))
 
-  typedef struct _GstSpeexDec GstSpeexDec;
-  typedef struct _GstSpeexDecClass GstSpeexDecClass;
+typedef struct _GstSpeexDec GstSpeexDec;
+typedef struct _GstSpeexDecClass GstSpeexDecClass;
 
-  struct _GstSpeexDec
-  {
-    GstElement element;
+struct _GstSpeexDec {
+  GstElement element;
 
-    /* pads */
-    GstPad *sinkpad, *srcpad;
-  };
+  /* pads */
+  GstPad *sinkpad,*srcpad;
+};
 
-  struct _GstSpeexDecClass
-  {
-    GstElementClass parent_class;
-  };
+struct _GstSpeexDecClass {
+  GstElementClass parent_class;
+};
 
-  GType gst_speexdec_get_type (void);
+GType gst_speexdec_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_SPEEXDEC_H__ */
+#endif /* __GST_SPEEXDEC_H__ */
diff --git a/ext/speex/gstspeexenc.h b/ext/speex/gstspeexenc.h
index 4da1e787..4677f6a1 100644
--- a/ext/speex/gstspeexenc.h
+++ b/ext/speex/gstspeexenc.h
@@ -28,9 +28,8 @@
 #include <speex_header.h>
 
 #ifdef __cplusplus
-extern "C"
-{
-#endif				/* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
 
 
 #define GST_TYPE_SPEEXENC \
@@ -44,45 +43,44 @@ extern "C"
 #define GST_IS_SPEEXENC_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEEXENC))
 
-  typedef struct _GstSpeexEnc GstSpeexEnc;
-  typedef struct _GstSpeexEncClass GstSpeexEncClass;
+typedef struct _GstSpeexEnc GstSpeexEnc;
+typedef struct _GstSpeexEncClass GstSpeexEncClass;
 
-  struct _GstSpeexEnc
-  {
-    GstElement element;
+struct _GstSpeexEnc {
+  GstElement 	element;
 
-    /* pads */
-    GstPad *sinkpad, *srcpad;
+  /* pads */
+  GstPad 	*sinkpad,
+  		*srcpad;
 
-    gint packet_count;
-    gint n_packets;
+  gint		 packet_count;
+  gint		 n_packets;
 
-    SpeexBits bits;
-    SpeexHeader header;
-    SpeexMode *mode;
-    void *state;
-    gint frame_size;
-    gint16 buffer[2000];
-    gint bufsize;
-    guint64 next_ts;
+  SpeexBits 	 bits;
+  SpeexHeader 	 header;
+  SpeexMode 	*mode;
+  void 		*state;
+  gint		 frame_size;
+  gint16	 buffer[2000];
+  gint		 bufsize;
+  guint64	 next_ts;
 
-    gint rate;
-  };
+  gint		 rate;
+};
 
-  struct _GstSpeexEncClass
-  {
-    GstElementClass parent_class;
+struct _GstSpeexEncClass {
+  GstElementClass parent_class;
 
-    /* signals */
-    void (*frame_encoded) (GstElement * element);
-  };
+  /* signals */
+  void (*frame_encoded) (GstElement *element);
+};
 
-  GType gst_speexenc_get_type (void);
+GType gst_speexenc_get_type(void);
 
 
 #ifdef __cplusplus
 }
-#endif				/* __cplusplus */
+#endif /* __cplusplus */
 
 
-#endif				/* __GST_SPEEXENC_H__ */
+#endif /* __GST_SPEEXENC_H__ */