diff --git a/ChangeLog b/ChangeLog
index f8321e490..4c909f034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-23  Iain Holmes  <iain@openedhand.com>
+
+	* clutter/clutter-label.h:
+	* clutter/clutter-group.h:
+	* clutter/clutter-rectangle.h:
+	* clutter/clutter-video-texture.h:
+	* clutter/clutter-event.h:
+	* clutter/clutter-texture.h: Fix the header layout so that C# parser
+	can understand everything.
+
 2006-06-23  Ross Burton  <ross@openedhand.com>
 
 	* configure.ac:
diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h
index 7cda71d1e..bcba2e8cc 100644
--- a/clutter/clutter-event.h
+++ b/clutter/clutter-event.h
@@ -117,26 +117,19 @@ ClutterEvent *clutter_event_new  (ClutterEventType  type);
 ClutterEvent *clutter_event_copy (ClutterEvent     *event);
 void          clutter_event_free (ClutterEvent     *event);
 
-ClutterEventType
-clutter_key_event_type (ClutterKeyEvent *keyev);
+ClutterEventType clutter_key_event_type (ClutterKeyEvent *keyev);
 
-guint32
-clutter_key_event_time (ClutterKeyEvent *keyev);
+guint32 clutter_key_event_time (ClutterKeyEvent *keyev);
 
-guint
-clutter_key_event_state (ClutterKeyEvent *keyev);
+guint clutter_key_event_state (ClutterKeyEvent *keyev);
 
-guint
-clutter_key_event_symbol (ClutterKeyEvent *keyev);
+guint clutter_key_event_symbol (ClutterKeyEvent *keyev);
 
-guint16
-clutter_key_event_code (ClutterKeyEvent *keyev);
+guint16 clutter_key_event_code (ClutterKeyEvent *keyev);
 
-guint32
-clutter_key_event_unicode (ClutterKeyEvent *keyev);
+guint32 clutter_key_event_unicode (ClutterKeyEvent *keyev);
 
-guint32
-clutter_keysym_to_unicode (guint keyval);
+guint32 clutter_keysym_to_unicode (guint keyval);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-group.h b/clutter/clutter-group.h
index 1cd330dbc..b2abf2854 100644
--- a/clutter/clutter-group.h
+++ b/clutter/clutter-group.h
@@ -53,9 +53,9 @@ G_BEGIN_DECLS
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
   CLUTTER_TYPE_GROUP, ClutterGroupClass))
 
-typedef struct _ClutterGroupPrivate ClutterGroupPrivate;
 typedef struct _ClutterGroup        ClutterGroup;
 typedef struct _ClutterGroupClass   ClutterGroupClass;
+typedef struct _ClutterGroupPrivate ClutterGroupPrivate;
  
 struct _ClutterGroup
 {
diff --git a/clutter/clutter-label.h b/clutter/clutter-label.h
index 27aba4f09..ec1916d96 100644
--- a/clutter/clutter-label.h
+++ b/clutter/clutter-label.h
@@ -56,8 +56,8 @@ G_BEGIN_DECLS
   CLUTTER_TYPE_LABEL, ClutterLabelClass))
 
 typedef struct _ClutterLabel ClutterLabel;
-typedef struct _ClutterLabelPrivate ClutterLabelPrivate ;
 typedef struct _ClutterLabelClass ClutterLabelClass;
+typedef struct _ClutterLabelPrivate ClutterLabelPrivate;
 
 struct _ClutterLabel
 {
diff --git a/clutter/clutter-rectangle.h b/clutter/clutter-rectangle.h
index 41ec219c1..e66809155 100644
--- a/clutter/clutter-rectangle.h
+++ b/clutter/clutter-rectangle.h
@@ -54,9 +54,9 @@ G_BEGIN_DECLS
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
   CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
 
-typedef struct _ClutterRectanglePrivate ClutterRectanglePrivate;
 typedef struct _ClutterRectangle        ClutterRectangle;
 typedef struct _ClutterRectangleClass   ClutterRectangleClass;
+typedef struct _ClutterRectanglePrivate ClutterRectanglePrivate;
 
 struct _ClutterRectangle
 {
diff --git a/clutter/clutter-texture.h b/clutter/clutter-texture.h
index 679f04b2b..0257def27 100644
--- a/clutter/clutter-texture.h
+++ b/clutter/clutter-texture.h
@@ -54,73 +54,64 @@ G_BEGIN_DECLS
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
   CLUTTER_TYPE_TEXTURE, ClutterTextureClass))
 
-typedef struct ClutterTexturePrivate ClutterTexturePrivate ;
 typedef struct _ClutterTexture      ClutterTexture;
 typedef struct _ClutterTextureClass ClutterTextureClass;
+typedef struct ClutterTexturePrivate ClutterTexturePrivate;
 
 struct _ClutterTexture
 {
   ClutterActor         parent;
 
   ClutterTexturePrivate *priv;
-}; 
+};
 
-struct _ClutterTextureClass 
+struct _ClutterTextureClass
 {
   ClutterActorClass parent_class;
 
-  void (*size_change) (ClutterTexture *texture, gint width, gint height);
-  void (*pixbuf_change) (ClutterTexture *texture );
-}; 
+  void (*size_change) (ClutterTexture *texture, 
+		       gint width, 
+		       gint height);
+  void (*pixbuf_change) (ClutterTexture *texture);
+};
 
 GType clutter_texture_get_type (void);
 
-ClutterActor*
-clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf);
+ClutterActor *clutter_texture_new_from_pixbuf (GdkPixbuf *pixbuf);
 
-ClutterActor*
-clutter_texture_new (void);
+ClutterActor *clutter_texture_new (void);
 
-void
-clutter_texture_set_pixbuf (ClutterTexture *texture, GdkPixbuf *pixbuf);
+void clutter_texture_set_pixbuf (ClutterTexture *texture, GdkPixbuf *pixbuf);
 
-GdkPixbuf*
-clutter_texture_get_pixbuf (ClutterTexture* texture);
+GdkPixbuf *clutter_texture_get_pixbuf (ClutterTexture* texture);
 
-void
-clutter_texture_get_base_size (ClutterTexture *texture, 
+voidclutter_texture_get_base_size (ClutterTexture *texture, 
 			       gint           *width,
 			       gint           *height);
 
 /* Below mainly for subclassed texture based actors */
 
-void
-clutter_texture_bind_tile (ClutterTexture *texture, gint index);
+void clutter_texture_bind_tile (ClutterTexture *texture, gint index);
 
-void
-clutter_texture_get_n_tiles (ClutterTexture *texture, 
+void clutter_texture_get_n_tiles (ClutterTexture *texture, 
 			     gint           *n_x_tiles,
 			     gint           *n_y_tiles);
 
-void
-clutter_texture_get_x_tile_detail (ClutterTexture *texture, 
+void clutter_texture_get_x_tile_detail (ClutterTexture *texture, 
 				   gint            x_index,
 				   gint           *pos,
 				   gint           *size,
 				   gint           *waste);
 
-void
-clutter_texture_get_y_tile_detail (ClutterTexture *texture, 
+void clutter_texture_get_y_tile_detail (ClutterTexture *texture, 
 				   gint            y_index,
 				   gint           *pos,
 				   gint           *size,
 				   gint           *waste);
 
-gboolean
-clutter_texture_has_generated_tiles (ClutterTexture *texture);
+gboolean clutter_texture_has_generated_tiles (ClutterTexture *texture);
 
-gboolean
-clutter_texture_is_tiled (ClutterTexture *texture);
+gboolean clutter_texture_is_tiled (ClutterTexture *texture);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-video-texture.h b/clutter/clutter-video-texture.h
index 0547d2385..08481c854 100644
--- a/clutter/clutter-video-texture.h
+++ b/clutter/clutter-video-texture.h
@@ -56,9 +56,9 @@ G_BEGIN_DECLS
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
   CLUTTER_TYPE_VIDEO_TEXTURE, ClutterVideoTextureClass))
 
-typedef struct ClutterVideoTexturePrivate ClutterVideoTexturePrivate ;
 typedef struct _ClutterVideoTexture       ClutterVideoTexture;
 typedef struct _ClutterVideoTextureClass  ClutterVideoTextureClass;
+typedef struct ClutterVideoTexturePrivate ClutterVideoTexturePrivate;
 
 /* #define CLUTTER_VIDEO_TEXTURE_ERROR clutter_video_texture_error_quark() */