diff --git a/gst/gstevent.c b/gst/gstevent.c
index da60da0b0d..bf463f7e7b 100644
--- a/gst/gstevent.c
+++ b/gst/gstevent.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
  *                    2000 Wim Taymans <wim.taymans@chello.be>
  *
- * gstevent.h: Header for GstEvent subsystem
+ * gstevent.c: GstEvent subsystem
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst/gstevent.h b/gst/gstevent.h
index c1e1be8076..9eaec60dcd 100644
--- a/gst/gstevent.h
+++ b/gst/gstevent.h
@@ -32,6 +32,8 @@
 
 G_BEGIN_DECLS
 
+extern GType _gst_event_type;
+
 typedef enum {
   GST_EVENT_UNKNOWN		= 0,
   GST_EVENT_EOS			= 1,
@@ -52,8 +54,6 @@ typedef enum {
   GST_EVENT_TAG			= 16
 } GstEventType;
 
-extern GType _gst_event_type;
-
 #define GST_EVENT_TRACE_NAME	"GstEvent"
 
 #define GST_TYPE_EVENT		(_gst_event_type)
@@ -74,40 +74,40 @@ extern GType _gst_event_type;
 #define GST_SEEK_FLAGS_MASK	0xfff00000
 
 typedef enum {
-  GST_EVENT_FLAG_NONE 		= 0,
+  GST_EVENT_FLAG_NONE		= 0,
 
   /* indicates negative rates are supported */
-  GST_RATE_FLAG_NEGATIVE  	= (1 << 1) 
+  GST_RATE_FLAG_NEGATIVE	= (1 << 1)
 } GstEventFlag;
 
 typedef struct
 {
-  GstEventType 	type;
-  GstEventFlag 	flags;
+  GstEventType	type;
+  GstEventFlag	flags;
 } GstEventMask;
 
 #ifndef GST_DISABLE_DEPRECATED
 #ifdef G_HAVE_ISO_VARARGS
 #define GST_EVENT_MASK_FUNCTION(type,functionname, ...)      \
 static const GstEventMask*                              \
-functionname (type pad)                            	\
-{                                               	\
+functionname (type pad)					\
+{							\
   static const GstEventMask masks[] = {                 \
     __VA_ARGS__,					\
     { 0, }						\
-  };                                             	\
-  return masks;                                  	\
+  };							\
+  return masks;						\
 }
 #elif defined(G_HAVE_GNUC_VARARGS)
 #define GST_EVENT_MASK_FUNCTION(type,functionname, a...)     \
 static const GstEventMask*                              \
-functionname (type pad)                            	\
-{                                               	\
+functionname (type pad)					\
+{							\
   static const GstEventMask masks[] = {                 \
     a,							\
     { 0, }						\
-  };                                             	\
-  return masks;                                  	\
+  };							\
+  return masks;						\
 }
 #endif
 #endif
@@ -136,7 +136,7 @@ typedef enum {
 
 typedef struct
 {
-  GstFormat 	format;
+  GstFormat	format;
   gint64	value;
 } GstFormatValue;
 
@@ -166,22 +166,22 @@ struct _GstEvent {
 
   union {
     struct {
-      GstSeekType 	type;
-      gint64      	offset;
-      gint64      	endoffset;
-      GstSeekAccuracy 	accuracy;
+      GstSeekType	type;
+      gint64		offset;
+      gint64		endoffset;
+      GstSeekAccuracy	accuracy;
     } seek;
     struct {
-      GstFormatValue 	offsets[8];
-      gint      	noffsets;
+      GstFormatValue	offsets[8];
+      gint		noffsets;
       gboolean		new_media;
     } discont;
     struct {
-      GstFormat 	format;
-      gint64      	value;
+      GstFormat		format;
+      gint64		value;
     } size;
     struct {
-      gdouble      	value;
+      gdouble		value;
     } rate;
     struct {
       GstStructure	*structure;
@@ -191,24 +191,24 @@ struct _GstEvent {
   gpointer _gst_reserved[GST_PADDING];
 };
 
-void 		_gst_event_initialize 		(void);
+void		_gst_event_initialize		(void);
 	
 GType		gst_event_get_type		(void);
-GstEvent*	gst_event_new	        	(GstEventType type);
+GstEvent*	gst_event_new			(GstEventType type);
 
 /* refcounting */
-#define         gst_event_ref(ev)             	GST_EVENT (gst_data_ref (GST_DATA (ev)))
-#define         gst_event_ref_by_count(ev,c)  	GST_EVENT (gst_data_ref_by_count (GST_DATA (ev), c))
-#define         gst_event_unref(ev)           	gst_data_unref (GST_DATA (ev))
+#define         gst_event_ref(ev)		GST_EVENT (gst_data_ref (GST_DATA (ev)))
+#define         gst_event_ref_by_count(ev,c)	GST_EVENT (gst_data_ref_by_count (GST_DATA (ev), c))
+#define         gst_event_unref(ev)		gst_data_unref (GST_DATA (ev))
 /* copy buffer */
-#define         gst_event_copy(ev)         	GST_EVENT (gst_data_copy (GST_DATA (ev)))
+#define         gst_event_copy(ev)		GST_EVENT (gst_data_copy (GST_DATA (ev)))
 
-gboolean 	gst_event_masks_contains 	(const GstEventMask *masks, GstEventMask *mask);
+gboolean	gst_event_masks_contains	(const GstEventMask *masks, GstEventMask *mask);
 
 /* seek event */
 GstEvent*	gst_event_new_seek		(GstSeekType type, gint64 offset);
 
-GstEvent* 	gst_event_new_segment_seek 	(GstSeekType type, gint64 start, gint64 stop);
+GstEvent*	gst_event_new_segment_seek	(GstSeekType type, gint64 start, gint64 stop);
 
 
 /* size events */
@@ -218,7 +218,7 @@ GstEvent*	gst_event_new_size		(GstFormat format, gint64 value);
 GstEvent*	gst_event_new_discontinuous	(gboolean new_media,
 						 GstFormat format1, ...);
 GstEvent*	gst_event_new_discontinuous_valist	(gboolean new_media,
-						 GstFormat format1, 
+						 GstFormat format1,
 						 va_list var_args);
 gboolean	gst_event_discont_get_value	(GstEvent *event, GstFormat format, gint64 *value);