[vala/wip/attributes: 5/39] Regenerate all bindings with reordered attributes and arguments



commit c31eb77b7f548c6e5a91706267f6196bbd0611ff
Author: Luca Bruno <lucabru src gnome org>
Date:   Sun Jul 31 16:56:23 2011 +0200

    Regenerate all bindings with reordered attributes and arguments

 vapi/atk.vapi                         |   46 +-
 vapi/clutter-1.0.vapi                 |  384 +++++++-------
 vapi/clutter-gtk-0.10.vapi            |    8 +-
 vapi/clutter-gtk-1.0.vapi             |   12 +-
 vapi/cogl-1.0.vapi                    |  118 ++--
 vapi/gconf-2.0.vapi                   |   26 +-
 vapi/gdk-2.0.vapi                     |  286 +++++-----
 vapi/gdk-3.0.vapi                     |  148 +++---
 vapi/gdk-pixbuf-2.0.vapi              |   30 +-
 vapi/gdk-x11-2.0.vapi                 |    8 +-
 vapi/gdk-x11-3.0.vapi                 |   18 +-
 vapi/gdl-1.0.vapi                     |   32 +-
 vapi/gdu-gtk.vapi                     |   84 ++--
 vapi/gdu.vapi                         |   12 +-
 vapi/gedit-2.20.vapi                  |   34 +-
 vapi/gio-2.0.vapi                     |  372 +++++++-------
 vapi/gio-unix-2.0.vapi                |   26 +-
 vapi/gnome-desktop-2.0.vapi           |   18 +-
 vapi/gnome-keyring-1.vapi             |   32 +-
 vapi/gnome-vfs-2.0.vapi               |  156 +++---
 vapi/goocanvas.vapi                   |   44 +-
 vapi/gstreamer-0.10.vapi              |  248 +++++-----
 vapi/gstreamer-app-0.10.vapi          |    6 +-
 vapi/gstreamer-audio-0.10.vapi        |   22 +-
 vapi/gstreamer-base-0.10.vapi         |   20 +-
 vapi/gstreamer-cdda-0.10.vapi         |    4 +-
 vapi/gstreamer-check-0.10.vapi        |    2 +-
 vapi/gstreamer-controller-0.10.vapi   |    8 +-
 vapi/gstreamer-dataprotocol-0.10.vapi |    8 +-
 vapi/gstreamer-fft-0.10.vapi          |   18 +-
 vapi/gstreamer-interfaces-0.10.vapi   |   22 +-
 vapi/gstreamer-net-0.10.vapi          |    4 +-
 vapi/gstreamer-netbuffer-0.10.vapi    |    4 +-
 vapi/gstreamer-pbutils-0.10.vapi      |   10 +-
 vapi/gstreamer-riff-0.10.vapi         |   14 +-
 vapi/gstreamer-rtp-0.10.vapi          |   12 +-
 vapi/gstreamer-rtsp-0.10.vapi         |   48 +-
 vapi/gstreamer-sdp-0.10.vapi          |   24 +-
 vapi/gstreamer-tag-0.10.vapi          |    4 +-
 vapi/gstreamer-video-0.10.vapi        |   62 ++--
 vapi/gtk+-2.0.vapi                    |  946 ++++++++++++++++----------------
 vapi/gtk+-3.0.vapi                    |  910 ++++++++++++++++----------------
 vapi/gtksourceview-2.0.vapi           |   16 +-
 vapi/gtksourceview-3.0.vapi           |   66 ++--
 vapi/gudev-1.0.vapi                   |    6 +-
 vapi/hildon-1.vapi                    |  178 +++---
 vapi/hildon-fm-2.vapi                 |   30 +-
 vapi/json-glib-1.0.vapi               |   28 +-
 vapi/libepc-1.0.vapi                  |   16 +-
 vapi/libgda-4.0.vapi                  |  308 ++++++------
 vapi/libgda-report-4.0.vapi           |    4 +-
 vapi/libgdata.vapi                    |   74 ++--
 vapi/libglade-2.0.vapi                |   16 +-
 vapi/libgnome-2.0.vapi                |   18 +-
 vapi/libgnome-menu.vapi               |   20 +-
 vapi/libgnomeui-2.0.vapi              |   66 ++--
 vapi/libgsf-1.vapi                    |  112 ++--
 vapi/libnotify.vapi                   |    2 +-
 vapi/liboobs-1.vapi                   |   30 +-
 vapi/libpeas-1.0.vapi                 |   32 +-
 vapi/librsvg-2.0.vapi                 |   10 +-
 vapi/libsexy.vapi                     |   16 +-
 vapi/libsoup-2.2.vapi                 |   64 ++--
 vapi/libsoup-2.4.vapi                 |  186 ++++----
 vapi/libwnck-1.0.vapi                 |   30 +-
 vapi/loudmouth-1.0.vapi               |   34 +-
 vapi/mx-1.0.vapi                      |   88 ++--
 vapi/pango.vapi                       |  126 +++---
 vapi/pangocairo.vapi                  |    2 +-
 vapi/poppler-glib.vapi                |   88 ++--
 vapi/purple.vapi                      |  430 ++++++++--------
 vapi/rest-0.6.vapi                    |   18 +-
 vapi/rest-0.7.vapi                    |   40 +-
 vapi/rest-extras-0.6.vapi             |   16 +-
 vapi/tracker-indexer-module-1.0.vapi  |   10 +-
 vapi/twitter-glib-1.0.vapi            |    6 +-
 vapi/unique-1.0.vapi                  |    6 +-
 vapi/vte-2.90.vapi                    |   24 +-
 vapi/vte.vapi                         |   24 +-
 vapi/webkit-1.0.vapi                  |   26 +-
 80 files changed, 3278 insertions(+), 3278 deletions(-)
---
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 55d2375..3e211fd 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -1,15 +1,15 @@
 /* atk.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Atk", lower_case_cprefix = "atk_", gir_namespace = "Atk", gir_version = "1.0")]
+[CCode (cprefix = "Atk", gir_namespace = "Atk", gir_version = "1.0", lower_case_cprefix = "atk_")]
 namespace Atk {
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class Attribute {
 		public weak string name;
 		public weak string value;
 	}
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class AttributeSet {
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -41,8 +41,8 @@ namespace Atk {
 		public int start_index { get; }
 		public virtual signal void link_activated ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class KeyEventStruct {
 		public uint16 keycode;
 		public uint keyval;
@@ -63,12 +63,12 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class NoOpObject : Atk.Object, Atk.Component, Atk.Action, Atk.EditableText, Atk.Image, Atk.Selection, Atk.Table, Atk.Text, Atk.Hypertext, Atk.Value, Atk.Document {
-		[CCode (type = "AtkObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "AtkObject*")]
 		public NoOpObject (GLib.Object obj);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class NoOpObjectFactory : Atk.ObjectFactory {
-		[CCode (type = "AtkObjectFactory*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "AtkObjectFactory*")]
 		public NoOpObjectFactory ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
@@ -153,14 +153,14 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Plug : Atk.Object {
-		[CCode (type = "AtkObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "AtkObject*")]
 		public Plug ();
 		public unowned string get_id ();
 		[NoWrapper]
 		public virtual unowned string get_object_id ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class PropertyValues {
 		public GLib.Value new_value;
 		public GLib.Value old_value;
@@ -209,7 +209,7 @@ namespace Atk {
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Socket : Atk.Object {
 		public weak string embedded_plug_id;
-		[CCode (type = "AtkObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "AtkObject*")]
 		public Socket ();
 		public virtual void embed (string plug_id);
 		public bool is_occupied ();
@@ -229,16 +229,16 @@ namespace Atk {
 		public bool remove_state (Atk.StateType type);
 		public unowned Atk.StateSet xor_sets (Atk.StateSet compare_set);
 	}
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class TextRange {
 		public weak Atk.TextRectangle bounds;
 		public weak string content;
 		public int end_offset;
 		public int start_offset;
 	}
-	[Compact]
 	[CCode (cheader_filename = "atk/atk.h")]
+	[Compact]
 	public class TextRectangle {
 		public int height;
 		public int width;
@@ -441,7 +441,7 @@ namespace Atk {
 		public abstract void get_minimum_value (GLib.Value value);
 		public abstract bool set_current_value (GLib.Value value);
 	}
-	[CCode (type_id = "ATK_TYPE_RECTANGLE", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "ATK_TYPE_RECTANGLE")]
 	public struct Rectangle {
 		public int x;
 		public int y;
@@ -449,30 +449,30 @@ namespace Atk {
 		public int height;
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
-	[SimpleType]
 	[IntegerType (rank = 11)]
+	[SimpleType]
 	public struct State : uint64 {
 		public static Atk.StateType type_for_name (string name);
 		public static unowned string type_get_name (Atk.StateType type);
 		public static Atk.StateType type_register (string name);
 	}
-	[CCode (cprefix = "ATK_XY_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_XY_")]
 	public enum CoordType {
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cprefix = "ATK_HYPERLINK_IS_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_HYPERLINK_IS_")]
 	[Flags]
 	public enum HyperlinkStateFlags {
 		INLINE
 	}
-	[CCode (cprefix = "ATK_KEY_EVENT_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_KEY_EVENT_")]
 	public enum KeyEventType {
 		PRESS,
 		RELEASE,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_LAYER_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_LAYER_")]
 	public enum Layer {
 		INVALID,
 		BACKGROUND,
@@ -483,7 +483,7 @@ namespace Atk {
 		OVERLAY,
 		WINDOW
 	}
-	[CCode (cprefix = "ATK_RELATION_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_RELATION_")]
 	public enum RelationType {
 		NULL,
 		CONTROLLED_BY,
@@ -504,7 +504,7 @@ namespace Atk {
 		NODE_PARENT_OF,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_ROLE_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_")]
 	public enum Role {
 		INVALID,
 		ACCEL_LABEL,
@@ -596,7 +596,7 @@ namespace Atk {
 		INPUT_METHOD_WINDOW,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_STATE_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_STATE_")]
 	public enum StateType {
 		INVALID,
 		ACTIVE,
@@ -639,7 +639,7 @@ namespace Atk {
 		VISITED,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_TEXT_ATTR_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_ATTR_")]
 	public enum TextAttribute {
 		INVALID,
 		LEFT_MARGIN,
@@ -671,7 +671,7 @@ namespace Atk {
 		STYLE,
 		LAST_DEFINED
 	}
-	[CCode (cprefix = "ATK_TEXT_BOUNDARY_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_BOUNDARY_")]
 	public enum TextBoundary {
 		CHAR,
 		WORD_START,
@@ -681,7 +681,7 @@ namespace Atk {
 		LINE_START,
 		LINE_END
 	}
-	[CCode (cprefix = "ATK_TEXT_CLIP_", cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_CLIP_")]
 	public enum TextClipType {
 		NONE,
 		MIN,
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index d6fa45a..44857bf 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -1,6 +1,6 @@
 /* clutter-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Clutter", lower_case_cprefix = "clutter_", gir_namespace = "Clutter", gir_version = "1.0")]
+[CCode (cprefix = "Clutter", gir_namespace = "Clutter", gir_version = "1.0", lower_case_cprefix = "clutter_")]
 namespace Clutter {
 	[CCode (cprefix = "ClutterFrameSource", lower_case_cprefix = "clutter_frame_source_")]
 	namespace FrameSource {
@@ -13,23 +13,23 @@ namespace Clutter {
 	namespace Threads {
 		[CCode (cprefix = "ClutterThreadsFrameSource", lower_case_cprefix = "clutter_threads_frame_source_")]
 		namespace FrameSource {
-			[CCode (cname = "clutter_threads_add_frame_source", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_frame_source")]
 			public static uint add (uint fps, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc func);
-			[CCode (cname = "clutter_threads_add_frame_source_full", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_frame_source_full")]
 			public static uint add_full (int priority, uint fps, [CCode (delegate_target_pos = 3.1)] owned GLib.SourceFunc func);
 		}
 		[CCode (cprefix = "ClutterThreadsIdle", lower_case_cprefix = "clutter_threads_idle_")]
 		namespace Idle {
-			[CCode (cname = "clutter_threads_add_idle", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle")]
 			public static uint add (GLib.SourceFunc func);
-			[CCode (cname = "clutter_threads_add_idle_full", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_idle_full")]
 			public static uint add_full (int priority, [CCode (delegate_target_pos = 2.1)] owned GLib.SourceFunc func);
 		}
 		[CCode (cprefix = "ClutterThreadsTimeout", lower_case_cprefix = "clutter_threads_timeout_")]
 		namespace Timeout {
-			[CCode (cname = "clutter_threads_add_timeout", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout")]
 			public static uint add (uint interval, [CCode (delegate_target_pos = 2.1)] GLib.SourceFunc func);
-			[CCode (cname = "clutter_threads_add_timeout_full", cheader_filename = "clutter/clutter.h")]
+			[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_threads_add_timeout_full")]
 			public static uint add_full (int priority, uint interval, [CCode (delegate_target_pos = 3.1)] owned GLib.SourceFunc func);
 		}
 		[CCode (cheader_filename = "clutter/clutter.h")]
@@ -47,7 +47,7 @@ namespace Clutter {
 	}
 	[CCode (cprefix = "ClutterUtil", lower_case_cprefix = "clutter_util_")]
 	namespace Util {
-		[CCode (cname = "clutter_util_next_p2", cheader_filename = "clutter/clutter.h")]
+		[CCode (cheader_filename = "clutter/clutter.h", cname = "clutter_util_next_p2")]
 		public static int next_power_of_2 (int a);
 	}
 	[CCode (cprefix = "ClutterValue", lower_case_cprefix = "clutter_value_")]
@@ -56,11 +56,11 @@ namespace Clutter {
 		public static unowned Clutter.Color? get_color (GLib.Value value);
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static unowned Cogl.Fixed? get_fixed (GLib.Value value);
-		[CCode (cheader_filename = "clutter/clutter.h", array_length_pos = 1.1, array_length_type = "gsize")]
+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
 		public static unowned float[] get_shader_float (GLib.Value value);
-		[CCode (cheader_filename = "clutter/clutter.h", array_length_pos = 1.1, array_length_type = "gsize")]
+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
 		public static unowned int[] get_shader_int (GLib.Value value);
-		[CCode (cheader_filename = "clutter/clutter.h", array_length_pos = 1.1, array_length_type = "gsize")]
+		[CCode (array_length_pos = 1.1, array_length_type = "gsize", cheader_filename = "clutter/clutter.h")]
 		public static unowned float[] get_shader_matrix (GLib.Value value);
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static Clutter.Units get_units (GLib.Value value);
@@ -69,20 +69,20 @@ namespace Clutter {
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static void set_fixed (GLib.Value value, Cogl.Fixed fixed_);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_float (GLib.Value value, [CCode (type = "gfloat*", array_length_cname = "size", array_length_pos = 1.5)] float[] floats);
+		public static void set_shader_float (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gfloat*")] float[] floats);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_int (GLib.Value value, [CCode (type = "gint*", array_length_cname = "size", array_length_pos = 1.5)] int[] ints);
+		public static void set_shader_int (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gint*")] int[] ints);
 		[CCode (cheader_filename = "clutter/clutter.h")]
-		public static void set_shader_matrix (GLib.Value value, [CCode (type = "gfloat*", array_length_cname = "size", array_length_pos = 1.5)] float[] matrix);
+		public static void set_shader_matrix (GLib.Value value, [CCode (array_length_cname = "size", array_length_pos = 1.5, type = "gfloat*")] float[] matrix);
 		[CCode (cheader_filename = "clutter/clutter.h")]
 		public static void set_units (GLib.Value value, Clutter.Units units);
 	}
-	[CCode (type_id = "clutter_action_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_action_get_type ()")]
 	public abstract class Action : Clutter.ActorMeta {
 		[CCode (has_construct_function = false)]
 		protected Action ();
 	}
-	[CCode (type_id = "clutter_actor_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")]
 	public abstract class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
 		public uint32 flags;
 		[CCode (has_construct_function = false)]
@@ -347,7 +347,7 @@ namespace Clutter {
 		[HasEmitter]
 		public virtual signal void unrealize ();
 	}
-	[CCode (type_id = "clutter_actor_meta_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_meta_get_type ()")]
 	public abstract class ActorMeta : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected ActorMeta ();
@@ -362,9 +362,9 @@ namespace Clutter {
 		public bool enabled { get; set; }
 		public string name { get; set; }
 	}
-	[CCode (type_id = "clutter_align_constraint_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
 	public class AlignConstraint : Clutter.Constraint {
-		[CCode (type = "ClutterConstraint*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
 		public Clutter.AlignAxis get_align_axis ();
 		public float get_factor ();
@@ -376,7 +376,7 @@ namespace Clutter {
 		public float factor { get; set construct; }
 		public Clutter.Actor source { get; set construct; }
 	}
-	[CCode (type_id = "clutter_alpha_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_alpha_get_type ()")]
 	public class Alpha : GLib.InitiallyUnowned, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public Alpha ();
@@ -397,7 +397,7 @@ namespace Clutter {
 		public ulong mode { get; set construct; }
 		public Clutter.Timeline timeline { get; set; }
 	}
-	[CCode (type_id = "clutter_animation_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_animation_get_type ()")]
 	public class Animation : GLib.Object, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public Animation ();
@@ -430,7 +430,7 @@ namespace Clutter {
 		public virtual signal void completed ();
 		public virtual signal void started ();
 	}
-	[CCode (type_id = "clutter_animator_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_animator_get_type ()")]
 	public class Animator : GLib.Object, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public Animator ();
@@ -451,8 +451,8 @@ namespace Clutter {
 		public uint duration { get; set; }
 		public Clutter.Timeline timeline { get; set; }
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_animator_key_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_animator_key_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class AnimatorKey {
 		public ulong get_mode ();
 		public unowned GLib.Object get_object ();
@@ -507,7 +507,7 @@ namespace Clutter {
 		public signal void resolution_changed ();
 		public signal void settings_changed ();
 	}
-	[CCode (type_id = "clutter_behaviour_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_get_type ()")]
 	public abstract class Behaviour : GLib.Object, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Behaviour ();
@@ -527,10 +527,10 @@ namespace Clutter {
 		public virtual signal void applied (Clutter.Actor actor);
 		public virtual signal void removed (Clutter.Actor actor);
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_depth_get_type ()")]
 	[Deprecated (since = "1.6")]
-	[CCode (type_id = "clutter_behaviour_depth_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class BehaviourDepth : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourDepth (Clutter.Alpha? alpha, int depth_start, int depth_end);
 		public void get_bounds (out int depth_start, out int depth_end);
 		public void set_bounds (int depth_start, int depth_end);
@@ -539,9 +539,9 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public int depth_start { get; set; }
 	}
-	[CCode (type_id = "clutter_behaviour_ellipse_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_ellipse_get_type ()")]
 	public class BehaviourEllipse : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourEllipse (Clutter.Alpha? alpha, int x, int y, int width, int height, Clutter.RotateDirection direction, double start, double end);
 		public double get_angle_end ();
 		public double get_angle_start ();
@@ -573,10 +573,10 @@ namespace Clutter {
 		public int height { get; set; }
 		public int width { get; set; }
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_opacity_get_type ()")]
 	[Deprecated (since = "1.6")]
-	[CCode (type_id = "clutter_behaviour_opacity_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class BehaviourOpacity : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourOpacity (Clutter.Alpha? alpha, uint8 opacity_start, uint8 opacity_end);
 		public void get_bounds (out uint8 opacity_start, out uint8 opacity_end);
 		public void set_bounds (uint8 opacity_start, uint8 opacity_end);
@@ -585,24 +585,24 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public uint opacity_start { get; set; }
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_path_get_type ()")]
 	[Deprecated (since = "1.6")]
-	[CCode (type_id = "clutter_behaviour_path_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class BehaviourPath : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourPath (Clutter.Alpha? alpha, Clutter.Path path);
 		public unowned Clutter.Path get_path ();
 		public void set_path (Clutter.Path path);
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourPath.with_description (Clutter.Alpha? alpha, string desc);
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
-		public BehaviourPath.with_knots (Clutter.Alpha? alpha, [CCode (type = "ClutterKnot*", array_length_type = "guint", array_length_cname = "n_knots", array_length_pos = 2.1)] Clutter.Knot[] knots);
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
+		public BehaviourPath.with_knots (Clutter.Alpha? alpha, [CCode (array_length_cname = "n_knots", array_length_pos = 2.1, array_length_type = "guint", type = "ClutterKnot*")] Clutter.Knot[] knots);
 		public Clutter.Path path { get; set; }
 		public virtual signal void knot_reached (uint knot_num);
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_rotate_get_type ()")]
 	[Deprecated (since = "1.6")]
-	[CCode (type_id = "clutter_behaviour_rotate_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class BehaviourRotate : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourRotate (Clutter.Alpha? alpha, Clutter.RotateAxis axis, Clutter.RotateDirection direction, double angle_start, double angle_end);
 		public Clutter.RotateAxis get_axis ();
 		public void get_bounds (out double angle_start, out double angle_end);
@@ -625,10 +625,10 @@ namespace Clutter {
 		public int center_z { get; set; }
 		public Clutter.RotateDirection direction { get; set; }
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_behaviour_scale_get_type ()")]
 	[Deprecated (since = "1.6")]
-	[CCode (type_id = "clutter_behaviour_scale_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class BehaviourScale : Clutter.Behaviour, Clutter.Scriptable {
-		[CCode (type = "ClutterBehaviour*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterBehaviour*")]
 		public BehaviourScale (Clutter.Alpha? alpha, double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end);
 		public void get_bounds (out double x_scale_start, out double y_scale_start, out double x_scale_end, out double y_scale_end);
 		public void set_bounds (double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end);
@@ -641,9 +641,9 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public double y_scale_start { get; set; }
 	}
-	[CCode (type_id = "clutter_bin_layout_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bin_layout_get_type ()")]
 	public class BinLayout : Clutter.LayoutManager {
-		[CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public BinLayout (Clutter.BinAlignment x_align, Clutter.BinAlignment y_align);
 		public void add (Clutter.Actor child, Clutter.BinAlignment x_align, Clutter.BinAlignment y_align);
 		public void get_alignment (Clutter.Actor? child, out Clutter.BinAlignment x_align, out Clutter.BinAlignment y_align);
@@ -653,9 +653,9 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public Clutter.BinAlignment y_align { get; set; }
 	}
-	[CCode (type_id = "clutter_bind_constraint_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
 	public class BindConstraint : Clutter.Constraint {
-		[CCode (type = "ClutterConstraint*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
 		public Clutter.BindCoordinate get_coordinate ();
 		public float get_offset ();
@@ -667,7 +667,7 @@ namespace Clutter {
 		public float offset { get; set construct; }
 		public Clutter.Actor source { get; set construct; }
 	}
-	[CCode (type_id = "clutter_binding_pool_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
 	public class BindingPool : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public BindingPool (string name);
@@ -676,7 +676,7 @@ namespace Clutter {
 		public static unowned Clutter.BindingPool find (string name);
 		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
 		public static unowned Clutter.BindingPool get_for_class (void* klass);
-		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GCallback", delegate_target_pos = 4.1)] owned Clutter.BindingActionFunc callback);
+		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (delegate_target_pos = 4.1, type = "GCallback")] owned Clutter.BindingActionFunc callback);
 		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GClosure*")] owned Clutter.BindingActionFunc closure);
 		public void override_action (uint key_val, Clutter.ModifierType modifiers, [CCode (delegate_target_pos = 3.1)] owned GLib.Callback callback);
 		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
@@ -685,14 +685,14 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public string name { owned get; construct; }
 	}
-	[CCode (type_id = "clutter_blur_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_blur_effect_get_type ()")]
 	public class BlurEffect : Clutter.OffscreenEffect {
-		[CCode (type = "ClutterEffect*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
 		public BlurEffect ();
 	}
-	[CCode (type_id = "clutter_box_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_get_type ()")]
 	public class Box : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Box (Clutter.LayoutManager manager);
 		public Clutter.Color get_color ();
 		public unowned Clutter.LayoutManager get_layout_manager ();
@@ -700,7 +700,7 @@ namespace Clutter {
 		public void pack_after (Clutter.Actor actor, Clutter.Actor? sibling, ...);
 		public void pack_at (Clutter.Actor actor, int position, ...);
 		public void pack_before (Clutter.Actor actor, Clutter.Actor? sibling, ...);
-		public void packv (Clutter.Actor actor, [CCode (array_length_type = "guint", array_length_cname = "n_properties", array_length_pos = 1.5)] string[] properties, [CCode (array_length_type = "guint", array_length_cname = "n_properties", array_length_pos = 1.5)] GLib.Value[] values);
+		public void packv (Clutter.Actor actor, [CCode (array_length_cname = "n_properties", array_length_pos = 1.5, array_length_type = "guint")] string[] properties, [CCode (array_length_cname = "n_properties", array_length_pos = 1.5, array_length_type = "guint")] GLib.Value[] values);
 		public void set_color (Clutter.Color? color);
 		public void set_layout_manager (Clutter.LayoutManager manager);
 		public Clutter.Color color { get; set; }
@@ -708,9 +708,9 @@ namespace Clutter {
 		public bool color_set { get; set; }
 		public Clutter.LayoutManager layout_manager { get; set construct; }
 	}
-	[CCode (type_id = "clutter_box_layout_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")]
 	public class BoxLayout : Clutter.LayoutManager {
-		[CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public BoxLayout ();
 		public void get_alignment (Clutter.Actor actor, out Clutter.BoxAlignment x_align, out Clutter.BoxAlignment y_align);
 		public uint get_easing_duration ();
@@ -741,9 +741,9 @@ namespace Clutter {
 		public bool use_animations { get; set; }
 		public bool vertical { get; set; }
 	}
-	[CCode (type_id = "clutter_cairo_texture_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_cairo_texture_get_type ()")]
 	public class CairoTexture : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public CairoTexture (uint width, uint height);
 		public void clear ();
 		public Cairo.Context create ();
@@ -756,7 +756,7 @@ namespace Clutter {
 		public uint surface_width { get; set; }
 		public virtual signal Cairo.Surface create_surface (uint width, uint height);
 	}
-	[CCode (type_id = "clutter_child_meta_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
 	public abstract class ChildMeta : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected ChildMeta ();
@@ -765,9 +765,9 @@ namespace Clutter {
 		public Clutter.Actor actor { get; construct; }
 		public Clutter.Container container { get; construct; }
 	}
-	[CCode (type_id = "clutter_click_action_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_click_action_get_type ()")]
 	public class ClickAction : Clutter.Action {
-		[CCode (type = "ClutterAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterAction*")]
 		public ClickAction ();
 		public uint get_button ();
 		public Clutter.ModifierType get_state ();
@@ -778,30 +778,30 @@ namespace Clutter {
 		public bool pressed { get; }
 		public virtual signal void clicked (Clutter.Actor actor);
 	}
-	[CCode (type_id = "clutter_clone_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")]
 	public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Clone (Clutter.Actor source);
 		public unowned Clutter.Actor get_source ();
 		public void set_source (Clutter.Actor source);
 		public Clutter.Actor source { get; set construct; }
 	}
-	[CCode (type_id = "clutter_colorize_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_colorize_effect_get_type ()")]
 	public class ColorizeEffect : Clutter.OffscreenEffect {
-		[CCode (type = "ClutterEffect*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
 		public ColorizeEffect (Clutter.Color tint);
 		public Clutter.Color get_tint ();
 		public void set_tint (Clutter.Color tint);
 		public Clutter.Color tint { get; set; }
 	}
-	[CCode (type_id = "clutter_constraint_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_constraint_get_type ()")]
 	public abstract class Constraint : Clutter.ActorMeta {
 		[CCode (has_construct_function = false)]
 		protected Constraint ();
 		[NoWrapper]
 		public virtual void update_allocation (Clutter.Actor actor, Clutter.ActorBox allocation);
 	}
-	[CCode (type_id = "clutter_deform_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_deform_effect_get_type ()")]
 	public abstract class DeformEffect : Clutter.OffscreenEffect {
 		[CCode (has_construct_function = false)]
 		protected DeformEffect ();
@@ -817,15 +817,15 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public uint y_tiles { get; set; }
 	}
-	[CCode (type_id = "clutter_desaturate_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_desaturate_effect_get_type ()")]
 	public class DesaturateEffect : Clutter.OffscreenEffect {
-		[CCode (type = "ClutterEffect*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
 		public DesaturateEffect (double factor);
 		public double get_factor ();
 		public void set_factor (double factor);
 		public double factor { get; set; }
 	}
-	[CCode (type_id = "clutter_device_manager_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_device_manager_get_type ()")]
 	public abstract class DeviceManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected DeviceManager ();
@@ -845,9 +845,9 @@ namespace Clutter {
 		public signal void device_added (Clutter.InputDevice device);
 		public signal void device_removed (Clutter.InputDevice device);
 	}
-	[CCode (type_id = "clutter_drag_action_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_drag_action_get_type ()")]
 	public class DragAction : Clutter.Action {
-		[CCode (type = "ClutterAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterAction*")]
 		public DragAction ();
 		public Clutter.DragAxis get_drag_axis ();
 		public unowned Clutter.Actor get_drag_handle ();
@@ -867,7 +867,7 @@ namespace Clutter {
 		public virtual signal void drag_end (Clutter.Actor actor, float event_x, float event_y, Clutter.ModifierType modifiers);
 		public virtual signal void drag_motion (Clutter.Actor actor, float delta_x, float delta_y);
 	}
-	[CCode (type_id = "clutter_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_effect_get_type ()")]
 	public abstract class Effect : Clutter.ActorMeta {
 		[CCode (has_construct_function = false)]
 		protected Effect ();
@@ -878,8 +878,8 @@ namespace Clutter {
 		[NoWrapper]
 		public virtual bool pre_paint ();
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_event_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class Event {
 		public Clutter.AnyEvent any;
 		public Clutter.ButtonEvent button;
@@ -918,14 +918,14 @@ namespace Clutter {
 		public void put ();
 		public void set_device (Clutter.InputDevice device);
 	}
-	[CCode (type_id = "clutter_fixed_layout_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_fixed_layout_get_type ()")]
 	public class FixedLayout : Clutter.LayoutManager {
-		[CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public FixedLayout ();
 	}
-	[CCode (type_id = "clutter_flow_layout_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
 	public class FlowLayout : Clutter.LayoutManager {
-		[CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public FlowLayout (Clutter.FlowOrientation orientation);
 		public float get_column_spacing ();
 		public void get_column_width (out float min_width, out float max_width);
@@ -952,15 +952,15 @@ namespace Clutter {
 		public Clutter.FlowOrientation orientation { get; set construct; }
 		public float row_spacing { get; set; }
 	}
-	[CCode (type_id = "clutter_group_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_group_get_type ()")]
 	public class Group : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Group ();
 		public int get_n_children ();
 		public unowned Clutter.Actor get_nth_child (int index_);
 		public void remove_all ();
 	}
-	[CCode (type_id = "clutter_input_device_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")]
 	public class InputDevice : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected InputDevice ();
@@ -999,7 +999,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public string name { owned get; construct; }
 	}
-	[CCode (type_id = "clutter_interval_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_interval_get_type ()")]
 	public class Interval : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		public Interval (GLib.Type gtype, ...);
@@ -1021,7 +1021,7 @@ namespace Clutter {
 		public Interval.with_values (GLib.Type gtype, GLib.Value initial, GLib.Value final);
 		public GLib.Type value_type { get; construct; }
 	}
-	[CCode (type_id = "clutter_layout_manager_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_manager_get_type ()")]
 	public abstract class LayoutManager : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected LayoutManager ();
@@ -1047,26 +1047,26 @@ namespace Clutter {
 		[HasEmitter]
 		public virtual signal void layout_changed ();
 	}
-	[CCode (type_id = "clutter_layout_meta_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_layout_meta_get_type ()")]
 	public abstract class LayoutMeta : Clutter.ChildMeta {
 		[CCode (has_construct_function = false)]
 		protected LayoutMeta ();
 		public unowned Clutter.LayoutManager get_manager ();
 		public Clutter.LayoutManager manager { get; construct; }
 	}
-	[CCode (type_id = "clutter_list_model_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_list_model_get_type ()")]
 	public class ListModel : Clutter.Model, Clutter.Scriptable, Clutter.Scriptable {
-		[CCode (type = "ClutterModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterModel*")]
 		public ListModel (uint n_columns, ...);
-		[CCode (cname = "clutter_list_model_newv", type = "ClutterModel*", has_construct_function = false)]
+		[CCode (cname = "clutter_list_model_newv", has_construct_function = false, type = "ClutterModel*")]
 		public ListModel.newv ([CCode (array_length_pos = 0.9)] GLib.Type[] types, [CCode (array_length_pos = 0.9)] string[] names);
 	}
-	[CCode (type_id = "clutter_model_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_model_get_type ()")]
 	public abstract class Model : GLib.Object, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Model ();
 		public void append (...);
-		public void appendv ([CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] uint[] columns, [CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] GLib.Value[] values);
+		public void appendv ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] uint[] columns, [CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
 		public bool filter_iter (Clutter.ModelIter iter);
 		public bool filter_row (uint row);
 		public void @foreach (Clutter.ModelForeachFunc func);
@@ -1083,18 +1083,18 @@ namespace Clutter {
 		[NoWrapper]
 		public virtual unowned Clutter.ModelIter insert_row (int index_);
 		public void insert_value (uint row, uint column, GLib.Value value);
-		public void insertv (uint row, [CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 1.5)] uint[] columns, [CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 1.5)] GLib.Value[] values);
+		public void insertv (uint row, [CCode (array_length_cname = "n_columns", array_length_pos = 1.5, array_length_type = "guint")] uint[] columns, [CCode (array_length_cname = "n_columns", array_length_pos = 1.5, array_length_type = "guint")] GLib.Value[] values);
 		public void prepend (...);
-		public void prependv ([CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] uint[] columns, [CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] GLib.Value[] values);
+		public void prependv ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] uint[] columns, [CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] GLib.Value[] values);
 		public void remove (uint row);
 		[NoWrapper]
 		public virtual void remove_row (uint row);
 		public void resort ();
 		public void set_filter (owned Clutter.ModelFilterFunc? func);
-		public void set_names ([CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] string[] names);
+		public void set_names ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] string[] names);
 		public void set_sort (int column, [CCode (delegate_target_pos = 2.1)] owned Clutter.ModelSortFunc? func);
 		public void set_sorting_column (int column);
-		public void set_types ([CCode (array_length_type = "guint", array_length_cname = "n_columns", array_length_pos = 0.5)] GLib.Type[] types);
+		public void set_types ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] GLib.Type[] types);
 		public bool filter_set { get; }
 		public virtual signal void filter_changed ();
 		public virtual signal void row_added (Clutter.ModelIter iter);
@@ -1102,7 +1102,7 @@ namespace Clutter {
 		public virtual signal void row_removed (Clutter.ModelIter iter);
 		public virtual signal void sort_changed ();
 	}
-	[CCode (type_id = "clutter_model_iter_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_model_iter_get_type ()")]
 	public abstract class ModelIter : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected ModelIter ();
@@ -1122,7 +1122,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public uint row { get; set; }
 	}
-	[CCode (type_id = "clutter_offscreen_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_offscreen_effect_get_type ()")]
 	public abstract class OffscreenEffect : Clutter.Effect {
 		[CCode (has_construct_function = false)]
 		protected OffscreenEffect ();
@@ -1130,9 +1130,9 @@ namespace Clutter {
 		public unowned Cogl.Material get_target ();
 		public virtual void paint_target ();
 	}
-	[CCode (type_id = "clutter_page_turn_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_page_turn_effect_get_type ()")]
 	public class PageTurnEffect : Clutter.DeformEffect {
-		[CCode (type = "ClutterEffect*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterEffect*")]
 		public PageTurnEffect (double period, double angle, float radius);
 		public double get_angle ();
 		public double get_period ();
@@ -1144,8 +1144,8 @@ namespace Clutter {
 		public double period { get; set; }
 		public float radius { get; set; }
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_paint_volume_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class PaintVolume {
 		public Clutter.PaintVolume copy ();
 		public void free ();
@@ -1160,12 +1160,12 @@ namespace Clutter {
 		public void set_width (float width);
 		public void union (Clutter.PaintVolume another_pv);
 	}
-	[CCode (ref_function = "clutter_param_units_ref", unref_function = "clutter_param_units_unref", cprefix = "clutter_param_units_", type_id = "clutter_param_units_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "clutter_param_units_", ref_function = "clutter_param_units_ref", type_id = "clutter_param_units_get_type ()", unref_function = "clutter_param_units_unref")]
 	public class ParamSpecUnit {
 		[CCode (has_construct_function = false)]
 		protected ParamSpecUnit ();
 	}
-	[CCode (type_id = "clutter_path_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_get_type ()")]
 	public class Path : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		public Path ();
@@ -1198,9 +1198,9 @@ namespace Clutter {
 		public string description { owned get; set; }
 		public uint length { get; }
 	}
-	[CCode (type_id = "clutter_path_constraint_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_constraint_get_type ()")]
 	public class PathConstraint : Clutter.Constraint {
-		[CCode (type = "ClutterConstraint*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public PathConstraint (Clutter.Path? path, float offset);
 		public float get_offset ();
 		public unowned Clutter.Path get_path ();
@@ -1210,9 +1210,9 @@ namespace Clutter {
 		public Clutter.Path path { get; set; }
 		public signal void node_reached (Clutter.Actor actor, uint index);
 	}
-	[CCode (type_id = "clutter_rectangle_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rectangle_get_type ()")]
 	public class Rectangle : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Rectangle ();
 		public Clutter.Color get_border_color ();
 		public uint get_border_width ();
@@ -1220,7 +1220,7 @@ namespace Clutter {
 		public void set_border_color (Clutter.Color color);
 		public void set_border_width (uint width);
 		public void set_color (Clutter.Color color);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Rectangle.with_color (Clutter.Color color);
 		public Clutter.Color border_color { get; set; }
 		public uint border_width { get; set; }
@@ -1228,7 +1228,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public bool has_border { get; set; }
 	}
-	[CCode (type_id = "clutter_score_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_score_get_type ()")]
 	public class Score : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Score ();
@@ -1252,11 +1252,11 @@ namespace Clutter {
 		public virtual signal void timeline_completed (Clutter.Timeline timeline);
 		public virtual signal void timeline_started (Clutter.Timeline timeline);
 	}
-	[CCode (type_id = "clutter_script_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_script_get_type ()")]
 	public class Script : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Script ();
-		public void add_search_paths ([CCode (type = "gchar*", array_length_type = "gsize", array_length_cname = "n_paths")] string[] paths);
+		public void add_search_paths ([CCode (array_length_cname = "n_paths", array_length_type = "gsize", type = "gchar*")] string[] paths);
 		public void connect_signals (void* user_data);
 		public void connect_signals_full (Clutter.ScriptConnectFunc func);
 		public void ensure_objects ();
@@ -1273,7 +1273,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public bool filename_set { get; }
 	}
-	[CCode (type_id = "clutter_settings_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
 	public class Settings : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Settings ();
@@ -1296,7 +1296,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public string font_subpixel_order { owned get; set; }
 	}
-	[CCode (type_id = "clutter_shader_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_get_type ()")]
 	public class Shader : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Shader ();
@@ -1322,7 +1322,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public string vertex_source { get; set; }
 	}
-	[CCode (type_id = "clutter_shader_effect_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_shader_effect_get_type ()")]
 	public abstract class ShaderEffect : Clutter.OffscreenEffect {
 		[CCode (has_construct_function = false)]
 		protected ShaderEffect ();
@@ -1332,24 +1332,24 @@ namespace Clutter {
 		public void set_uniform_value (string name, GLib.Value value);
 		public Clutter.ShaderType shader_type { construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Compact]
 	public class ShaderFloat {
 		public static GLib.Type get_type ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Compact]
 	public class ShaderInt {
 		public static GLib.Type get_type ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Compact]
 	public class ShaderMatrix {
 		public static GLib.Type get_type ();
 	}
-	[CCode (type_id = "clutter_snap_constraint_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
 	public class SnapConstraint : Clutter.Constraint {
-		[CCode (type = "ClutterConstraint*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
 		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
 		public float get_offset ();
@@ -1364,9 +1364,9 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public Clutter.SnapEdge to_edge { get; set construct; }
 	}
-	[CCode (type_id = "clutter_stage_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_get_type ()")]
 	public class Stage : Clutter.Group, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Stage ();
 		[CCode (cname = "clutter_stage_event")]
 		public bool emit_event (Clutter.Event event);
@@ -1431,7 +1431,7 @@ namespace Clutter {
 		public virtual signal void fullscreen ();
 		public virtual signal void unfullscreen ();
 	}
-	[CCode (type_id = "clutter_stage_manager_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_stage_manager_get_type ()")]
 	public class StageManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected StageManager ();
@@ -1445,7 +1445,7 @@ namespace Clutter {
 		public virtual signal void stage_added (Clutter.Stage stage);
 		public virtual signal void stage_removed (Clutter.Stage stage);
 	}
-	[CCode (type_id = "clutter_state_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_state_get_type ()")]
 	public class State : GLib.Object, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		public State ();
@@ -1467,8 +1467,8 @@ namespace Clutter {
 		public string state { get; set; }
 		public virtual signal void completed ();
 	}
+	[CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_state_key_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_state_key_get_type ()", cheader_filename = "clutter/clutter.h")]
 	public class StateKey {
 		public ulong get_mode ();
 		public unowned GLib.Object get_object ();
@@ -1480,9 +1480,9 @@ namespace Clutter {
 		public unowned string get_target_state_name ();
 		public bool get_value (GLib.Value value);
 	}
-	[CCode (type_id = "clutter_table_layout_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_table_layout_get_type ()")]
 	public class TableLayout : Clutter.LayoutManager {
-		[CCode (type = "ClutterLayoutManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public TableLayout ();
 		public void get_alignment (Clutter.Actor actor, out Clutter.TableAlignment x_align, out Clutter.TableAlignment y_align);
 		public int get_column_count ();
@@ -1511,13 +1511,13 @@ namespace Clutter {
 		public uint row_spacing { get; set; }
 		public bool use_animations { get; set; }
 	}
-	[CCode (type_id = "clutter_text_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")]
 	public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Text ();
 		public void delete_chars (uint n_chars);
 		public bool delete_selection ();
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Text.full (string font_name, string text, Clutter.Color color);
 		public bool get_activatable ();
 		public unowned Pango.AttrList get_attributes ();
@@ -1574,7 +1574,7 @@ namespace Clutter {
 		public void set_single_line_mode (bool single_line);
 		public void set_text (string text);
 		public void set_use_markup (bool setting);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Text.with_text (string? font_name, string text);
 		public bool activatable { get; set; }
 		public Pango.AttrList attributes { get; set; }
@@ -1611,13 +1611,13 @@ namespace Clutter {
 		public signal void delete_text (int start_pos, int end_pos);
 		public virtual signal void text_changed ();
 	}
-	[CCode (type_id = "clutter_texture_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_get_type ()")]
 	public class Texture : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Texture ();
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Texture.from_actor (Clutter.Actor actor);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Texture.from_file (string filename) throws Clutter.TextureError;
 		public void get_base_size (out int width, out int height);
 		public unowned Cogl.Handle get_cogl_material ();
@@ -1631,13 +1631,13 @@ namespace Clutter {
 		public Cogl.PixelFormat get_pixel_format ();
 		public void get_repeat (out bool repeat_x, out bool repeat_y);
 		public bool get_sync_size ();
-		public bool set_area_from_rgb_data ([CCode (type = "guchar*", array_length = false)] uint8[] data, bool has_alpha, int x, int y, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error;
+		public bool set_area_from_rgb_data ([CCode (array_length = false, type = "guchar*")] uint8[] data, bool has_alpha, int x, int y, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error;
 		public void set_cogl_material (Cogl.Handle cogl_material);
 		public void set_cogl_texture (Cogl.Handle cogl_tex);
 		public void set_filter_quality (Clutter.TextureQuality filter_quality);
 		public bool set_from_file (string filename) throws GLib.Error;
-		public bool set_from_rgb_data ([CCode (type = "guchar*", array_length = false)] uint8[] data, bool has_alpha, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error;
-		public bool set_from_yuv_data ([CCode (type = "guchar*", array_length = false)] uint8[] data, int width, int height, Clutter.TextureFlags flags) throws GLib.Error;
+		public bool set_from_rgb_data ([CCode (array_length = false, type = "guchar*")] uint8[] data, bool has_alpha, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error;
+		public bool set_from_yuv_data ([CCode (array_length = false, type = "guchar*")] uint8[] data, int width, int height, Clutter.TextureFlags flags) throws GLib.Error;
 		public void set_keep_aspect_ratio (bool keep_aspect);
 		public void set_load_async (bool load_async);
 		public void set_load_data_async (bool load_async);
@@ -1667,7 +1667,7 @@ namespace Clutter {
 		public virtual signal void pixbuf_change ();
 		public virtual signal void size_change (int width, int height);
 	}
-	[CCode (type_id = "clutter_timeline_get_type ()", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")]
 	public class Timeline : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Timeline (uint msecs);
@@ -1709,8 +1709,8 @@ namespace Clutter {
 		public virtual signal void paused ();
 		public virtual signal void started ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Compact]
 	public class TimeoutPool {
 		[CCode (has_construct_function = false)]
 		public TimeoutPool (int priority);
@@ -1833,7 +1833,7 @@ namespace Clutter {
 		[NoWrapper]
 		public abstract void unrealize ();
 	}
-	[CCode (type_id = "CLUTTER_TYPE_ACTOR_BOX", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_ACTOR_BOX")]
 	public struct ActorBox {
 		public float x1;
 		public float y1;
@@ -1858,7 +1858,7 @@ namespace Clutter {
 		public void set_size (float width, float height);
 		public Clutter.ActorBox union (Clutter.ActorBox b);
 	}
-	[CCode (type_id = "CLUTTER_TYPE_ANY_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_ANY_EVENT")]
 	public struct AnyEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1866,7 +1866,7 @@ namespace Clutter {
 		public weak Clutter.Stage stage;
 		public weak Clutter.Actor source;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_BUTTON_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_BUTTON_EVENT")]
 	public struct ButtonEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1881,7 +1881,7 @@ namespace Clutter {
 		public double axes;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_COLOR", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_COLOR")]
 	public struct Color {
 		public static GLib.HashFunc hash;
 		public static GLib.EqualFunc equal;
@@ -1910,7 +1910,7 @@ namespace Clutter {
 		public uint32 to_pixel ();
 		public string to_string ();
 	}
-	[CCode (type_id = "CLUTTER_TYPE_CROSSING_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_CROSSING_EVENT")]
 	public struct CrossingEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1922,12 +1922,12 @@ namespace Clutter {
 		public weak Clutter.InputDevice device;
 		public weak Clutter.Actor related;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_FOG", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_FOG")]
 	public struct Fog {
 		public float z_near;
 		public float z_far;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_GEOMETRY", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_GEOMETRY")]
 	public struct Geometry {
 		public int x;
 		public int y;
@@ -1936,7 +1936,7 @@ namespace Clutter {
 		public bool intersects (Clutter.Geometry geometry1);
 		public Clutter.Geometry union (Clutter.Geometry geometry_b);
 	}
-	[CCode (type_id = "CLUTTER_TYPE_KEY_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_KEY_EVENT")]
 	public struct KeyEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1949,7 +1949,7 @@ namespace Clutter {
 		public unichar unicode_value;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_KNOT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_KNOT")]
 	public struct Knot {
 		public int x;
 		public int y;
@@ -1957,7 +1957,7 @@ namespace Clutter {
 		public bool equal (Clutter.Knot knot_b);
 		public void free ();
 	}
-	[CCode (type_id = "CLUTTER_TYPE_MOTION_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_MOTION_EVENT")]
 	public struct MotionEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -1970,7 +1970,7 @@ namespace Clutter {
 		public double axes;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_PATH_NODE", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_PATH_NODE")]
 	public struct PathNode {
 		public Clutter.PathNodeType type;
 		[CCode (array_length = false, array_null_terminated = true)]
@@ -1979,14 +1979,14 @@ namespace Clutter {
 		public bool equal (Clutter.PathNode node_b);
 		public void free ();
 	}
-	[CCode (type_id = "CLUTTER_TYPE_PERSPECTIVE", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_PERSPECTIVE")]
 	public struct Perspective {
 		public float fovy;
 		public float aspect;
 		public float z_near;
 		public float z_far;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_SCROLL_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_SCROLL_EVENT")]
 	public struct ScrollEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2000,7 +2000,7 @@ namespace Clutter {
 		public double axes;
 		public weak Clutter.InputDevice device;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_STAGE_STATE_EVENT", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_STAGE_STATE_EVENT")]
 	public struct StageStateEvent {
 		public Clutter.EventType type;
 		public uint32 time;
@@ -2010,7 +2010,7 @@ namespace Clutter {
 		public Clutter.StageState changed_mask;
 		public Clutter.StageState new_state;
 	}
-	[CCode (type_id = "CLUTTER_TYPE_UNITS", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_UNITS")]
 	public struct Units {
 		public Clutter.Units copy ();
 		public void free ();
@@ -2031,7 +2031,7 @@ namespace Clutter {
 		public float to_pixels ();
 		public string to_string ();
 	}
-	[CCode (type_id = "CLUTTER_TYPE_VERTEX", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "CLUTTER_TYPE_VERTEX")]
 	public struct Vertex {
 		public float x;
 		public float y;
@@ -2040,7 +2040,7 @@ namespace Clutter {
 		public bool equal (Clutter.Vertex vertex_b);
 		public void free ();
 	}
-	[CCode (cprefix = "CLUTTER_ACTOR_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_")]
 	[Flags]
 	public enum ActorFlags {
 		MAPPED,
@@ -2049,18 +2049,18 @@ namespace Clutter {
 		VISIBLE,
 		NO_LAYOUT
 	}
-	[CCode (cprefix = "CLUTTER_ALIGN_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_")]
 	public enum AlignAxis {
 		X_AXIS,
 		Y_AXIS
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	[Flags]
 	public enum AllocationFlags {
 		ALLOCATION_NONE,
 		ABSOLUTE_ORIGIN_CHANGED
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	public enum AnimationMode {
 		CUSTOM_MODE,
 		LINEAR,
@@ -2096,7 +2096,7 @@ namespace Clutter {
 		EASE_IN_OUT_BOUNCE,
 		ANIMATION_LAST
 	}
-	[CCode (cprefix = "CLUTTER_BIN_ALIGNMENT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_")]
 	public enum BinAlignment {
 		FIXED,
 		FILL,
@@ -2104,7 +2104,7 @@ namespace Clutter {
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "CLUTTER_BIND_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_")]
 	public enum BindCoordinate {
 		X,
 		Y,
@@ -2113,25 +2113,25 @@ namespace Clutter {
 		POSITION,
 		SIZE
 	}
-	[CCode (cprefix = "CLUTTER_BOX_ALIGNMENT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_")]
 	public enum BoxAlignment {
 		START,
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "CLUTTER_DRAG_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_")]
 	public enum DragAxis {
 		AXIS_NONE,
 		X_AXIS,
 		Y_AXIS
 	}
-	[CCode (cprefix = "CLUTTER_EVENT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_")]
 	[Flags]
 	public enum EventFlags {
 		NONE,
 		FLAG_SYNTHETIC
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	public enum EventType {
 		NOTHING,
 		KEY_PRESS,
@@ -2147,7 +2147,7 @@ namespace Clutter {
 		CLIENT_MESSAGE,
 		DELETE
 	}
-	[CCode (cprefix = "CLUTTER_FEATURE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_")]
 	[Flags]
 	public enum FeatureFlags {
 		TEXTURE_NPOT,
@@ -2166,18 +2166,18 @@ namespace Clutter {
 		[CCode (cname = "clutter_feature_get_all")]
 		public static Clutter.FeatureFlags @get ();
 	}
-	[CCode (cprefix = "CLUTTER_FLOW_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_")]
 	public enum FlowOrientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "CLUTTER_FONT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FONT_")]
 	[Flags]
 	public enum FontFlags {
 		MIPMAPPING,
 		HINTING
 	}
-	[CCode (cprefix = "CLUTTER_GRAVITY_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_")]
 	public enum Gravity {
 		NONE,
 		NORTH,
@@ -2190,7 +2190,7 @@ namespace Clutter {
 		NORTH_WEST,
 		CENTER
 	}
-	[CCode (cprefix = "CLUTTER_INIT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_")]
 	public enum InitError {
 		SUCCESS,
 		ERROR_UNKNOWN,
@@ -2199,7 +2199,7 @@ namespace Clutter {
 		ERROR_INTERNAL;
 		public static GLib.Quark quark ();
 	}
-	[CCode (cprefix = "CLUTTER_INPUT_AXIS_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_")]
 	public enum InputAxis {
 		IGNORE,
 		X,
@@ -2209,7 +2209,7 @@ namespace Clutter {
 		YTILT,
 		WHEEL
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	public enum InputDeviceType {
 		POINTER_DEVICE,
 		KEYBOARD_DEVICE,
@@ -2223,18 +2223,18 @@ namespace Clutter {
 		CURSOR_DEVICE,
 		N_DEVICE_TYPES
 	}
-	[CCode (cprefix = "CLUTTER_INPUT_MODE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_")]
 	public enum InputMode {
 		MASTER,
 		SLAVE,
 		FLOATING
 	}
-	[CCode (cprefix = "CLUTTER_INTERPOLATION_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_")]
 	public enum Interpolation {
 		LINEAR,
 		CUBIC
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -2256,7 +2256,7 @@ namespace Clutter {
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cprefix = "CLUTTER_PATH_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_")]
 	public enum PathNodeType {
 		MOVE_TO,
 		LINE_TO,
@@ -2266,55 +2266,55 @@ namespace Clutter {
 		REL_LINE_TO,
 		REL_CURVE_TO
 	}
-	[CCode (cprefix = "CLUTTER_PICK_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_")]
 	public enum PickMode {
 		NONE,
 		REACTIVE,
 		ALL
 	}
-	[CCode (cprefix = "CLUTTER_REQUEST_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_")]
 	public enum RequestMode {
 		HEIGHT_FOR_WIDTH,
 		WIDTH_FOR_HEIGHT
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	public enum RotateAxis {
 		X_AXIS,
 		Y_AXIS,
 		Z_AXIS
 	}
-	[CCode (cprefix = "CLUTTER_ROTATE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_")]
 	public enum RotateDirection {
 		CW,
 		CCW
 	}
-	[CCode (cprefix = "CLUTTER_SCROLL_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "CLUTTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
 	public enum ShaderType {
 		VERTEX_SHADER,
 		FRAGMENT_SHADER
 	}
-	[CCode (cprefix = "CLUTTER_SNAP_EDGE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_")]
 	public enum SnapEdge {
 		TOP,
 		RIGHT,
 		BOTTOM,
 		LEFT
 	}
-	[CCode (cprefix = "CLUTTER_STAGE_STATE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STAGE_STATE_")]
 	[Flags]
 	public enum StageState {
 		FULLSCREEN,
 		OFFSCREEN,
 		ACTIVATED
 	}
-	[CCode (cprefix = "CLUTTER_COLOR_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_")]
 	public enum StaticColor {
 		WHITE,
 		BLACK,
@@ -2362,19 +2362,19 @@ namespace Clutter {
 		ALUMINIUM_6,
 		TRANSPARENT
 	}
-	[CCode (cprefix = "CLUTTER_TABLE_ALIGNMENT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TABLE_ALIGNMENT_")]
 	public enum TableAlignment {
 		START,
 		CENTER,
 		END
 	}
-	[CCode (cprefix = "CLUTTER_TEXT_DIRECTION_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_")]
 	public enum TextDirection {
 		DEFAULT,
 		LTR,
 		RTL
 	}
-	[CCode (cprefix = "CLUTTER_TEXTURE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_")]
 	[Flags]
 	public enum TextureFlags {
 		NONE,
@@ -2382,18 +2382,18 @@ namespace Clutter {
 		RGB_FLAG_PREMULT,
 		YUV_FLAG_YUV2
 	}
-	[CCode (cprefix = "CLUTTER_TEXTURE_QUALITY_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_")]
 	public enum TextureQuality {
 		LOW,
 		MEDIUM,
 		HIGH
 	}
-	[CCode (cprefix = "CLUTTER_TIMELINE_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_")]
 	public enum TimelineDirection {
 		FORWARD,
 		BACKWARD
 	}
-	[CCode (cprefix = "CLUTTER_UNIT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_")]
 	public enum UnitType {
 		PIXEL,
 		EM,
@@ -2401,13 +2401,13 @@ namespace Clutter {
 		POINT,
 		CM
 	}
-	[CCode (cprefix = "CLUTTER_X11_FILTER_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_FILTER_")]
 	public enum X11FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cprefix = "CLUTTER_X11_XINPUT_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_XINPUT_")]
 	public enum X11XInputEventTypes {
 		KEY_PRESS_EVENT,
 		KEY_RELEASE_EVENT,
@@ -2416,21 +2416,21 @@ namespace Clutter {
 		MOTION_NOTIFY_EVENT,
 		LAST_EVENT
 	}
-	[CCode (cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")]
 	public errordomain ScriptError {
 		TYPE_FUNCTION,
 		PROPERTY,
 		VALUE;
 		public static GLib.Quark quark ();
 	}
-	[CCode (cprefix = "CLUTTER_SHADER_ERROR_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_")]
 	public errordomain ShaderError {
 		NO_ASM,
 		NO_GLSL,
 		COMPILE;
 		public static GLib.Quark quark ();
 	}
-	[CCode (cprefix = "CLUTTER_TEXTURE_ERROR_", cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_ERROR_")]
 	public errordomain TextureError {
 		OUT_OF_MEMORY,
 		NO_YUV,
@@ -2534,7 +2534,7 @@ namespace Clutter {
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
 	[CCode (cheader_filename = "clutter/clutter.h")]
-	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (type = "GOptionEntry*", array_length = false)] GLib.OptionEntry?[] entries, string? translation_domain) throws GLib.Error;
+	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false, type = "GOptionEntry*")] GLib.OptionEntry?[] entries, string? translation_domain) throws GLib.Error;
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static uint32 keysym_to_unicode (uint keyval);
 	[CCode (cheader_filename = "clutter/clutter.h")]
@@ -2549,11 +2549,11 @@ namespace Clutter {
 	public static void set_font_flags (Clutter.FontFlags flags);
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static void set_motion_events_enabled (bool enable);
-	[Deprecated (since = "vala-0.14", replacement = "Threads.add_repaint_func")]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Deprecated (replacement = "Threads.add_repaint_func", since = "vala-0.14")]
 	public static uint threads_add_repaint_func (GLib.SourceFunc func, void* data, GLib.DestroyNotify notify);
-	[Deprecated (since = "vala-0.14", replacement = "Threads.remove_repaint_func")]
 	[CCode (cheader_filename = "clutter/clutter.h")]
+	[Deprecated (replacement = "Threads.remove_repaint_func", since = "vala-0.14")]
 	public static void threads_remove_repaint_func (uint handle_id);
 	[CCode (cheader_filename = "clutter/clutter.h")]
 	public static void ungrab_keyboard ();
diff --git a/vapi/clutter-gtk-0.10.vapi b/vapi/clutter-gtk-0.10.vapi
index f453983..a741288 100644
--- a/vapi/clutter-gtk-0.10.vapi
+++ b/vapi/clutter-gtk-0.10.vapi
@@ -4,13 +4,13 @@
 namespace GtkClutter {
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Embed ();
 		public unowned Clutter.Actor get_stage ();
 	}
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Viewport : Clutter.Actor, GtkClutter.Zoomable, GtkClutter.Scrollable, Clutter.Container, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Viewport (Gtk.Adjustment h_adjust, Gtk.Adjustment v_adjust, Gtk.Adjustment z_adjust);
 		public void get_origin (float x, float y, float z);
 		[NoAccessorMethod]
@@ -27,12 +27,12 @@ namespace GtkClutter {
 		public abstract unowned Gtk.Adjustment get_adjustment ();
 		public abstract void set_adjustment (Gtk.Adjustment z_adjust);
 	}
-	[CCode (cprefix = "CLUTTER_INIT_ERROR_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")]
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "CLUTTER_INIT_ERROR_", has_type_id = false)]
 	public enum ClutterGtkInitError {
 		LAST,
 		GTK
 	}
-	[CCode (cprefix = "CLUTTER_GTK_TEXTURE_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")]
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "CLUTTER_GTK_TEXTURE_", has_type_id = false)]
 	public enum ClutterGtkTextureError {
 		INVALID_STOCK_ID,
 		ERROR_LAST
diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi
index 16d458e..2ef241a 100644
--- a/vapi/clutter-gtk-1.0.vapi
+++ b/vapi/clutter-gtk-1.0.vapi
@@ -4,24 +4,24 @@
 namespace GtkClutter {
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Actor : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Actor ();
 		public unowned Gtk.Widget get_contents ();
 		public unowned Gtk.Widget get_widget ();
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Actor.with_contents (Gtk.Widget contents);
 		[NoAccessorMethod]
 		public Gtk.Widget contents { owned get; set construct; }
 	}
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Embed ();
 		public unowned Clutter.Actor get_stage ();
 	}
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Texture : Clutter.Texture, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Texture ();
 		public static GLib.Quark error_quark ();
 		public bool set_from_icon_name (Gtk.Widget widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error;
@@ -30,11 +30,11 @@ namespace GtkClutter {
 	}
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Window ();
 		public unowned Clutter.Actor get_stage ();
 	}
-	[CCode (cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false, cheader_filename = "clutter-gtk/clutter-gtk.h")]
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false)]
 	public enum TextureError {
 		ID
 	}
diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi
index f6a37df..a9b8ca0 100644
--- a/vapi/cogl-1.0.vapi
+++ b/vapi/cogl-1.0.vapi
@@ -1,17 +1,17 @@
 /* cogl-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Cogl", lower_case_cprefix = "cogl_", gir_namespace = "Cogl", gir_version = "1.0")]
+[CCode (cprefix = "Cogl", gir_namespace = "Cogl", gir_version = "1.0", lower_case_cprefix = "cogl_")]
 namespace Cogl {
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
 	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Bitmap : Cogl.Handle {
 		public static GLib.Type error_get_type ();
 		public static GLib.Quark error_quark ();
 		public static bool get_size_from_file (string filename, out int width, out int height);
 		public static Cogl.Bitmap new_from_file (string filename) throws GLib.Error;
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
 	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Buffer : Cogl.Handle {
 		public static GLib.Type access_get_type ();
 		public static GLib.Type bit_get_type ();
@@ -25,12 +25,12 @@ namespace Cogl {
 		public void unmap ();
 		public static GLib.Type update_hint_get_type ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class Framebuffer {
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref", cheader_filename = "cogl/cogl.h")]
 	public class Handle {
 		[CCode (cname = "cogl_is_bitmap")]
 		public bool is_bitmap ();
@@ -51,10 +51,10 @@ namespace Cogl {
 		[CCode (cname = "cogl_is_vertex_buffer")]
 		public bool is_vertex_buffer ();
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_material_ref", unref_function = "cogl_material_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_material_ref", unref_function = "cogl_material_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Material : Cogl.Handle {
-		[CCode (type = "CoglHandle*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "CoglHandle*")]
 		public Material ();
 		public static GLib.Type alpha_func_get_type ();
 		public Cogl.Material copy ();
@@ -106,8 +106,8 @@ namespace Cogl {
 		public static void set_user_program (Cogl.Material material, Cogl.Bitmap program);
 		public static GLib.Type wrap_mode_get_type ();
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
 	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class MaterialLayer : Cogl.Handle {
 		public Cogl.MaterialFilter get_mag_filter ();
 		public Cogl.MaterialFilter get_min_filter ();
@@ -118,14 +118,14 @@ namespace Cogl {
 		public static Cogl.MaterialWrapMode get_wrap_mode_t (Cogl.MaterialLayer layer);
 		public static GLib.Type type_get_type ();
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_object_ref", unref_function = "cogl_object_unref", cheader_filename = "cogl/cogl.h")]
 	public class Object {
 		public void* get_user_data (Cogl.UserDataKey key);
 		public void set_user_data (Cogl.UserDataKey key, Cogl.UserDataDestroyCallback destroy);
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_offscreen_ref", unref_function = "cogl_offscreen_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_offscreen_ref", unref_function = "cogl_offscreen_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Offscreen : Cogl.Handle {
 		[CCode (cname = "cogl_pop_draw_buffer")]
 		public static void pop_draw_buffer ();
@@ -133,13 +133,13 @@ namespace Cogl {
 		public static void push_draw_buffer ();
 		[CCode (instance_pos = -1)]
 		public void set_draw_buffer (Cogl.BufferTarget target);
-		[CCode (type = "CoglHandle*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "CoglHandle*")]
 		public Offscreen.to_texture (Cogl.Texture handle);
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class PangoFontMap {
-		[CCode (type = "PangoFontMap*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoFontMap*")]
 		public PangoFontMap ();
 		public void clear_glyph_cache ();
 		public unowned Pango.Context create_context ();
@@ -148,18 +148,18 @@ namespace Cogl {
 		public void set_resolution (double dpi);
 		public void set_use_mipmapping (bool value);
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class PangoRenderer {
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class PangoRendererClass {
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")]
 	[Compact]
-	[CCode (copy_function = "cogl_path_copy", cheader_filename = "cogl/cogl.h")]
 	public class Path {
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public Path ();
 		public static void arc (float center_x, float center_y, float radius_x, float radius_y, float angle_1, float angle_2);
 		public static void close ();
@@ -184,20 +184,20 @@ namespace Cogl {
 		public static void stroke ();
 		public static void stroke_preserve ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class PixelArray {
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class PixelBuffer : Cogl.Handle {
 		public PixelBuffer (uint size);
 		public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride);
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_program_ref", unref_function = "cogl_program_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Program : Cogl.Handle {
-		[CCode (cname = "cogl_create_program", type = "CoglHandle*", has_construct_function = false)]
+		[CCode (cname = "cogl_create_program", has_construct_function = false, type = "CoglHandle*")]
 		public Program ();
 		public void attach_shader (Cogl.Shader shader_handle);
 		public int get_uniform_location (string uniform_name);
@@ -209,10 +209,10 @@ namespace Cogl {
 		public static void uniform_matrix (int uniform_no, int size, bool transpose, [CCode (array_length_pos = 2.9)] float[] value);
 		public void use ();
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Shader : Cogl.Handle {
-		[CCode (cname = "cogl_create_shader", type = "CoglHandle*", has_construct_function = false)]
+		[CCode (cname = "cogl_create_shader", has_construct_function = false, type = "CoglHandle*")]
 		public Shader (Cogl.ShaderType shader_type);
 		public void compile ();
 		public string get_info_log ();
@@ -220,8 +220,8 @@ namespace Cogl {
 		public bool is_compiled ();
 		public void source (string source);
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_texture_ref", unref_function = "cogl_texture_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_texture_ref", unref_function = "cogl_texture_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class Texture : Cogl.Handle {
 		public Texture.from_bitmap (Cogl.Bitmap bmp_handle, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
 		public Texture.from_data (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat format, Cogl.PixelFormat internal_format, uint rowstride, [CCode (array_length = false)] uchar[] data);
@@ -236,22 +236,22 @@ namespace Cogl {
 		public bool set_region (int src_x, int src_y, int dst_x, int dst_y, uint dst_width, uint dst_height, int width, int height, Cogl.PixelFormat format, uint rowstride, uchar[] data);
 		public Texture.with_size (uint width, uint height, Cogl.TextureFlags flags, Cogl.PixelFormat internal_format);
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class UserDataKey {
 		public int unused;
 	}
-	[Compact]
 	[CCode (cheader_filename = "cogl/cogl.h")]
+	[Compact]
 	public class Vector3 {
 		public float x;
 		public float y;
 		public float z;
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
 	[Compact]
-	[CCode (ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class VertexBuffer : Cogl.Handle {
-		[CCode (type = "CoglHandle*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "CoglHandle*")]
 		public VertexBuffer (uint n_vertices);
 		public void add (string attribute_name, uchar n_components, Cogl.AttributeType type, bool normalized, uint16 stride, void* pointer);
 		public void @delete (string attribute_name);
@@ -262,20 +262,20 @@ namespace Cogl {
 		public uint get_n_vertices ();
 		public void submit ();
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", cname = "CoglHandle")]
 	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h")]
 	public class VertexBufferIndices : Cogl.Handle {
 		public VertexBufferIndices (Cogl.IndicesType indices_type, void* indices_array, int indices_len);
 		public static unowned Cogl.VertexBufferIndices get_for_quads (uint n_indices);
 		public Cogl.IndicesType get_type ();
 	}
-	[CCode (type_id = "COGL_TYPE_ANGLE", cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_ANGLE")]
 	public struct Angle {
 		public Cogl.Fixed cos ();
 		public Cogl.Fixed sin ();
 		public Cogl.Fixed tan ();
 	}
-	[CCode (has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
 	public struct Color {
 		public uchar red;
 		public uchar green;
@@ -320,7 +320,7 @@ namespace Cogl {
 		public void set_red_float (float red);
 		public void unpremultiply ();
 	}
-	[CCode (type_id = "COGL_TYPE_FIXED", cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_FIXED")]
 	public struct Fixed {
 		public Cogl.Fixed atan ();
 		public Cogl.Fixed atan2 (Cogl.Fixed b);
@@ -335,7 +335,7 @@ namespace Cogl {
 		public Cogl.Fixed sqrt ();
 		public Cogl.Fixed tan ();
 	}
-	[CCode (type_id = "COGL_TYPE_MATRIX", cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_MATRIX")]
 	public struct Matrix {
 		public float xx;
 		public float yx;
@@ -373,7 +373,7 @@ namespace Cogl {
 		public void transform_point (ref float x, ref float y, ref float z, ref float w);
 		public void translate (float x, float y, float z);
 	}
-	[CCode (type_id = "COGL_TYPE_TEXTURE_VERTEX", cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", type_id = "COGL_TYPE_TEXTURE_VERTEX")]
 	public struct TextureVertex {
 		public float x;
 		public float y;
@@ -382,7 +382,7 @@ namespace Cogl {
 		public float ty;
 		public Cogl.Color color;
 	}
-	[CCode (cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ATTRIBUTE_TYPE_", has_type_id = false)]
 	public enum AttributeType {
 		BYTE,
 		UNSIGNED_BYTE,
@@ -390,40 +390,40 @@ namespace Cogl {
 		UNSIGNED_SHORT,
 		FLOAT
 	}
-	[CCode (cprefix = "COGL_BITMAP_ERROR_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BITMAP_ERROR_", has_type_id = false)]
 	public enum BitmapError {
 		FAILED,
 		UNKNOWN_TYPE,
 		CORRUPT_IMAGE
 	}
-	[CCode (cprefix = "COGL_BUFFER_ACCESS_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_ACCESS_", has_type_id = false)]
 	public enum BufferAccess {
 		READ,
 		WRITE,
 		READ_WRITE
 	}
-	[CCode (cprefix = "COGL_BUFFER_BIT_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_BIT_", has_type_id = false)]
 	public enum BufferBit {
 		COLOR,
 		DEPTH,
 		STENCIL
 	}
-	[CCode (cprefix = "COGL_BUFFER_MAP_HINT_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_MAP_HINT_", has_type_id = false)]
 	public enum BufferMapHint {
 		DISCARD
 	}
-	[CCode (cprefix = "COGL_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_", has_type_id = false)]
 	public enum BufferTarget {
 		WINDOW_BUFFER,
 		OFFSCREEN_BUFFER
 	}
-	[CCode (cprefix = "COGL_BUFFER_UPDATE_HINT_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BUFFER_UPDATE_HINT_", has_type_id = false)]
 	public enum BufferUpdateHint {
 		STATIC,
 		DYNAMIC,
 		STREAM
 	}
-	[CCode (cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DEPTH_TEST_FUNCTION_", has_type_id = false)]
 	public enum DepthTestFunction {
 		NEVER,
 		LESS,
@@ -434,16 +434,16 @@ namespace Cogl {
 		GEQUAL,
 		ALWAYS
 	}
-	[CCode (cprefix = "COGL_DRIVER_ERROR_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_DRIVER_ERROR_", has_type_id = false)]
 	public enum DriverError {
 		UNKNOWN_VERSION,
 		INVALID_VERSION
 	}
-	[CCode (cprefix = "COGL_ERROR_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_ERROR_", has_type_id = false)]
 	public enum Error {
 		UNSUPPORTED
 	}
-	[CCode (cprefix = "COGL_FEATURE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FEATURE_", has_type_id = false)]
 	public enum FeatureFlags {
 		TEXTURE_RECTANGLE,
 		TEXTURE_NPOT,
@@ -466,19 +466,19 @@ namespace Cogl {
 		TEXTURE_3D,
 		SHADERS_ARBFP
 	}
-	[CCode (cprefix = "COGL_FOG_MODE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_FOG_MODE_", has_type_id = false)]
 	public enum FogMode {
 		LINEAR,
 		EXPONENTIAL,
 		EXPONENTIAL_SQUARED
 	}
-	[CCode (cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_INDICES_TYPE_UNSIGNED_", has_type_id = false)]
 	public enum IndicesType {
 		BYTE,
 		SHORT,
 		INT
 	}
-	[CCode (cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_ALPHA_FUNC_", has_type_id = false)]
 	public enum MaterialAlphaFunc {
 		NEVER,
 		LESS,
@@ -489,7 +489,7 @@ namespace Cogl {
 		GEQUAL,
 		ALWAYS
 	}
-	[CCode (cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_FILTER_", has_type_id = false)]
 	public enum MaterialFilter {
 		NEAREST,
 		LINEAR,
@@ -498,22 +498,22 @@ namespace Cogl {
 		NEAREST_MIPMAP_LINEAR,
 		LINEAR_MIPMAP_LINEAR
 	}
-	[CCode (cprefix = "COGL_MATERIAL_LAYER_TYPE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_LAYER_TYPE_", has_type_id = false)]
 	public enum MaterialLayerType {
 		TEXTURE
 	}
-	[CCode (cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_MATERIAL_WRAP_MODE_", has_type_id = false)]
 	public enum MaterialWrapMode {
 		REPEAT,
 		CLAMP_TO_EDGE,
 		AUTOMATIC
 	}
-	[CCode (cprefix = "COGL_PATH_FILL_RULE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PATH_FILL_RULE_", has_type_id = false)]
 	public enum PathFillRule {
 		NON_ZERO,
 		EVEN_ODD
 	}
-	[CCode (cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_PIXEL_FORMAT_", has_type_id = false)]
 	public enum PixelFormat {
 		ANY,
 		A_8,
@@ -535,30 +535,30 @@ namespace Cogl {
 		RGBA_4444_PRE,
 		RGBA_5551_PRE
 	}
-	[CCode (cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_READ_PIXELS_COLOR_", has_type_id = false)]
 	public enum ReadPixelsFlags {
 		BUFFER
 	}
-	[CCode (cprefix = "COGL_SHADER_TYPE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_SHADER_TYPE_", has_type_id = false)]
 	public enum ShaderType {
 		VERTEX,
 		FRAGMENT
 	}
-	[CCode (cprefix = "COGL_TEXTURE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_", has_type_id = false)]
 	public enum TextureFlags {
 		NONE,
 		NO_AUTO_MIPMAP,
 		NO_SLICING,
 		NO_ATLAS
 	}
-	[CCode (cprefix = "COGL_TEXTURE_PIXMAP_X11_DAMAGE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_TEXTURE_PIXMAP_X11_DAMAGE_", has_type_id = false)]
 	public enum TexturePixmapX11ReportLevel {
 		RAW_RECTANGLES,
 		DELTA_RECTANGLES,
 		BOUNDING_BOX,
 		NON_EMPTY
 	}
-	[CCode (cprefix = "COGL_VERTICES_MODE_", has_type_id = false, cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_VERTICES_MODE_", has_type_id = false)]
 	public enum VerticesMode {
 		POINTS,
 		LINE_STRIP,
@@ -568,7 +568,7 @@ namespace Cogl {
 		TRIANGLE_FAN,
 		TRIANGLES
 	}
-	[CCode (cprefix = "COGL_BLEND_STRING_ERROR_", cheader_filename = "cogl/cogl.h")]
+	[CCode (cheader_filename = "cogl/cogl.h", cprefix = "COGL_BLEND_STRING_ERROR_")]
 	public errordomain BlendStringError {
 		PARSE_ERROR,
 		ARGUMENT_PARSE_ERROR,
diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index 91d9e27..b482faf 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
 namespace GConf {
+	[CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_change_set_ref", ref_function_void = true, type_id = "GCONF_TYPE_CHANGE_SET", unref_function = "gconf_change_set_unref")]
 	[Compact]
-	[CCode (ref_function = "gconf_change_set_ref", ref_function_void = true, unref_function = "gconf_change_set_unref", type_id = "GCONF_TYPE_CHANGE_SET", cheader_filename = "gconf/gconf.h")]
 	public class ChangeSet {
 		[CCode (has_construct_function = false)]
 		public ChangeSet ();
@@ -87,8 +87,8 @@ namespace GConf {
 		[HasEmitter]
 		public virtual signal void value_changed (string key, void* value);
 	}
+	[CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_engine_ref", ref_function_void = true, unref_function = "gconf_engine_unref")]
 	[Compact]
-	[CCode (ref_function = "gconf_engine_ref", ref_function_void = true, unref_function = "gconf_engine_unref", cheader_filename = "gconf/gconf.h")]
 	public class Engine {
 		public GLib.SList<string> all_dirs (string dir) throws GLib.Error;
 		public GLib.SList<GConf.Entry> all_entries (string dir) throws GLib.Error;
@@ -130,8 +130,8 @@ namespace GConf {
 		public void suggest_sync () throws GLib.Error;
 		public bool unset (string key) throws GLib.Error;
 	}
+	[CCode (cheader_filename = "gconf/gconf.h", ref_function = "gconf_entry_ref", ref_function_void = true, unref_function = "gconf_entry_unref")]
 	[Compact]
-	[CCode (ref_function = "gconf_entry_ref", ref_function_void = true, unref_function = "gconf_entry_unref", cheader_filename = "gconf/gconf.h")]
 	public class Entry {
 		public weak string key;
 		public weak GConf.Value value;
@@ -153,14 +153,14 @@ namespace GConf {
 		public void set_value_nocopy (GConf.Value val);
 		public unowned GConf.Value steal_value ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
+	[Compact]
 	public class EnumStringPair {
 		public int enum_value;
 		public weak string str;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
+	[Compact]
 	public class Listeners {
 		[CCode (has_construct_function = false)]
 		public Listeners ();
@@ -172,8 +172,8 @@ namespace GConf {
 		public void remove (uint cnxn_id);
 		public void remove_if (GConf.ListenersPredicate predicate);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
+	[Compact]
 	public class MetaInfo {
 		public GLib.Time mod_time;
 		public weak string mod_user;
@@ -188,8 +188,8 @@ namespace GConf {
 		public void set_mod_user (string mod_user);
 		public void set_schema (string schema_name);
 	}
+	[CCode (cheader_filename = "gconf/gconf.h", copy_function = "gconf_schema_copy")]
 	[Compact]
-	[CCode (copy_function = "gconf_schema_copy", cheader_filename = "gconf/gconf.h")]
 	public class Schema {
 		[CCode (has_construct_function = false)]
 		public Schema ();
@@ -213,8 +213,8 @@ namespace GConf {
 		public void set_short_desc (string desc);
 		public void set_type (GConf.ValueType type);
 	}
+	[CCode (cheader_filename = "gconf/gconf.h", copy_function = "gconf_value_copy")]
 	[Compact]
-	[CCode (copy_function = "gconf_value_copy", cheader_filename = "gconf/gconf.h")]
 	public class Value {
 		public GConf.ValueType type;
 		[CCode (has_construct_function = false)]
@@ -249,19 +249,19 @@ namespace GConf {
 		public void set_string (string the_str);
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GCONF_CLIENT_HANDLE_", cheader_filename = "gconf/gconf.h")]
+	[CCode (cheader_filename = "gconf/gconf.h", cprefix = "GCONF_CLIENT_HANDLE_")]
 	public enum ClientErrorHandlingMode {
 		NONE,
 		UNRETURNED,
 		ALL
 	}
-	[CCode (cprefix = "GCONF_CLIENT_PRELOAD_", cheader_filename = "gconf/gconf.h")]
+	[CCode (cheader_filename = "gconf/gconf.h", cprefix = "GCONF_CLIENT_PRELOAD_")]
 	public enum ClientPreloadType {
 		NONE,
 		ONELEVEL,
 		RECURSIVE
 	}
-	[CCode (cprefix = "GCONF_ERROR_", cheader_filename = "gconf/gconf.h")]
+	[CCode (cheader_filename = "gconf/gconf.h", cprefix = "GCONF_ERROR_")]
 	public enum Error {
 		SUCCESS,
 		FAILED,
@@ -281,12 +281,12 @@ namespace GConf {
 		NO_WRITABLE_DATABASE,
 		IN_SHUTDOWN
 	}
-	[CCode (cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_", cheader_filename = "gconf/gconf.h")]
+	[CCode (cheader_filename = "gconf/gconf.h", cprefix = "GCONF_UNSET_INCLUDING_SCHEMA_")]
 	[Flags]
 	public enum UnsetFlags {
 		NAMES
 	}
-	[CCode (cprefix = "GCONF_VALUE_", cheader_filename = "gconf/gconf.h")]
+	[CCode (cheader_filename = "gconf/gconf.h", cprefix = "GCONF_VALUE_")]
 	public enum ValueType {
 		INVALID,
 		STRING,
diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index ee5da72..2f4fc96 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -1,6 +1,6 @@
 /* gdk-2.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_", gir_namespace = "Gdk", gir_version = "2.0")]
+[CCode (cprefix = "Gdk", gir_namespace = "Gdk", gir_version = "2.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
 	[CCode (cprefix = "GdkSelection", lower_case_cprefix = "gdk_selection_")]
 	namespace Selection {
@@ -32,7 +32,7 @@ namespace Gdk {
 		public void set_screen (Gdk.Screen screen);
 		public void set_timestamp (uint32 timestamp);
 	}
-	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", ref_function = "g_object_ref", unref_function = "g_object_unref")]
 	public class Bitmap {
 		public weak GLib.Object parent_instance;
 		public static Gdk.Bitmap create_from_data (Gdk.Drawable drawable, string data, int width, int height);
@@ -54,8 +54,8 @@ namespace Gdk {
 		public unowned Gdk.Visual get_visual ();
 		public void query_color (ulong pixel, out Gdk.Color _result);
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_cursor_ref", type_id = "GDK_TYPE_CURSOR", unref_function = "gdk_cursor_unref")]
 	[Compact]
-	[CCode (ref_function = "gdk_cursor_ref", unref_function = "gdk_cursor_unref", type_id = "GDK_TYPE_CURSOR", cheader_filename = "gdk/gdk.h")]
 	public class Cursor {
 		public uint ref_count;
 		public Gdk.CursorType type;
@@ -183,8 +183,8 @@ namespace Gdk {
 		public Gdk.Display default_display { get; set; }
 		public virtual signal void display_opened (Gdk.Display display);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Compact]
 	public class DisplayPointerHooks {
 		public weak GLib.Callback get_pointer;
 		public weak GLib.Callback window_at_pointer;
@@ -267,8 +267,8 @@ namespace Gdk {
 		public virtual void set_cairo_clip (Cairo.Context cr);
 		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT")]
 	[Compact]
-	[CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
 	public class Event {
 		public Gdk.EventAny any;
 		public Gdk.EventButton button;
@@ -310,8 +310,8 @@ namespace Gdk {
 		public void send_clientmessage_toall ();
 		public void set_screen (Gdk.Screen screen);
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", ref_function = "gdk_font_ref", type_id = "GDK_TYPE_FONT", unref_function = "gdk_font_unref")]
 	[Compact]
-	[CCode (ref_function = "gdk_font_ref", unref_function = "gdk_font_unref", type_id = "GDK_TYPE_FONT", cheader_filename = "gdk/gdk.h")]
 	public class Font {
 		public int ascent;
 		public int descent;
@@ -321,8 +321,8 @@ namespace Gdk {
 		public int id ();
 		public static unowned Gdk.Font load_for_display (Gdk.Display display, string font_name);
 	}
-	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (since = "2.22")]
 	public class GC : GLib.Object {
 		public int clip_x_origin;
 		public int clip_y_origin;
@@ -358,8 +358,8 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		public GC.with_values (Gdk.Drawable drawable, Gdk.GCValues values, Gdk.GCValuesMask values_mask);
 	}
-	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (since = "2.22")]
 	public class Image : GLib.Object {
 		public uint16 bits_per_pixel;
 		public uint16 bpl;
@@ -389,8 +389,8 @@ namespace Gdk {
 		public void put_pixel (int x, int y, uint32 pixel);
 		public void set_colormap (Gdk.Colormap colormap);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Compact]
 	public class KeyboardGrabInfo {
 		public weak Gdk.Window native_window;
 		public bool owner_events;
@@ -421,7 +421,7 @@ namespace Gdk {
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class PangoRenderer : Pango.Renderer {
-		[CCode (type = "PangoRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoRenderer*")]
 		public PangoRenderer (Gdk.Screen screen);
 		public static unowned Pango.Renderer get_default (Gdk.Screen screen);
 		public void set_drawable (Gdk.Drawable drawable);
@@ -451,14 +451,14 @@ namespace Gdk {
 		public static unowned Gdk.Pixmap lookup (Gdk.NativeWindow anid);
 		public static unowned Gdk.Pixmap lookup_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Compact]
 	public class PointerHooks {
 		public weak GLib.Callback get_pointer;
 		public weak GLib.Callback window_at_pointer;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Compact]
 	public class PointerWindowInfo {
 		public uint32 button;
 		public ulong motion_hint_serial;
@@ -468,8 +468,8 @@ namespace Gdk {
 		public double toplevel_y;
 		public weak Gdk.Window window_under_pointer;
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_region_copy", free_function = "gdk_region_destroy")]
 	[Compact]
-	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
 	public class Region {
 		[CCode (has_construct_function = false)]
 		public Region ();
@@ -734,7 +734,7 @@ namespace Gdk {
 		public static Gdk.Atom intern_static_string (string atom_name);
 		public string name ();
 	}
-	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_COLOR")]
 	public struct Color {
 		public uint32 pixel;
 		public uint16 red;
@@ -747,24 +747,24 @@ namespace Gdk {
 		public static bool parse (string spec, out Gdk.Color color);
 		public string to_string ();
 	}
-	[CCode (type_id = "GDK_TYPE_DEVICE_AXIS", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_DEVICE_AXIS")]
 	public struct DeviceAxis {
 		public Gdk.AxisUse use;
 		public double min;
 		public double max;
 	}
-	[CCode (type_id = "GDK_TYPE_DEVICE_KEY", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_DEVICE_KEY")]
 	public struct DeviceKey {
 		public uint keyval;
 		public Gdk.ModifierType modifiers;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventAny {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventButton {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -780,7 +780,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventClient {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -789,7 +789,7 @@ namespace Gdk {
 		public ushort data_format;
 		public void* data;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventConfigure {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -799,7 +799,7 @@ namespace Gdk {
 		public int width;
 		public int height;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventCrossing {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -815,7 +815,7 @@ namespace Gdk {
 		public bool focus;
 		public Gdk.ModifierType state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventDND {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -825,7 +825,7 @@ namespace Gdk {
 		public short x_root;
 		public short y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -834,14 +834,14 @@ namespace Gdk {
 		public weak Gdk.Region region;
 		public int count;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventFocus {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public int16 @in;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventGrabBroken {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -850,7 +850,7 @@ namespace Gdk {
 		public bool implicit;
 		public weak Gdk.Window grab_window;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventKey {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -865,7 +865,7 @@ namespace Gdk {
 		public uchar group;
 		public uint is_modifier;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventMotion {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -881,13 +881,13 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventNoExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventOwnerChange {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -898,7 +898,7 @@ namespace Gdk {
 		public uint32 time;
 		public uint32 selection_time;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProperty {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -907,7 +907,7 @@ namespace Gdk {
 		public uint32 time;
 		public Gdk.PropertyState state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProximity {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -915,7 +915,7 @@ namespace Gdk {
 		public uint32 time;
 		public weak Gdk.Device device;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventScroll {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -929,7 +929,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSelection {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -940,7 +940,7 @@ namespace Gdk {
 		public uint32 time;
 		public Gdk.NativeWindow requestor;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSetting {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -948,14 +948,14 @@ namespace Gdk {
 		public Gdk.SettingAction action;
 		public weak string name;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventVisibility {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public Gdk.VisibilityState state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventWindowState {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -963,7 +963,7 @@ namespace Gdk {
 		public Gdk.WindowState changed_mask;
 		public Gdk.WindowState new_window_state;
 	}
-	[CCode (type_id = "GDK_TYPE_GC_VALUES", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GC_VALUES")]
 	public struct GCValues {
 		public Gdk.Color foreground;
 		public Gdk.Color background;
@@ -984,7 +984,7 @@ namespace Gdk {
 		public Gdk.CapStyle cap_style;
 		public Gdk.JoinStyle join_style;
 	}
-	[CCode (type_id = "GDK_TYPE_GEOMETRY", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GEOMETRY")]
 	public struct Geometry {
 		public int min_width;
 		public int min_height;
@@ -998,7 +998,7 @@ namespace Gdk {
 		public double max_aspect;
 		public Gdk.Gravity win_gravity;
 	}
-	[CCode (type_id = "GDK_TYPE_KEYMAP_KEY", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_KEYMAP_KEY")]
 	public struct KeymapKey {
 		public uint keycode;
 		public int group;
@@ -1008,33 +1008,33 @@ namespace Gdk {
 	[SimpleType]
 	public struct NativeWindow {
 	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_EMBOSS_COLOR")]
 	public struct PangoAttrEmbossColor {
 		public weak Pango.Attribute attr;
 		public Pango.Color color;
 		[CCode (cname = "gdk_pango_attr_emboss_color_new", has_construct_function = false)]
 		public PangoAttrEmbossColor (Gdk.Color color);
 	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_EMBOSSED")]
 	public struct PangoAttrEmbossed {
 		public weak Pango.Attribute attr;
 		public bool embossed;
 		[CCode (cname = "gdk_pango_attr_embossed_new", has_construct_function = false)]
 		public PangoAttrEmbossed (bool embossed);
 	}
-	[CCode (type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_PANGO_ATTR_STIPPLE")]
 	public struct PangoAttrStipple {
 		public weak Pango.Attribute attr;
 		public weak Gdk.Bitmap stipple;
 		[CCode (cname = "gdk_pango_attr_stipple_new", has_construct_function = false)]
 		public PangoAttrStipple (Gdk.Bitmap stipple);
 	}
-	[CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_POINT")]
 	public struct Point {
 		public int x;
 		public int y;
 	}
-	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RECTANGLE")]
 	public struct Rectangle {
 		public int x;
 		public int y;
@@ -1043,39 +1043,39 @@ namespace Gdk {
 		public bool intersect (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RGB_CMAP")]
 	[Deprecated (since = "2.22")]
-	[CCode (type_id = "GDK_TYPE_RGB_CMAP", cheader_filename = "gdk/gdk.h")]
 	public struct RgbCmap {
 		[CCode (array_length = false)]
 		public weak uint32[] colors;
 		public int n_colors;
 		public weak GLib.SList info_list;
-		[Deprecated (since = "2.22")]
 		[CCode (cname = "gdk_rgb_cmap_new", has_construct_function = false)]
+		[Deprecated (since = "2.22")]
 		public RgbCmap (uint32[] colors);
 		[Deprecated (since = "2.22")]
 		public void free ();
 	}
-	[CCode (type_id = "GDK_TYPE_SEGMENT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_SEGMENT")]
 	public struct Segment {
 		public int x1;
 		public int y1;
 		public int x2;
 		public int y2;
 	}
-	[CCode (type_id = "GDK_TYPE_SPAN", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_SPAN")]
 	public struct Span {
 		public int x;
 		public int y;
 		public int width;
 	}
-	[CCode (type_id = "GDK_TYPE_TIME_COORD", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TIME_COORD")]
 	public struct TimeCoord {
 		public uint32 time;
 		[CCode (array_length = false)]
 		public weak double[] axes;
 	}
-	[CCode (type_id = "GDK_TYPE_TRAPEZOID", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TRAPEZOID")]
 	public struct Trapezoid {
 		public double y1;
 		public double x11;
@@ -1084,10 +1084,10 @@ namespace Gdk {
 		public double x12;
 		public double x22;
 	}
-	[CCode (type_id = "GDK_TYPE_WCHAR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WCHAR")]
 	public struct WChar {
 	}
-	[CCode (type_id = "GDK_TYPE_WINDOW_ATTR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_ATTR")]
 	public struct WindowAttr {
 		public weak string title;
 		public int event_mask;
@@ -1105,14 +1105,14 @@ namespace Gdk {
 		public bool override_redirect;
 		public Gdk.WindowTypeHint type_hint;
 	}
-	[CCode (type_id = "GDK_TYPE_WINDOW_REDIRECT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_REDIRECT")]
 	public struct WindowRedirect {
 		public static void to_drawable (Gdk.Window window, Gdk.Drawable drawable, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	}
-	[CCode (type_id = "GDK_TYPE_XEVENT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_XEVENT")]
 	public struct XEvent {
 	}
-	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_")]
 	public enum AxisUse {
 		IGNORE,
 		X,
@@ -1123,19 +1123,19 @@ namespace Gdk {
 		WHEEL,
 		LAST
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum ByteOrder {
 		LSB_FIRST,
 		MSB_FIRST
 	}
-	[CCode (cprefix = "GDK_CAP_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_CAP_")]
 	public enum CapStyle {
 		NOT_LAST,
 		BUTT,
 		ROUND,
 		PROJECTING
 	}
-	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_CROSSING_")]
 	public enum CrossingMode {
 		NORMAL,
 		GRAB,
@@ -1144,7 +1144,7 @@ namespace Gdk {
 		GTK_UNGRAB,
 		STATE_CHANGED
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum CursorType {
 		X_CURSOR,
 		ARROW,
@@ -1227,7 +1227,7 @@ namespace Gdk {
 		BLANK_CURSOR,
 		CURSOR_IS_PIXMAP
 	}
-	[CCode (cprefix = "GDK_ACTION_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ACTION_")]
 	[Flags]
 	public enum DragAction {
 		DEFAULT,
@@ -1237,7 +1237,7 @@ namespace Gdk {
 		PRIVATE,
 		ASK
 	}
-	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DRAG_PROTO_")]
 	public enum DragProtocol {
 		MOTIF,
 		XDND,
@@ -1247,7 +1247,7 @@ namespace Gdk {
 		OLE2,
 		LOCAL
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	[Flags]
 	public enum EventMask {
 		EXPOSURE_MASK,
@@ -1273,7 +1273,7 @@ namespace Gdk {
 		SCROLL_MASK,
 		ALL_EVENTS_MASK
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum EventType {
 		NOTHING,
 		DELETE,
@@ -1315,36 +1315,36 @@ namespace Gdk {
 		DAMAGE,
 		EVENT_LAST
 	}
-	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_EXTENSION_EVENTS_")]
 	public enum ExtensionMode {
 		NONE,
 		ALL,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum Fill {
 		SOLID,
 		TILED,
 		STIPPLED,
 		OPAQUE_STIPPLED
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum FillRule {
 		EVEN_ODD_RULE,
 		WINDING_RULE
 	}
-	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FILTER_")]
 	public enum FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cprefix = "GDK_FONT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FONT_")]
 	public enum FontType {
 		FONT,
 		FONTSET
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum Function {
 		COPY,
 		INVERT,
@@ -1363,7 +1363,7 @@ namespace Gdk {
 		NOR,
 		SET
 	}
-	[CCode (cprefix = "GDK_GC_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GC_")]
 	[Flags]
 	public enum GCValuesMask {
 		FOREGROUND,
@@ -1385,7 +1385,7 @@ namespace Gdk {
 		CAP_STYLE,
 		JOIN_STYLE
 	}
-	[CCode (cprefix = "GDK_GRAB_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAB_")]
 	public enum GrabStatus {
 		SUCCESS,
 		ALREADY_GRABBED,
@@ -1393,7 +1393,7 @@ namespace Gdk {
 		NOT_VIEWABLE,
 		FROZEN
 	}
-	[CCode (cprefix = "GDK_GRAVITY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAVITY_")]
 	public enum Gravity {
 		NORTH_WEST,
 		NORTH,
@@ -1406,45 +1406,45 @@ namespace Gdk {
 		SOUTH_EAST,
 		STATIC
 	}
-	[CCode (cprefix = "GDK_IMAGE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_IMAGE_")]
 	public enum ImageType {
 		NORMAL,
 		SHARED,
 		FASTEST
 	}
-	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_INPUT_")]
 	[Flags]
 	public enum InputCondition {
 		READ,
 		WRITE,
 		EXCEPTION
 	}
-	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODE_")]
 	public enum InputMode {
 		DISABLED,
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cprefix = "GDK_SOURCE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SOURCE_")]
 	public enum InputSource {
 		MOUSE,
 		PEN,
 		ERASER,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_JOIN_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_JOIN_")]
 	public enum JoinStyle {
 		MITER,
 		ROUND,
 		BEVEL
 	}
-	[CCode (cprefix = "GDK_LINE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_LINE_")]
 	public enum LineStyle {
 		SOLID,
 		ON_OFF_DASH,
 		DOUBLE_DASH
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -1466,7 +1466,7 @@ namespace Gdk {
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cprefix = "GDK_NOTIFY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_NOTIFY_")]
 	public enum NotifyType {
 		ANCESTOR,
 		VIRTUAL,
@@ -1475,49 +1475,49 @@ namespace Gdk {
 		NONLINEAR_VIRTUAL,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDK_OVERLAP_RECTANGLE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OVERLAP_RECTANGLE_")]
 	public enum OverlapType {
 		IN,
 		OUT,
 		PART
 	}
-	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNER_CHANGE_")]
 	public enum OwnerChange {
 		NEW_OWNER,
 		DESTROY,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROP_MODE_")]
 	public enum PropMode {
 		REPLACE,
 		PREPEND,
 		APPEND
 	}
-	[CCode (cprefix = "GDK_PROPERTY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROPERTY_")]
 	public enum PropertyState {
 		NEW_VALUE,
 		DELETE
 	}
-	[CCode (cprefix = "GDK_RGB_DITHER_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_RGB_DITHER_")]
 	public enum RgbDither {
 		NONE,
 		NORMAL,
 		MAX
 	}
-	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SCROLL_")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GDK_SETTING_ACTION_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SETTING_ACTION_")]
 	public enum SettingAction {
 		NEW,
 		CHANGED,
 		DELETED
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum Status {
 		OK,
 		ERROR,
@@ -1525,18 +1525,18 @@ namespace Gdk {
 		ERROR_FILE,
 		ERROR_MEM
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum SubwindowMode {
 		CLIP_BY_CHILDREN,
 		INCLUDE_INFERIORS
 	}
-	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISIBILITY_")]
 	public enum VisibilityState {
 		UNOBSCURED,
 		PARTIAL,
 		FULLY_OBSCURED
 	}
-	[CCode (cprefix = "GDK_VISUAL_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISUAL_")]
 	public enum VisualType {
 		STATIC_GRAY,
 		GRAYSCALE,
@@ -1545,7 +1545,7 @@ namespace Gdk {
 		TRUE_COLOR,
 		DIRECT_COLOR
 	}
-	[CCode (cprefix = "GDK_DECOR_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DECOR_")]
 	[Flags]
 	public enum WMDecoration {
 		ALL,
@@ -1556,7 +1556,7 @@ namespace Gdk {
 		MINIMIZE,
 		MAXIMIZE
 	}
-	[CCode (cprefix = "GDK_FUNC_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FUNC_")]
 	[Flags]
 	public enum WMFunction {
 		ALL,
@@ -1566,7 +1566,7 @@ namespace Gdk {
 		MAXIMIZE,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_WA_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WA_")]
 	[Flags]
 	public enum WindowAttributesType {
 		TITLE,
@@ -1579,12 +1579,12 @@ namespace Gdk {
 		NOREDIR,
 		TYPE_HINT
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum WindowClass {
 		INPUT_OUTPUT,
 		INPUT_ONLY
 	}
-	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_EDGE_")]
 	public enum WindowEdge {
 		NORTH_WEST,
 		NORTH,
@@ -1595,7 +1595,7 @@ namespace Gdk {
 		SOUTH,
 		SOUTH_EAST
 	}
-	[CCode (cprefix = "GDK_HINT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_HINT_")]
 	[Flags]
 	public enum WindowHints {
 		POS,
@@ -1608,7 +1608,7 @@ namespace Gdk {
 		USER_POS,
 		USER_SIZE
 	}
-	[CCode (cprefix = "GDK_WINDOW_STATE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_STATE_")]
 	[Flags]
 	public enum WindowState {
 		WITHDRAWN,
@@ -1619,7 +1619,7 @@ namespace Gdk {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "GDK_WINDOW_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_")]
 	public enum WindowType {
 		ROOT,
 		TOPLEVEL,
@@ -1629,7 +1629,7 @@ namespace Gdk {
 		FOREIGN,
 		OFFSCREEN
 	}
-	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_TYPE_HINT_")]
 	public enum WindowTypeHint {
 		NORMAL,
 		DIALOG,
@@ -1652,8 +1652,8 @@ namespace Gdk {
 	public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event);
 	[CCode (cheader_filename = "gdk/gdk.h", has_target = false)]
 	public delegate void InputFunction (void* data, int source, Gdk.InputCondition condition);
-	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (since = "2.22")]
 	public delegate void SpanFunc (Gdk.Span span);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public const int CURRENT_TIME;
@@ -1717,83 +1717,83 @@ namespace Gdk {
 	public static bool drag_motion (Gdk.DragContext context, Gdk.Window dest_window, Gdk.DragProtocol protocol, int x_root, int y_root, Gdk.DragAction suggested_action, Gdk.DragAction possible_actions, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drag_status (Gdk.DragContext context, Gdk.DragAction action, uint32 time_);
-	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
 	[Deprecated (since = "2.22")]
+	public static void draw_arc (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_drawable (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
 	[Deprecated (since = "2.22")]
+	public static void draw_drawable (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Drawable src, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_glyphs (Gdk.Drawable drawable, Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
 	[Deprecated (since = "2.22")]
+	public static void draw_glyphs (Gdk.Drawable drawable, Gdk.GC gc, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_glyphs_transformed (Gdk.Drawable drawable, Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
 	[Deprecated (since = "2.22")]
+	public static void draw_glyphs_transformed (Gdk.Drawable drawable, Gdk.GC gc, Pango.Matrix matrix, Pango.Font font, int x, int y, Pango.GlyphString glyphs);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_gray_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
 	[Deprecated (since = "2.22")]
+	public static void draw_gray_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_image (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
 	[Deprecated (since = "2.22")]
+	public static void draw_image (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Image image, int xsrc, int ysrc, int xdest, int ydest, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_indexed_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, Gdk.RgbCmap cmap);
 	[Deprecated (since = "2.22")]
+	public static void draw_indexed_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, Gdk.RgbCmap cmap);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout);
 	[Deprecated (since = "2.22")]
+	public static void draw_layout (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_line (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line);
 	[Deprecated (since = "2.22")]
+	public static void draw_layout_line (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_line_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line, Gdk.Color foreground, Gdk.Color background);
 	[Deprecated (since = "2.22")]
+	public static void draw_layout_line_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.LayoutLine line, Gdk.Color foreground, Gdk.Color background);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_layout_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout, Gdk.Color foreground, Gdk.Color background);
 	[Deprecated (since = "2.22")]
+	public static void draw_layout_with_colors (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, Pango.Layout layout, Gdk.Color foreground, Gdk.Color background);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
 	[Deprecated (since = "2.22")]
+	public static void draw_line (Gdk.Drawable drawable, Gdk.GC gc, int x1_, int y1_, int x2_, int y2_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[Deprecated (since = "2.22")]
+	public static void draw_lines (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
 	[Deprecated (since = "2.22")]
+	public static void draw_pixbuf (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Pixbuf pixbuf, int src_x, int src_y, int dest_x, int dest_y, int width, int height, Gdk.RgbDither dither, int x_dither, int y_dither);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
 	[Deprecated (since = "2.22")]
+	public static void draw_point (Gdk.Drawable drawable, Gdk.GC gc, int x, int y);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[Deprecated (since = "2.22")]
+	public static void draw_points (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points);
 	[Deprecated (since = "2.22")]
+	public static void draw_polygon (Gdk.Drawable drawable, Gdk.GC gc, bool filled, Gdk.Point[] points);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height);
 	[Deprecated (since = "2.22")]
+	public static void draw_rectangle (Gdk.Drawable drawable, Gdk.GC gc, bool filled, int x, int y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_32_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
 	[Deprecated (since = "2.22")]
+	public static void draw_rgb_32_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_32_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, int xdith, int ydith);
 	[Deprecated (since = "2.22")]
+	public static void draw_rgb_32_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] buf, int rowstride, int xdith, int ydith);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride);
 	[Deprecated (since = "2.22")]
+	public static void draw_rgb_image (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride, int xdith, int ydith);
 	[Deprecated (since = "2.22")]
+	public static void draw_rgb_image_dithalign (Gdk.Drawable drawable, Gdk.GC gc, int x, int y, int width, int height, Gdk.RgbDither dith, [CCode (array_length = false)] uchar[] rgb_buf, int rowstride, int xdith, int ydith);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs);
 	[Deprecated (since = "2.22")]
+	public static void draw_segments (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Segment[] segs);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
 	[Deprecated (since = "2.22")]
+	public static void draw_text (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, string text, int text_length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
 	[Deprecated (since = "2.22")]
+	public static void draw_text_wc (Gdk.Drawable drawable, Gdk.Font font, Gdk.GC gc, int x, int y, Gdk.WChar text, int text_length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (since = "2.22")]
 	public static void draw_trapezoids (Gdk.Drawable drawable, Gdk.GC gc, Gdk.Trapezoid[] trapezoids);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void drop_finish (Gdk.DragContext context, bool success, uint32 time_);
@@ -1901,53 +1901,53 @@ namespace Gdk {
 	public static void query_depths (int depths, int count);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void query_visual_types (out Gdk.VisualType visual_types, int count);
-	[Deprecated (since = "2.22")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
 	[Deprecated (since = "2.22")]
+	public static bool rgb_colormap_ditherable (Gdk.Colormap cmap);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool rgb_ditherable ();
 	[Deprecated (since = "2.22")]
+	public static bool rgb_ditherable ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
 	[Deprecated (since = "2.22")]
+	public static void rgb_find_color (Gdk.Colormap colormap, ref Gdk.Color color);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Colormap rgb_get_colormap ();
 	[Deprecated (since = "2.22")]
+	public static unowned Gdk.Colormap rgb_get_colormap ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static unowned Gdk.Visual rgb_get_visual ();
 	[Deprecated (since = "2.22")]
+	public static unowned Gdk.Visual rgb_get_visual ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_set_install (bool install);
 	[Deprecated (since = "2.22")]
+	public static void rgb_set_install (bool install);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void rgb_set_min_colors (int min_colors);
 	[Deprecated (since = "2.22")]
+	public static void rgb_set_min_colors (int min_colors);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (since = "2.22")]
 	public static void rgb_set_verbose (bool verbose);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.convert")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.convert", since = "vala-0.12")]
 	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_get")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_get", since = "vala-0.12")]
 	public static unowned Gdk.Window selection_owner_get (Gdk.Atom selection);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_get_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_get_for_display", since = "vala-0.12")]
 	public static unowned Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_set")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_set", since = "vala-0.12")]
 	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_set_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_set_for_display", since = "vala-0.12")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.property_get")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.property_get", since = "vala-0.12")]
 	public static int selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.send_notify", since = "vala-0.12")]
 	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.send_notify_for_display", since = "vala-0.12")]
 	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 9455e4a..996b784 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -1,6 +1,6 @@
 /* gdk-3.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_", gir_namespace = "Gdk", gir_version = "3.0")]
+[CCode (cprefix = "Gdk", gir_namespace = "Gdk", gir_version = "3.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
 	[CCode (cprefix = "GdkSelection", lower_case_cprefix = "gdk_selection_")]
 	namespace Selection {
@@ -33,7 +33,7 @@ namespace Gdk {
 		[NoAccessorMethod]
 		public Gdk.Display display { owned get; construct; }
 	}
-	[CCode (ref_function = "g_object_ref", unref_function = "g_object_unref", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", ref_function = "g_object_ref", unref_function = "g_object_unref")]
 	public class Bitmap {
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -177,8 +177,8 @@ namespace Gdk {
 		public unowned GLib.List list_targets ();
 		public void set_device (Gdk.Device device);
 	}
+	[CCode (cheader_filename = "gdk/gdk.h", copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT")]
 	[Compact]
-	[CCode (copy_function = "gdk_event_copy", type_id = "GDK_TYPE_EVENT", cheader_filename = "gdk/gdk.h")]
 	public class Event {
 		public Gdk.EventAny any;
 		public Gdk.EventButton button;
@@ -460,7 +460,7 @@ namespace Gdk {
 		public static Gdk.Atom intern_static_string (string atom_name);
 		public string name ();
 	}
-	[CCode (type_id = "GDK_TYPE_COLOR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_COLOR")]
 	public struct Color {
 		public uint32 pixel;
 		public uint16 red;
@@ -473,13 +473,13 @@ namespace Gdk {
 		public static bool parse (string spec, out Gdk.Color color);
 		public string to_string ();
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventAny {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventButton {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -495,7 +495,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventConfigure {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -505,7 +505,7 @@ namespace Gdk {
 		public int width;
 		public int height;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventCrossing {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -521,7 +521,7 @@ namespace Gdk {
 		public bool focus;
 		public Gdk.ModifierType state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventDND {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -531,7 +531,7 @@ namespace Gdk {
 		public short x_root;
 		public short y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventExpose {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -540,14 +540,14 @@ namespace Gdk {
 		public weak Cairo.Region region;
 		public int count;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventFocus {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public int16 @in;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventGrabBroken {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -556,7 +556,7 @@ namespace Gdk {
 		public bool implicit;
 		public weak Gdk.Window grab_window;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventKey {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -571,7 +571,7 @@ namespace Gdk {
 		public uchar group;
 		public uint is_modifier;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventMotion {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -587,7 +587,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventOwnerChange {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -598,7 +598,7 @@ namespace Gdk {
 		public uint32 time;
 		public uint32 selection_time;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProperty {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -607,7 +607,7 @@ namespace Gdk {
 		public uint32 time;
 		public Gdk.PropertyState state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventProximity {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -615,7 +615,7 @@ namespace Gdk {
 		public uint32 time;
 		public weak Gdk.Device device;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventScroll {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -629,7 +629,7 @@ namespace Gdk {
 		public double x_root;
 		public double y_root;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSelection {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -640,7 +640,7 @@ namespace Gdk {
 		public uint32 time;
 		public weak Gdk.Window requestor;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventSetting {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -648,14 +648,14 @@ namespace Gdk {
 		public Gdk.SettingAction action;
 		public weak string name;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventVisibility {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
 		public char send_event;
 		public Gdk.VisibilityState state;
 	}
-	[CCode (has_type_id = false, cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	public struct EventWindowState {
 		public Gdk.EventType type;
 		public weak Gdk.Window window;
@@ -663,7 +663,7 @@ namespace Gdk {
 		public Gdk.WindowState changed_mask;
 		public Gdk.WindowState new_window_state;
 	}
-	[CCode (type_id = "GDK_TYPE_GEOMETRY", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_GEOMETRY")]
 	public struct Geometry {
 		public int min_width;
 		public int min_height;
@@ -677,18 +677,18 @@ namespace Gdk {
 		public double max_aspect;
 		public Gdk.Gravity win_gravity;
 	}
-	[CCode (type_id = "GDK_TYPE_KEYMAP_KEY", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_KEYMAP_KEY")]
 	public struct KeymapKey {
 		public uint keycode;
 		public int group;
 		public int level;
 	}
-	[CCode (type_id = "GDK_TYPE_POINT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_POINT")]
 	public struct Point {
 		public int x;
 		public int y;
 	}
-	[CCode (type_id = "GDK_TYPE_RGBA", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RGBA")]
 	public struct RGBA {
 		public double red;
 		public double green;
@@ -701,7 +701,7 @@ namespace Gdk {
 		public bool parse (string spec);
 		public unowned string to_string ();
 	}
-	[CCode (type_id = "GDK_TYPE_RECTANGLE", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_RECTANGLE")]
 	public struct Rectangle {
 		public int x;
 		public int y;
@@ -710,13 +710,13 @@ namespace Gdk {
 		public bool intersect (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 		public void union (Gdk.Rectangle src2, out Gdk.Rectangle dest);
 	}
-	[CCode (type_id = "GDK_TYPE_TIME_COORD", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_TIME_COORD")]
 	public struct TimeCoord {
 		public uint32 time;
 		[CCode (array_length = false)]
 		public weak double[] axes;
 	}
-	[CCode (type_id = "GDK_TYPE_WINDOW_ATTR", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_ATTR")]
 	public struct WindowAttr {
 		public weak string title;
 		public int event_mask;
@@ -733,13 +733,13 @@ namespace Gdk {
 		public bool override_redirect;
 		public Gdk.WindowTypeHint type_hint;
 	}
-	[CCode (type_id = "GDK_TYPE_WINDOW_REDIRECT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_WINDOW_REDIRECT")]
 	public struct WindowRedirect {
 	}
-	[CCode (type_id = "GDK_TYPE_XEVENT", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", type_id = "GDK_TYPE_XEVENT")]
 	public struct XEvent {
 	}
-	[CCode (cprefix = "GDK_AXIS_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_")]
 	public enum AxisUse {
 		IGNORE,
 		X,
@@ -750,12 +750,12 @@ namespace Gdk {
 		WHEEL,
 		LAST
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum ByteOrder {
 		LSB_FIRST,
 		MSB_FIRST
 	}
-	[CCode (cprefix = "GDK_CROSSING_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_CROSSING_")]
 	public enum CrossingMode {
 		NORMAL,
 		GRAB,
@@ -764,7 +764,7 @@ namespace Gdk {
 		GTK_UNGRAB,
 		STATE_CHANGED
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum CursorType {
 		X_CURSOR,
 		ARROW,
@@ -847,13 +847,13 @@ namespace Gdk {
 		BLANK_CURSOR,
 		CURSOR_IS_PIXMAP
 	}
-	[CCode (cprefix = "GDK_DEVICE_TYPE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DEVICE_TYPE_")]
 	public enum DeviceType {
 		MASTER,
 		SLAVE,
 		FLOATING
 	}
-	[CCode (cprefix = "GDK_ACTION_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ACTION_")]
 	[Flags]
 	public enum DragAction {
 		DEFAULT,
@@ -863,7 +863,7 @@ namespace Gdk {
 		PRIVATE,
 		ASK
 	}
-	[CCode (cprefix = "GDK_DRAG_PROTO_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DRAG_PROTO_")]
 	public enum DragProtocol {
 		NONE,
 		MOTIF,
@@ -873,7 +873,7 @@ namespace Gdk {
 		OLE2,
 		LOCAL
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	[Flags]
 	public enum EventMask {
 		EXPOSURE_MASK,
@@ -899,7 +899,7 @@ namespace Gdk {
 		SCROLL_MASK,
 		ALL_EVENTS_MASK
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum EventType {
 		NOTHING,
 		DELETE,
@@ -940,25 +940,25 @@ namespace Gdk {
 		DAMAGE,
 		EVENT_LAST
 	}
-	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_EXTENSION_EVENTS_")]
 	public enum ExtensionMode {
 		NONE,
 		ALL,
 		CURSOR
 	}
-	[CCode (cprefix = "GDK_FILTER_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FILTER_")]
 	public enum FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cprefix = "GDK_OWNERSHIP_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNERSHIP_")]
 	public enum GrabOwnership {
 		NONE,
 		WINDOW,
 		APPLICATION
 	}
-	[CCode (cprefix = "GDK_GRAB_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAB_")]
 	public enum GrabStatus {
 		SUCCESS,
 		ALREADY_GRABBED,
@@ -966,7 +966,7 @@ namespace Gdk {
 		NOT_VIEWABLE,
 		FROZEN
 	}
-	[CCode (cprefix = "GDK_GRAVITY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAVITY_")]
 	public enum Gravity {
 		NORTH_WEST,
 		NORTH,
@@ -979,13 +979,13 @@ namespace Gdk {
 		SOUTH_EAST,
 		STATIC
 	}
-	[CCode (cprefix = "GDK_MODE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODE_")]
 	public enum InputMode {
 		DISABLED,
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cprefix = "GDK_SOURCE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SOURCE_")]
 	public enum InputSource {
 		MOUSE,
 		PEN,
@@ -993,7 +993,7 @@ namespace Gdk {
 		CURSOR,
 		KEYBOARD
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -1015,7 +1015,7 @@ namespace Gdk {
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cprefix = "GDK_NOTIFY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_NOTIFY_")]
 	public enum NotifyType {
 		ANCESTOR,
 		VIRTUAL,
@@ -1024,37 +1024,37 @@ namespace Gdk {
 		NONLINEAR_VIRTUAL,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDK_OWNER_CHANGE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNER_CHANGE_")]
 	public enum OwnerChange {
 		NEW_OWNER,
 		DESTROY,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_PROP_MODE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROP_MODE_")]
 	public enum PropMode {
 		REPLACE,
 		PREPEND,
 		APPEND
 	}
-	[CCode (cprefix = "GDK_PROPERTY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROPERTY_")]
 	public enum PropertyState {
 		NEW_VALUE,
 		DELETE
 	}
-	[CCode (cprefix = "GDK_SCROLL_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SCROLL_")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GDK_SETTING_ACTION_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SETTING_ACTION_")]
 	public enum SettingAction {
 		NEW,
 		CHANGED,
 		DELETED
 	}
-	[CCode (cprefix = "GDK_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
 	public enum Status {
 		OK,
 		ERROR,
@@ -1062,13 +1062,13 @@ namespace Gdk {
 		ERROR_FILE,
 		ERROR_MEM
 	}
-	[CCode (cprefix = "GDK_VISIBILITY_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISIBILITY_")]
 	public enum VisibilityState {
 		UNOBSCURED,
 		PARTIAL,
 		FULLY_OBSCURED
 	}
-	[CCode (cprefix = "GDK_VISUAL_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISUAL_")]
 	public enum VisualType {
 		STATIC_GRAY,
 		GRAYSCALE,
@@ -1077,7 +1077,7 @@ namespace Gdk {
 		TRUE_COLOR,
 		DIRECT_COLOR
 	}
-	[CCode (cprefix = "GDK_DECOR_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DECOR_")]
 	[Flags]
 	public enum WMDecoration {
 		ALL,
@@ -1088,7 +1088,7 @@ namespace Gdk {
 		MINIMIZE,
 		MAXIMIZE
 	}
-	[CCode (cprefix = "GDK_FUNC_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FUNC_")]
 	[Flags]
 	public enum WMFunction {
 		ALL,
@@ -1098,7 +1098,7 @@ namespace Gdk {
 		MAXIMIZE,
 		CLOSE
 	}
-	[CCode (cprefix = "GDK_WA_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WA_")]
 	[Flags]
 	public enum WindowAttributesType {
 		TITLE,
@@ -1110,7 +1110,7 @@ namespace Gdk {
 		NOREDIR,
 		TYPE_HINT
 	}
-	[CCode (cprefix = "GDK_WINDOW_EDGE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_EDGE_")]
 	public enum WindowEdge {
 		NORTH_WEST,
 		NORTH,
@@ -1121,7 +1121,7 @@ namespace Gdk {
 		SOUTH,
 		SOUTH_EAST
 	}
-	[CCode (cprefix = "GDK_HINT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_HINT_")]
 	[Flags]
 	public enum WindowHints {
 		POS,
@@ -1134,7 +1134,7 @@ namespace Gdk {
 		USER_POS,
 		USER_SIZE
 	}
-	[CCode (cprefix = "GDK_WINDOW_STATE_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_STATE_")]
 	[Flags]
 	public enum WindowState {
 		WITHDRAWN,
@@ -1145,7 +1145,7 @@ namespace Gdk {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "GDK_WINDOW_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_")]
 	public enum WindowType {
 		ROOT,
 		TOPLEVEL,
@@ -1154,7 +1154,7 @@ namespace Gdk {
 		FOREIGN,
 		OFFSCREEN
 	}
-	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_TYPE_HINT_")]
 	public enum WindowTypeHint {
 		NORMAL,
 		DIALOG,
@@ -1171,7 +1171,7 @@ namespace Gdk {
 		COMBO,
 		DND
 	}
-	[CCode (cprefix = "GDK_INPUT_", cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_INPUT_")]
 	public enum WindowWindowClass {
 		OUTPUT,
 		ONLY
@@ -1326,29 +1326,29 @@ namespace Gdk {
 	public static void query_depths (int depths, int count);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void query_visual_types (out Gdk.VisualType visual_types, int count);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.convert")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.convert", since = "vala-0.12")]
 	public static void selection_convert (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, uint32 time_);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_get")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_get", since = "vala-0.12")]
 	public static unowned Gdk.Window selection_owner_get (Gdk.Atom selection);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_get_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_get_for_display", since = "vala-0.12")]
 	public static unowned Gdk.Window selection_owner_get_for_display (Gdk.Display display, Gdk.Atom selection);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_set")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_set", since = "vala-0.12")]
 	public static bool selection_owner_set (Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.owner_set_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.owner_set_for_display", since = "vala-0.12")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.property_get")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.property_get", since = "vala-0.12")]
 	public static int selection_property_get (Gdk.Window requestor, uchar[] data, out Gdk.Atom prop_type, int prop_format);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.send_notify", since = "vala-0.12")]
 	public static void selection_send_notify (Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
-	[Deprecated (since = "vala-0.12", replacement = "Selection.send_notify_for_display")]
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	[Deprecated (replacement = "Selection.send_notify_for_display", since = "vala-0.12")]
 	public static void selection_send_notify_for_display (Gdk.Display display, Gdk.Window requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void set_double_click_time (uint msec);
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index bf00ca6..4009a74 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -1,6 +1,6 @@
 /* gdk-pixbuf-2.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_", gir_namespace = "GdkPixbuf", gir_version = "2.0")]
+[CCode (cprefix = "Gdk", gir_namespace = "GdkPixbuf", gir_version = "2.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class Pixbuf : GLib.Object, GLib.Icon {
@@ -29,11 +29,11 @@ namespace Gdk {
 		public static unowned Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async Pixbuf.from_stream_async (GLib.InputStream stream, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async Pixbuf.from_stream_at_scale_async (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable = null);
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_xpm_data ([CCode (array_length = false)] string[] data);
@@ -52,8 +52,8 @@ namespace Gdk {
 		public Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
 		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
 		public bool save (string filename, string type, ...) throws GLib.Error;
-		public bool save_to_buffer ([CCode (type = "gchar**", array_length_type = "gsize")] out uint8[] buffer, string type, ...) throws GLib.Error;
-		public bool save_to_bufferv ([CCode (type = "gchar**", array_length_type = "gsize")] out uint8[] buffer, string type, string[] option_keys, string[] option_values) throws GLib.Error;
+		public bool save_to_buffer ([CCode (array_length_type = "gsize", type = "gchar**")] out uint8[] buffer, string type, ...) throws GLib.Error;
+		public bool save_to_bufferv ([CCode (array_length_type = "gsize", type = "gchar**")] out uint8[] buffer, string type, string[] option_keys, string[] option_values) throws GLib.Error;
 		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type, ...) throws GLib.Error;
 		public bool save_to_callbackv (Gdk.PixbufSaveFunc save_func, string type, [CCode (array_length = false, array_null_terminated = true)] string[] option_keys, [CCode (array_length = false, array_null_terminated = true)] string[] option_values) throws GLib.Error;
 		public bool save_to_stream (GLib.OutputStream stream, string type, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -93,8 +93,8 @@ namespace Gdk {
 		public unowned Gdk.Pixbuf get_pixbuf ();
 		public bool on_currently_loading_frame ();
 	}
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", copy_function = "gdk_pixbuf_format_copy", type_id = "GDK_TYPE_PIXBUF_FORMAT")]
 	[Compact]
-	[CCode (copy_function = "gdk_pixbuf_format_copy", type_id = "GDK_TYPE_PIXBUF_FORMAT", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufFormat {
 		public unowned Gdk.PixbufFormat copy ();
 		public unowned string get_description ();
@@ -137,8 +137,8 @@ namespace Gdk {
 		public void set_loop (bool loop);
 		public bool loop { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[Compact]
 	public class PixbufSimpleAnimClass {
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
@@ -146,7 +146,7 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected PixbufSimpleAnimIter ();
 	}
-	[CCode (type_id = "GDK_TYPE_PIXDATA", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", type_id = "GDK_TYPE_PIXDATA")]
 	public struct Pixdata {
 		public uint32 magic;
 		public int32 length;
@@ -161,30 +161,30 @@ namespace Gdk {
 		public uint8[] serialize ();
 		public unowned GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
 	}
-	[CCode (cprefix = "GDK_COLORSPACE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_COLORSPACE_")]
 	public enum Colorspace {
 		RGB
 	}
-	[CCode (cprefix = "GDK_INTERP_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_INTERP_")]
 	public enum InterpType {
 		NEAREST,
 		TILES,
 		BILINEAR,
 		HYPER
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ALPHA_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXBUF_ALPHA_")]
 	public enum PixbufAlphaMode {
 		BILEVEL,
 		FULL
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ROTATE_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXBUF_ROTATE_")]
 	public enum PixbufRotation {
 		NONE,
 		COUNTERCLOCKWISE,
 		UPSIDEDOWN,
 		CLOCKWISE
 	}
-	[CCode (cprefix = "GDK_PIXDATA_DUMP_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_DUMP_", has_type_id = false)]
 	public enum PixdataDumpType {
 		PIXDATA_STREAM,
 		PIXDATA_STRUCT,
@@ -195,7 +195,7 @@ namespace Gdk {
 		CONST,
 		RLE_DECODER
 	}
-	[CCode (cprefix = "GDK_PIXDATA_", has_type_id = false, cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_", has_type_id = false)]
 	public enum PixdataType {
 		COLOR_TYPE_RGB,
 		COLOR_TYPE_RGBA,
@@ -206,7 +206,7 @@ namespace Gdk {
 		ENCODING_RLE,
 		ENCODING_MASK
 	}
-	[CCode (cprefix = "GDK_PIXBUF_ERROR_", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXBUF_ERROR_")]
 	public errordomain PixbufError {
 		CORRUPT_IMAGE,
 		INSUFFICIENT_MEMORY,
diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi
index 2f5dac4..6a48be1 100644
--- a/vapi/gdk-x11-2.0.vapi
+++ b/vapi/gdk-x11-2.0.vapi
@@ -62,7 +62,7 @@ namespace Gdk {
 	public static void* x11_image_get_ximage (Gdk.Image image);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
-	[CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")]
+	[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_net_wm_supports")]
 	public static bool x11_net_wm_supports (Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned Gdk.Drawable x11_pixmap_get_drawable_impl (Gdk.Pixmap pixmap);
@@ -82,7 +82,7 @@ namespace Gdk {
 	public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static void x11_ungrab_server ();
-	[CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")]
+	[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdkx_visual_get")]
 	public static unowned Gdk.Visual x11_visual_get (uint32 xvisualid);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static unowned Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual);
@@ -96,8 +96,8 @@ namespace Gdk {
 	public static Gdk.Atom x11_xatom_to_atom (X.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
 	public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
-	[CCode (cname = "gdk_xid_table_lookup", cheader_filename = "gdk/gdkx.h")]
+	[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_xid_table_lookup")]
 	public static void* x11_xid_table_lookup (X.ID xid);
-	[CCode (cname = "gdk_xid_table_lookup_for_display", cheader_filename = "gdk/gdkx.h")]
+	[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_xid_table_lookup_for_display")]
 	public static void* x11_xid_table_lookup_for_display (Gdk.Display display, X.ID xid);
 }
diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 697581d..1d326a2 100644
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -7,8 +7,8 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected X11AppLaunchContext ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11AppLaunchContextClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -18,8 +18,8 @@ namespace Gdk {
 		public static unowned Gdk.Cursor get_xcursor (Gdk.Cursor cursor);
 		public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11CursorClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -41,8 +41,8 @@ namespace Gdk {
 		public static void ungrab (Gdk.Display display);
 		public static bool utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11DisplayClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -50,8 +50,8 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected X11DisplayManager ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11DisplayManagerClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -59,8 +59,8 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected X11DragContext ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11DragContextClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -68,8 +68,8 @@ namespace Gdk {
 		[CCode (has_construct_function = false)]
 		protected X11Keymap ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11KeymapClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -84,8 +84,8 @@ namespace Gdk {
 		public static bool supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
 		public virtual signal void window_manager_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11ScreenClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -94,8 +94,8 @@ namespace Gdk {
 		protected X11Visual ();
 		public static unowned Gdk.Visual get_xvisual (Gdk.Visual visual);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11VisualClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
@@ -108,8 +108,8 @@ namespace Gdk {
 		public static void move_to_current_desktop (Gdk.Window window);
 		public static void set_user_time (Gdk.Window window, uint32 timestamp);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Compact]
 	public class X11WindowClass {
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
diff --git a/vapi/gdl-1.0.vapi b/vapi/gdl-1.0.vapi
index 25b2813..37bd938 100644
--- a/vapi/gdl-1.0.vapi
+++ b/vapi/gdl-1.0.vapi
@@ -5,11 +5,11 @@ namespace Gdl {
 	[CCode (cheader_filename = "gdl/gdl.h")]
 	public class Dock : Gdl.DockObject, Atk.Implementor, Gtk.Buildable {
 		public weak Gdl.DockObject root;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dock ();
 		public void add_floating_item (Gdl.DockItem item, int x, int y, int width, int height);
 		public void add_item (Gdl.DockItem item, Gdl.DockPlacement place);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dock.from (Gdl.Dock original, bool floating);
 		public unowned Gdl.DockItem get_item_by_name (string name);
 		public unowned GLib.List get_named_items ();
@@ -33,7 +33,7 @@ namespace Gdl {
 	[CCode (cheader_filename = "gdl/gdl.h")]
 	public class DockBar : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
 		public weak Gdl.Dock dock;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DockBar (Gdl.Dock dock);
 		public Gtk.Orientation get_orientation ();
 		public Gdl.DockBarStyle get_style ();
@@ -49,7 +49,7 @@ namespace Gdl {
 		public weak Gtk.Widget child;
 		public int dragoff_x;
 		public int dragoff_y;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DockItem (string name, string long_name, Gdl.DockItemBehavior behavior);
 		public void bind (Gtk.Widget dock);
 		public void dock_to (Gdl.DockItem? target, Gdl.DockPlacement position, int docking_param);
@@ -68,7 +68,7 @@ namespace Gdl {
 		public void show_item ();
 		public void unbind ();
 		public void unlock ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DockItem.with_stock (string name, string long_name, string stock_id, Gdl.DockItemBehavior behavior);
 		[NoAccessorMethod]
 		public Gdl.DockItemBehavior behavior { get; set; }
@@ -90,7 +90,7 @@ namespace Gdl {
 	[CCode (cheader_filename = "gdl/gdl.h")]
 	public class DockItemGrip : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public weak Gdk.Window title_window;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DockItemGrip (Gdl.DockItem item);
 		public void hide_handle ();
 		public void set_label (Gtk.Widget label);
@@ -193,7 +193,7 @@ namespace Gdl {
 	}
 	[CCode (cheader_filename = "gdl/gdl.h")]
 	public class DockPlaceholder : Gdl.DockObject, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DockPlaceholder (string name, Gdl.DockObject object, Gdl.DockPlacement position, bool sticky);
 		public void attach (Gdl.DockObject object);
 		[NoAccessorMethod]
@@ -213,8 +213,8 @@ namespace Gdl {
 		[NoAccessorMethod]
 		public int width { get; set construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdl/gdl.h")]
+	[Compact]
 	public class DockRequest {
 		public weak Gdl.DockObject applicant;
 		public GLib.Value extra;
@@ -222,21 +222,21 @@ namespace Gdl {
 		public Gdk.Rectangle rect;
 		public weak Gdl.DockObject target;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdl/gdl.h")]
+	[Compact]
 	public class Pixmap {
 		public weak string fname;
 		public weak string path;
 		public weak string pixbuf;
 	}
-	[CCode (cprefix = "GDL_DOCK_BAR_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_BAR_")]
 	public enum DockBarStyle {
 		ICONS,
 		TEXT,
 		BOTH,
 		AUTO
 	}
-	[CCode (cprefix = "GDL_DOCK_ITEM_BEH_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_ITEM_BEH_")]
 	[Flags]
 	public enum DockItemBehavior {
 		NORMAL,
@@ -253,7 +253,7 @@ namespace Gdl {
 		CANT_ICONIFY,
 		NO_GRIP
 	}
-	[CCode (cprefix = "GDL_DOCK_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
 	[Flags]
 	public enum DockItemFlags {
 		IN_DRAG,
@@ -261,7 +261,7 @@ namespace Gdl {
 		ICONIFIED,
 		USER_ACTION
 	}
-	[CCode (cprefix = "GDL_DOCK_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
 	[Flags]
 	public enum DockObjectFlags {
 		AUTOMATIC,
@@ -269,13 +269,13 @@ namespace Gdl {
 		IN_REFLOW,
 		IN_DETACH
 	}
-	[CCode (cprefix = "GDL_DOCK_PARAM_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_PARAM_")]
 	[Flags]
 	public enum DockParamFlags {
 		EXPORT,
 		AFTER
 	}
-	[CCode (cprefix = "GDL_DOCK_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
 	public enum DockPlacement {
 		NONE,
 		TOP,
@@ -285,7 +285,7 @@ namespace Gdl {
 		CENTER,
 		FLOATING
 	}
-	[CCode (cprefix = "GDL_SWITCHER_STYLE_", cheader_filename = "gdl/gdl.h")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_SWITCHER_STYLE_")]
 	public enum SwitcherStyle {
 		TEXT,
 		ICON,
diff --git a/vapi/gdu-gtk.vapi b/vapi/gdu-gtk.vapi
index 08ef5a7..82e6c77 100644
--- a/vapi/gdu-gtk.vapi
+++ b/vapi/gdu-gtk.vapi
@@ -4,7 +4,7 @@
 namespace Gdu {
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class AddComponentLinuxMdDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AddComponentLinuxMdDialog (Gtk.Window parent, Gdu.AddComponentLinuxMdFlags flags, Gdu.LinuxMdDrive linux_md_drive);
 		public unowned GLib.GenericArray<Gdu.Drive> get_drives ();
 		public uint64 get_size ();
@@ -15,7 +15,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class AddPvLinuxLvm2Dialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AddPvLinuxLvm2Dialog (Gtk.Window parent, Gdu.LinuxLvm2VolumeGroup vg);
 		public unowned Gdu.Drive get_drive ();
 		public uint64 get_size ();
@@ -24,7 +24,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class AtaSmartDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AtaSmartDialog (Gtk.Window parent, Gdu.Drive drive);
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
@@ -48,7 +48,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class ButtonTable : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ButtonTable (uint num_columns, GLib.GenericArray<Gdu.ButtonElement> elements);
 		public GLib.GenericArray<Gdu.ButtonElement> get_elements ();
 		public uint get_num_columns ();
@@ -57,17 +57,17 @@ namespace Gdu {
 		public GLib.GenericArray<Gdu.ButtonElement> elements { get; set construct; }
 		public uint num_columns { get; set construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[Compact]
 	public class Color {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class ConfirmationDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ConfirmationDialog (Gtk.Window parent, Gdu.Presentable presentable, string message, string button_text);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ConfirmationDialog.for_drive (Gtk.Window parent, Gdu.Device device, string message, string button_text);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ConfirmationDialog.for_volume (Gtk.Window parent, Gdu.Device device, string message, string button_text);
 		[NoAccessorMethod]
 		public string button_text { owned get; construct; }
@@ -76,7 +76,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class ConnectToServerDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ConnectToServerDialog (Gtk.Window parent);
 		public unowned string get_address ();
 		public unowned string get_user_name ();
@@ -85,7 +85,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class CreateLinuxLvm2VolumeDialog : Gdu.FormatDialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CreateLinuxLvm2VolumeDialog (Gtk.Window parent, Gdu.Presentable presentable, uint64 max_size, Gdu.FormatDialogFlags flags);
 		public uint64 get_max_size ();
 		public uint64 get_size ();
@@ -94,7 +94,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class CreateLinuxMdDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CreateLinuxMdDialog (Gtk.Window parent, Gdu.Pool pool);
 		public uint64 get_component_size ();
 		public GLib.GenericArray<Gdu.Drive> get_drives ();
@@ -112,17 +112,17 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class CreatePartitionDialog : Gdu.FormatDialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CreatePartitionDialog (Gtk.Window parent, Gdu.Presentable presentable, uint64 max_size, Gdu.FormatDialogFlags flags);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CreatePartitionDialog.for_drive (Gtk.Window parent, Gdu.Device device, uint64 max_size, Gdu.FormatDialogFlags flags);
 		public uint64 get_max_size ();
 		public uint64 get_size ();
 		public uint64 max_size { get; construct; }
 		public uint64 size { get; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[Compact]
 	public class Curve {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
@@ -167,7 +167,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class DetailsTable : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DetailsTable (uint num_columns, GLib.GenericArray<Gdu.DetailsElement> elements);
 		public GLib.GenericArray<Gdu.DetailsElement> get_elements ();
 		public uint get_num_columns ();
@@ -189,7 +189,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class DiskSelectionWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DiskSelectionWidget (Gdu.Pool pool, Gdu.DiskSelectionWidgetFlags flags);
 		public uint64 get_component_size ();
 		public uint64 get_largest_segment_for_all ();
@@ -211,19 +211,19 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class DriveBenchmarkDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DriveBenchmarkDialog (Gtk.Window parent, Gdu.Drive drive);
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class EditLinuxLvm2Dialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditLinuxLvm2Dialog (Gtk.Window parent, Gdu.LinuxLvm2VolumeGroup vg);
 		public virtual signal void new_button_clicked ();
 		public virtual signal void remove_button_clicked (string pv_uuid);
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class EditLinuxMdDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditLinuxMdDialog (Gtk.Window parent, Gdu.LinuxMdDrive linux_md_drive);
 		public virtual signal void add_spare_button_clicked ();
 		public virtual signal void attach_button_clicked (Gdu.Device slave);
@@ -232,7 +232,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class EditNameDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditNameDialog (Gtk.Window parent, Gdu.Presentable presentable, string name, uint name_max_bytes, string message, string entry_mnemonic);
 		[NoAccessorMethod]
 		public string entry_mnemonic { owned get; construct; }
@@ -244,7 +244,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class EditPartitionDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditPartitionDialog (Gtk.Window parent, Gdu.Presentable volume);
 		public unowned string get_partition_flags ();
 		public unowned string get_partition_label ();
@@ -256,11 +256,11 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class ErrorDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ErrorDialog (Gtk.Window parent, Gdu.Presentable presentable, string message, GLib.Error error);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ErrorDialog.for_drive (Gtk.Window parent, Gdu.Device device, string message, GLib.Error error);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ErrorDialog.for_volume (Gtk.Window parent, Gdu.Device device, string message, GLib.Error error);
 		[NoAccessorMethod]
 		public Gdu.Error error { get; construct; }
@@ -269,11 +269,11 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class FormatDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FormatDialog (Gtk.Window parent, Gdu.Presentable presentable, Gdu.FormatDialogFlags flags);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FormatDialog.for_drive (Gtk.Window parent, Gdu.Device device, Gdu.FormatDialogFlags flags);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FormatDialog.for_volume (Gtk.Window parent, Gdu.Device device, Gdu.FormatDialogFlags flags);
 		public bool get_encrypt ();
 		public unowned string get_fs_label ();
@@ -291,15 +291,15 @@ namespace Gdu {
 		public string fs_type { get; }
 		public bool take_ownership { get; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[Compact]
 	public class Graph {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class PartitionDialog : Gdu.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PartitionDialog (Gtk.Window parent, Gdu.Presentable presentable);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PartitionDialog.for_drive (Gtk.Window parent, Gdu.Device device);
 		public unowned string get_scheme ();
 		public string scheme { get; }
@@ -319,7 +319,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class PoolTreeView : Gtk.TreeView, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PoolTreeView (Gdu.PoolTreeModel model, Gdu.PoolTreeViewFlags flags);
 		public unowned Gdu.Presentable get_selected_presentable ();
 		public void select_first_presentable ();
@@ -329,13 +329,13 @@ namespace Gdu {
 		[NoAccessorMethod]
 		public Gdu.PoolTreeModel pool_tree_model { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[Compact]
 	public class Sample {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class SizeWidget : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SizeWidget (uint64 size, uint64 min_size, uint64 max_size);
 		public uint64 get_max_size ();
 		public uint64 get_min_size ();
@@ -350,7 +350,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class Spinner : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Spinner ();
 		public void start ();
 		public void stop ();
@@ -360,7 +360,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class TimeLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeLabel (GLib.TimeVal time);
 		public void set_time (GLib.TimeVal time);
 		[NoAccessorMethod]
@@ -368,7 +368,7 @@ namespace Gdu {
 	}
 	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h")]
 	public class VolumeGrid : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VolumeGrid (Gdu.Drive drive);
 		public unowned Gdu.Presentable get_selected ();
 		public bool select (Gdu.Presentable volume);
@@ -376,21 +376,21 @@ namespace Gdu {
 		public Gdu.Drive drive { owned get; construct; }
 		public virtual signal void changed ();
 	}
-	[CCode (cprefix = "GDU_ADD_COMPONENT_LINUX_MD_FLAGS_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_ADD_COMPONENT_LINUX_MD_FLAGS_")]
 	[Flags]
 	public enum AddComponentLinuxMdFlags {
 		NONE,
 		SPARE,
 		EXPANSION
 	}
-	[CCode (cprefix = "GDU_DISK_SELECTION_WIDGET_FLAGS_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_DISK_SELECTION_WIDGET_FLAGS_")]
 	[Flags]
 	public enum DiskSelectionWidgetFlags {
 		NONE,
 		ALLOW_MULTIPLE,
 		ALLOW_DISKS_WITH_INSUFFICIENT_SPACE
 	}
-	[CCode (cprefix = "GDU_FORMAT_DIALOG_FLAGS_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_FORMAT_DIALOG_FLAGS_")]
 	[Flags]
 	public enum FormatDialogFlags {
 		NONE,
@@ -398,7 +398,7 @@ namespace Gdu {
 		DISK_UTILITY_BUTTON,
 		ALLOW_MSDOS_EXTENDED
 	}
-	[CCode (cprefix = "GDU_POOL_TREE_MODEL_COLUMN_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_POOL_TREE_MODEL_COLUMN_")]
 	public enum PoolTreeModelColumn {
 		ICON,
 		NAME,
@@ -409,14 +409,14 @@ namespace Gdu {
 		TOGGLED,
 		CAN_BE_TOGGLED
 	}
-	[CCode (cprefix = "GDU_POOL_TREE_MODEL_FLAGS_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_POOL_TREE_MODEL_FLAGS_")]
 	[Flags]
 	public enum PoolTreeModelFlags {
 		NONE,
 		NO_VOLUMES,
 		NO_UNALLOCATABLE_DRIVES
 	}
-	[CCode (cprefix = "GDU_POOL_TREE_VIEW_FLAGS_", cheader_filename = "gdu-gtk/gdu-gtk.h")]
+	[CCode (cheader_filename = "gdu-gtk/gdu-gtk.h", cprefix = "GDU_POOL_TREE_VIEW_FLAGS_")]
 	[Flags]
 	public enum PoolTreeViewFlags {
 		NONE,
diff --git a/vapi/gdu.vapi b/vapi/gdu.vapi
index f0b49e8..20e0850 100644
--- a/vapi/gdu.vapi
+++ b/vapi/gdu.vapi
@@ -405,13 +405,13 @@ namespace Gdu {
 		public signal void job_changed ();
 		public signal void removed ();
 	}
-	[CCode (cprefix = "GDU_CREATE_VOLUME_FLAGS_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_CREATE_VOLUME_FLAGS_", has_type_id = false)]
 	public enum CreateVolumeFlags {
 		NONE,
 		LINUX_MD,
 		LINUX_LVM2
 	}
-	[CCode (cprefix = "GDU_ERROR_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_ERROR_", has_type_id = false)]
 	public enum Error {
 		FAILED,
 		BUSY,
@@ -424,20 +424,20 @@ namespace Gdu {
 		FILESYSTEM_DRIVER_MISSING,
 		FILESYSTEM_TOOLS_MISSING
 	}
-	[CCode (cprefix = "GDU_HUB_USAGE_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_HUB_USAGE_", has_type_id = false)]
 	public enum HubUsage {
 		ADAPTER,
 		EXPANDER,
 		MULTI_DISK_DEVICES,
 		MULTI_PATH_DEVICES
 	}
-	[CCode (cprefix = "GDU_LINUX_LVM2_VOLUME_GROUP_STATE_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_LINUX_LVM2_VOLUME_GROUP_STATE_", has_type_id = false)]
 	public enum LinuxLvm2VolumeGroupState {
 		NOT_RUNNING,
 		PARTIALLY_RUNNING,
 		RUNNING
 	}
-	[CCode (cprefix = "GDU_LINUX_MD_DRIVE_SLAVE_FLAGS_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_LINUX_MD_DRIVE_SLAVE_FLAGS_", has_type_id = false)]
 	public enum LinuxMdDriveSlaveFlags {
 		NONE,
 		NOT_ATTACHED,
@@ -447,7 +447,7 @@ namespace Gdu {
 		BLOCKED,
 		SPARE
 	}
-	[CCode (cprefix = "GDU_VOLUME_FLAGS_", has_type_id = false, cheader_filename = "gdu/gdu.h")]
+	[CCode (cheader_filename = "gdu/gdu.h", cprefix = "GDU_VOLUME_FLAGS_", has_type_id = false)]
 	public enum VolumeFlags {
 		NONE,
 		PARTITION,
diff --git a/vapi/gedit-2.20.vapi b/vapi/gedit-2.20.vapi
index ee5a318..0c4ecd1 100644
--- a/vapi/gedit-2.20.vapi
+++ b/vapi/gedit-2.20.vapi
@@ -67,7 +67,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit-2.20.h")]
 	public class EncodingsComboBox : GLib.Object {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EncodingsComboBox (bool save_mode);
 		public unowned Gedit.Encoding get_selected_encoding ();
 		public void set_selected_encoding (Gedit.Encoding encoding);
@@ -111,7 +111,7 @@ namespace Gedit {
 		public void unregister (Gedit.MessageType message_type);
 		public void unregister_all (string object_path);
 	}
-	[CCode (ref_function = "gedit_message_type_ref", unref_function = "gedit_message_type_unref", cheader_filename = "gedit-2.20.h")]
+	[CCode (cheader_filename = "gedit-2.20.h", ref_function = "gedit_message_type_ref", unref_function = "gedit_message_type_unref")]
 	public class MessageType : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public MessageType (string object_path, string method, uint num_optional);
@@ -131,7 +131,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit/gedit-notebook.h")]
 	public class Notebook : Gtk.Notebook {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Notebook ();
 		public void add_tab (Gedit.Tab tab, int position, bool jump_to);
 		public bool get_close_buttons_sensitive ();
@@ -146,7 +146,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit/gedit-panel.h")]
 	public class Panel : Gtk.VBox {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Panel (Gtk.Orientation orientation);
 		public bool activate_item (Gtk.Widget item);
 		public void add_item (Gtk.Widget item, string name, Gtk.Widget? image);
@@ -168,7 +168,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit/gedit-progress-message-area.h")]
 	public class ProgressMessageArea : Gtk.InfoBar {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ProgressMessageArea (string stock_id, string markup, bool has_cancel);
 		public void pulse ();
 		public void set_fraction (double fraction);
@@ -178,7 +178,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit-2.20.h")]
 	public class StatusComboBox : GLib.Object {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public StatusComboBox (string label);
 		public void add_item (Gtk.MenuItem item, string text);
 		public unowned Gtk.Label get_item_label ();
@@ -192,7 +192,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit/gedit-statusbar.h")]
 	public class Statusbar : Gtk.Statusbar {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Statusbar ();
 		public void clear_overwrite ();
 		public void flash_message (uint context_id, string format, ...);
@@ -215,7 +215,7 @@ namespace Gedit {
 	}
 	[CCode (cheader_filename = "gedit/gedit-view.h")]
 	public class View : Gtk.SourceView {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public View (Gedit.Document doc);
 		public void copy_clipboard ();
 		public void cut_clipboard ();
@@ -249,7 +249,7 @@ namespace Gedit {
 		public unowned GLib.List<Gedit.View> get_views ();
 		public void set_active_tab (Gedit.Tab tab);
 	}
-	[CCode (cprefix = "GEDIT_", has_type_id = false, cheader_filename = "gedit/gedit-debug.h")]
+	[CCode (cheader_filename = "gedit/gedit-debug.h", cprefix = "GEDIT_", has_type_id = false)]
 	public enum DebugSection {
 		NO_DEBUG,
 		DEBUG_VIEW,
@@ -268,19 +268,19 @@ namespace Gedit {
 		DEBUG_LOADER,
 		DEBUG_SAVER
 	}
-	[CCode (cprefix = "GEDIT_DOCUMENT_NEWLINE_TYPE_", has_type_id = false, cheader_filename = "gedit-2.20.h")]
+	[CCode (cheader_filename = "gedit-2.20.h", cprefix = "GEDIT_DOCUMENT_NEWLINE_TYPE_", has_type_id = false)]
 	public enum DocumentNewlineType {
 		LF,
 		CR,
 		CR_LF
 	}
-	[CCode (cprefix = "GEDIT_DOCUMENT_SAVE_", has_type_id = false, cheader_filename = "gedit/gedit-document.h")]
+	[CCode (cheader_filename = "gedit/gedit-document.h", cprefix = "GEDIT_DOCUMENT_SAVE_", has_type_id = false)]
 	public enum DocumentSaveFlags {
 		IGNORE_MTIME,
 		IGNORE_BACKUP,
 		PRESERVE_BACKUP
 	}
-	[CCode (cprefix = "GEDIT_LOCKDOWN_", has_type_id = false, cheader_filename = "gedit/gedit-app.h")]
+	[CCode (cheader_filename = "gedit/gedit-app.h", cprefix = "GEDIT_LOCKDOWN_", has_type_id = false)]
 	public enum LockdownMask {
 		COMMAND_LINE,
 		PRINTING,
@@ -288,13 +288,13 @@ namespace Gedit {
 		SAVE_TO_DISK,
 		ALL
 	}
-	[CCode (cprefix = "GEDIT_SEARCH_", has_type_id = false, cheader_filename = "gedit/gedit-document.h")]
+	[CCode (cheader_filename = "gedit/gedit-document.h", cprefix = "GEDIT_SEARCH_", has_type_id = false)]
 	public enum SearchFlags {
 		DONT_SET_FLAGS,
 		ENTIRE_WORD,
 		CASE_SENSITIVE
 	}
-	[CCode (cprefix = "GEDIT_TAB_", has_type_id = false, cheader_filename = "gedit/gedit-tab.h")]
+	[CCode (cheader_filename = "gedit/gedit-tab.h", cprefix = "GEDIT_TAB_", has_type_id = false)]
 	public enum TabState {
 		STATE_NORMAL,
 		STATE_LOADING,
@@ -312,14 +312,14 @@ namespace Gedit {
 		STATE_EXTERNALLY_MODIFIED_NOTIFICATION,
 		NUM_OF_STATES
 	}
-	[CCode (cprefix = "GEDIT_TOOLBAR_", has_type_id = false, cheader_filename = "gedit/gedit-prefs-manager.h")]
+	[CCode (cheader_filename = "gedit/gedit-prefs-manager.h", cprefix = "GEDIT_TOOLBAR_", has_type_id = false)]
 	public enum ToolbarSetting {
 		SYSTEM,
 		ICONS,
 		ICONS_AND_TEXT,
 		ICONS_BOTH_HORIZ
 	}
-	[CCode (cprefix = "GEDIT_WINDOW_STATE_", has_type_id = false, cheader_filename = "gedit/gedit-window.h")]
+	[CCode (cheader_filename = "gedit/gedit-window.h", cprefix = "GEDIT_WINDOW_STATE_", has_type_id = false)]
 	public enum WindowState {
 		NORMAL,
 		SAVING,
@@ -424,7 +424,7 @@ namespace Gedit {
 	public static void debug_message (Gedit.DebugSection section, string file, int line, string function, string format, ...);
 	[CCode (cheader_filename = "gedit/gedit-utils.h")]
 	public static unowned Gtk.Widget dialog_add_button (Gtk.Dialog dialog, string text, string stock_id, int response_id);
-	[CCode (cname = "g_utf8_caselessnmatch", cheader_filename = "gedit/gedit-utils.h")]
+	[CCode (cheader_filename = "gedit/gedit-utils.h", cname = "g_utf8_caselessnmatch")]
 	public static bool g_utf8_caselessnmatch (string s1, string s2, ssize_t n1, ssize_t n2);
 	[CCode (cheader_filename = "gedit/gedit-utils.h")]
 	public static unowned string gdk_color_to_string (Gdk.Color color);
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 2bba09a..ee882a2 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1,6 +1,6 @@
 /* gio-2.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "G", lower_case_cprefix = "g_", gir_namespace = "Gio", gir_version = "2.0")]
+[CCode (cprefix = "G", gir_namespace = "Gio", gir_version = "2.0", lower_case_cprefix = "g_")]
 namespace GLib {
 	[CCode (cprefix = "GBus", lower_case_cprefix = "g_bus_")]
 	namespace Bus {
@@ -12,17 +12,17 @@ namespace GLib {
 		public static T get_proxy_sync<T> (GLib.BusType bus_type, string name, string object_path, GLib.DBusProxyFlags flags = 0, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static GLib.DBusConnection get_sync (GLib.BusType bus_type, GLib.Cancellable? cancellable = null) throws GLib.IOError;
-		[CCode (cname = "g_bus_own_name_with_closures", cheader_filename = "gio/gio.h")]
+		[CCode (cheader_filename = "gio/gio.h", cname = "g_bus_own_name_with_closures")]
 		public static uint own_name (GLib.BusType bus_type, string name, GLib.BusNameOwnerFlags flags, [CCode (type = "GClosure*")] owned GLib.BusAcquiredCallback? bus_acquired_handler = null, [CCode (type = "GClosure*")] owned GLib.BusNameAcquiredCallback? name_acquired_handler = null, [CCode (type = "GClosure*")] owned GLib.BusNameLostCallback? name_lost_handler = null);
-		[CCode (cname = "g_bus_own_name_on_connection_with_closures", cheader_filename = "gio/gio.h")]
+		[CCode (cheader_filename = "gio/gio.h", cname = "g_bus_own_name_on_connection_with_closures")]
 		public static uint own_name_on_connection (GLib.DBusConnection connection, string name, GLib.BusNameOwnerFlags flags, [CCode (type = "GClosure*")] owned GLib.BusNameAcquiredCallback? name_acquired_handler = null, [CCode (type = "GClosure*")] owned GLib.BusNameLostCallback? name_lost_handler = null);
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static void unown_name (uint owner_id);
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static void unwatch_name (uint watcher_id);
-		[CCode (cname = "g_bus_watch_name_with_closures", cheader_filename = "gio/gio.h")]
+		[CCode (cheader_filename = "gio/gio.h", cname = "g_bus_watch_name_with_closures")]
 		public static uint watch_name (GLib.BusType bus_type, string name, GLib.BusNameWatcherFlags flags, [CCode (type = "GClosure*")] owned GLib.BusNameAppearedCallback? name_appeared_handler, [CCode (type = "GClosure*")] owned GLib.BusNameVanishedCallback? name_vanished_handler);
-		[CCode (cname = "g_bus_watch_name_on_connection_with_closures", cheader_filename = "gio/gio.h")]
+		[CCode (cheader_filename = "gio/gio.h", cname = "g_bus_watch_name_on_connection_with_closures")]
 		public static uint watch_name_on_connection (GLib.DBusConnection connection, string name, GLib.BusNameWatcherFlags flags, [CCode (type = "GClosure*")] owned GLib.BusNameAppearedCallback? name_appeared_handler, [CCode (type = "GClosure*")] owned GLib.BusNameVanishedCallback? name_vanished_handler);
 	}
 	[CCode (cprefix = "GContentType", lower_case_cprefix = "g_content_type_")]
@@ -41,15 +41,15 @@ namespace GLib {
 		public static string get_mime_type (string type);
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static string guess (string? filename, uchar[]? data, out bool result_uncertain);
-		[CCode (cheader_filename = "gio/gio.h", array_length = false, array_null_terminated = true)]
+		[CCode (array_length = false, array_null_terminated = true, cheader_filename = "gio/gio.h")]
 		public static string[] guess_for_tree (GLib.File root);
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static bool is_a (string type, string supertype);
 		[CCode (cheader_filename = "gio/gio.h")]
 		public static bool is_unknown (string type);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class ActionEntry {
 		public weak GLib.Callback activate;
 		public weak GLib.Callback change_state;
@@ -136,30 +136,30 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class BufferedInputStream : GLib.FilterInputStream {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public BufferedInputStream (GLib.InputStream base_stream);
 		public virtual ssize_t fill (ssize_t count, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public virtual async ssize_t fill_async (ssize_t count, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public size_t get_available ();
 		public size_t get_buffer_size ();
-		public size_t peek ([CCode (array_length_type = "gsize", array_length_pos = 2.9)] uint8[] buffer, size_t offset = 0);
+		public size_t peek ([CCode (array_length_pos = 2.9, array_length_type = "gsize")] uint8[] buffer, size_t offset = 0);
 		[CCode (array_length_type = "gsize")]
 		public unowned uint8[] peek_buffer ();
 		public int read_byte (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public void set_buffer_size (size_t size);
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public BufferedInputStream.sized (GLib.InputStream base_stream, size_t size);
 		public uint buffer_size { get; set construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class BufferedOutputStream : GLib.FilterOutputStream {
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public BufferedOutputStream (GLib.OutputStream base_stream);
 		public bool get_auto_grow ();
 		public size_t get_buffer_size ();
 		public void set_auto_grow (bool auto_grow);
 		public void set_buffer_size (size_t size);
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public BufferedOutputStream.sized (GLib.OutputStream base_stream, size_t size);
 		public bool auto_grow { get; set; }
 		public uint buffer_size { get; set construct; }
@@ -198,14 +198,14 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ConverterInputStream : GLib.FilterInputStream {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public ConverterInputStream (GLib.InputStream base_stream, GLib.Converter converter);
 		public unowned GLib.Converter get_converter ();
 		public GLib.Converter converter { get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ConverterOutputStream : GLib.FilterOutputStream {
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public ConverterOutputStream (GLib.OutputStream base_stream, GLib.Converter converter);
 		public unowned GLib.Converter get_converter ();
 		public GLib.Converter converter { get; construct; }
@@ -221,12 +221,12 @@ namespace GLib {
 		public bool set_unix_user (uint uid) throws GLib.Error;
 		public unowned string to_string ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class CredentialsClass {
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_annotation_info_ref", type_id = "G_TYPE_DBUS_ANNOTATION_INFO", unref_function = "g_dbus_annotation_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_annotation_info_ref", unref_function = "g_dbus_annotation_info_unref", type_id = "G_TYPE_DBUS_ANNOTATION_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusAnnotationInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -235,8 +235,8 @@ namespace GLib {
 		public weak string value;
 		public unowned string lookup (string name);
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_arg_info_ref", type_id = "G_TYPE_DBUS_ARG_INFO", unref_function = "g_dbus_arg_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_arg_info_ref", unref_function = "g_dbus_arg_info_unref", type_id = "G_TYPE_DBUS_ARG_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusArgInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -253,7 +253,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class DBusConnection : GLib.Object, GLib.Initable, GLib.AsyncInitable {
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async DBusConnection (GLib.IOStream stream, string guid, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public uint add_filter (owned GLib.DBusMessageFilterFunction filter_function);
 		public async GLib.Variant call (string bus_name, string object_path, string interface_name, string method_name, GLib.Variant? parameters, GLib.VariantType? reply_type, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -263,7 +263,7 @@ namespace GLib {
 		public bool emit_signal (string? destination_bus_name, string object_path, string interface_name, string signal_name, GLib.Variant parameters) throws GLib.Error;
 		public async bool flush (GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public bool flush_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async DBusConnection.for_address (string address, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public DBusConnection.for_address_sync (string address, GLib.DBusConnectionFlags flags, GLib.DBusAuthObserver? observer = null, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -300,14 +300,14 @@ namespace GLib {
 		public string unique_name { get; }
 		public virtual signal void closed (bool p0, GLib.Error p1);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class DBusErrorEntry {
 		public weak string dbus_error_name;
 		public int error_code;
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_interface_info_ref", type_id = "G_TYPE_DBUS_INTERFACE_INFO", unref_function = "g_dbus_interface_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_interface_info_ref", unref_function = "g_dbus_interface_info_unref", type_id = "G_TYPE_DBUS_INTERFACE_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusInterfaceInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -344,8 +344,8 @@ namespace GLib {
 		public GLib.DBusInterfaceSkeletonFlags g_flags { get; set; }
 		public virtual signal bool g_authorize_method (GLib.DBusMethodInvocation invocation);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class DBusInterfaceVTable {
 		public weak GLib.DBusInterfaceGetPropertyFunc get_property;
 		public weak GLib.DBusInterfaceMethodCallFunc method_call;
@@ -413,8 +413,8 @@ namespace GLib {
 		public bool to_gerror () throws GLib.Error;
 		public bool locked { get; }
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_method_info_ref", type_id = "G_TYPE_DBUS_METHOD_INFO", unref_function = "g_dbus_method_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_method_info_ref", unref_function = "g_dbus_method_info_unref", type_id = "G_TYPE_DBUS_METHOD_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusMethodInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -446,8 +446,8 @@ namespace GLib {
 		public void return_value (GLib.Variant parameters);
 		public void take_error (GLib.Error error);
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_node_info_ref", type_id = "G_TYPE_DBUS_NODE_INFO", unref_function = "g_dbus_node_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_node_info_ref", unref_function = "g_dbus_node_info_unref", type_id = "G_TYPE_DBUS_NODE_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusNodeInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -464,21 +464,21 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class DBusObjectManagerClient : GLib.Object, GLib.Initable, GLib.AsyncInitable, GLib.DBusObjectManager {
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public DBusObjectManagerClient (GLib.DBusConnection connection, GLib.DBusObjectManagerClientFlags flags, string name, string object_path, GLib.DBusProxyTypeFunc get_proxy_type_func, void* get_proxy_type_user_data, GLib.DestroyNotify get_proxy_type_destroy_notify, GLib.Cancellable? cancellable = null, GLib.AsyncReadyCallback callback);
-		[CCode (type = "GDBusObjectManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GDBusObjectManager*")]
 		public DBusObjectManagerClient.finish (GLib.AsyncResult res) throws GLib.Error;
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public DBusObjectManagerClient.for_bus (GLib.BusType bus_type, GLib.DBusObjectManagerClientFlags flags, string name, string object_path, GLib.DBusProxyTypeFunc get_proxy_type_func, void* get_proxy_type_user_data, GLib.DestroyNotify get_proxy_type_destroy_notify, GLib.Cancellable? cancellable = null, GLib.AsyncReadyCallback callback);
-		[CCode (type = "GDBusObjectManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GDBusObjectManager*")]
 		public DBusObjectManagerClient.for_bus_finish (GLib.AsyncResult res) throws GLib.Error;
-		[CCode (type = "GDBusObjectManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GDBusObjectManager*")]
 		public DBusObjectManagerClient.for_bus_sync (GLib.BusType bus_type, GLib.DBusObjectManagerClientFlags flags, string name, string object_path, GLib.DBusProxyTypeFunc get_proxy_type_func, void* get_proxy_type_user_data, GLib.DestroyNotify get_proxy_type_destroy_notify, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public unowned GLib.DBusConnection get_connection ();
 		public GLib.DBusObjectManagerClientFlags get_flags ();
 		public unowned string get_name ();
 		public unowned string get_name_owner ();
-		[CCode (type = "GDBusObjectManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GDBusObjectManager*")]
 		public DBusObjectManagerClient.sync (GLib.DBusConnection connection, GLib.DBusObjectManagerClientFlags flags, string name, string object_path, GLib.DBusProxyTypeFunc get_proxy_type_func, void* get_proxy_type_user_data, GLib.DestroyNotify get_proxy_type_destroy_notify, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public GLib.BusType bus_type { construct; }
 		public GLib.DBusConnection connection { get; construct; }
@@ -531,8 +531,8 @@ namespace GLib {
 		public string object_path { owned get; set construct; }
 		public virtual signal bool authorize_method (GLib.DBusInterfaceSkeleton interface_, GLib.DBusMethodInvocation invocation);
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_property_info_ref", type_id = "G_TYPE_DBUS_PROPERTY_INFO", unref_function = "g_dbus_property_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_property_info_ref", unref_function = "g_dbus_property_info_unref", type_id = "G_TYPE_DBUS_PROPERTY_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusPropertyInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -543,11 +543,11 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class DBusProxy : GLib.Object, GLib.DBusInterface, GLib.Initable, GLib.AsyncInitable {
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async DBusProxy (GLib.DBusConnection connection, GLib.DBusProxyFlags flags, GLib.DBusInterfaceInfo? info, string name, string object_path, string interface_name, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public async GLib.Variant call (string method_name, GLib.Variant? parameters, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public GLib.Variant call_sync (string method_name, GLib.Variant? parameters, GLib.DBusCallFlags flags, int timeout_msec, GLib.Cancellable? cancellable = null) throws GLib.Error;
-		[CCode (type = "void", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "void")]
 		public async DBusProxy.for_bus (GLib.BusType bus_type, GLib.DBusProxyFlags flags, GLib.DBusInterfaceInfo? info, string name, string object_path, string interface_name, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public DBusProxy.for_bus_sync (GLib.BusType bus_type, GLib.DBusProxyFlags flags, GLib.DBusInterfaceInfo? info, string name, string object_path, string interface_name, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -609,8 +609,8 @@ namespace GLib {
 		public string guid { get; construct; }
 		public virtual signal bool new_connection (GLib.DBusConnection p0);
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_dbus_signal_info_ref", type_id = "G_TYPE_DBUS_SIGNAL_INFO", unref_function = "g_dbus_signal_info_unref")]
 	[Compact]
-	[CCode (ref_function = "g_dbus_signal_info_ref", unref_function = "g_dbus_signal_info_unref", type_id = "G_TYPE_DBUS_SIGNAL_INFO", cheader_filename = "gio/gio.h")]
 	public class DBusSignalInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak GLib.DBusAnnotationInfo[] annotations;
@@ -619,8 +619,8 @@ namespace GLib {
 		public weak string name;
 		public int ref_count;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class DBusSubtreeVTable {
 		public weak GLib.DBusSubtreeDispatchFunc dispatch;
 		public weak GLib.DBusSubtreeEnumerateFunc enumerate;
@@ -680,13 +680,13 @@ namespace GLib {
 		public GLib.Object icon { get; construct; }
 		public GLib.EmblemOrigin origin { get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class EmblemClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class EmblemedIcon : GLib.Object, GLib.Icon {
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public EmblemedIcon (GLib.Icon icon, GLib.Emblem emblem);
 		public void add_emblem (GLib.Emblem emblem);
 		public void clear_emblems ();
@@ -695,15 +695,15 @@ namespace GLib {
 		[NoAccessorMethod]
 		public GLib.Icon gicon { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class FileAttributeInfo {
 		public GLib.FileAttributeInfoFlags flags;
 		public weak string name;
 		public GLib.FileAttributeType type;
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_info_list_ref", type_id = "G_TYPE_FILE_ATTRIBUTE_INFO_LIST", unref_function = "g_file_attribute_info_list_unref")]
 	[Compact]
-	[CCode (ref_function = "g_file_attribute_info_list_ref", unref_function = "g_file_attribute_info_list_unref", type_id = "G_TYPE_FILE_ATTRIBUTE_INFO_LIST", cheader_filename = "gio/gio.h")]
 	public class FileAttributeInfoList {
 		public weak GLib.FileAttributeInfo infos;
 		public int n_infos;
@@ -713,8 +713,8 @@ namespace GLib {
 		public unowned GLib.FileAttributeInfoList dup ();
 		public unowned GLib.FileAttributeInfo lookup (string name);
 	}
+	[CCode (cheader_filename = "gio/gio.h", ref_function = "g_file_attribute_matcher_ref", type_id = "G_TYPE_FILE_ATTRIBUTE_MATCHER", unref_function = "g_file_attribute_matcher_unref")]
 	[Compact]
-	[CCode (ref_function = "g_file_attribute_matcher_ref", unref_function = "g_file_attribute_matcher_unref", type_id = "G_TYPE_FILE_ATTRIBUTE_MATCHER", cheader_filename = "gio/gio.h")]
 	public class FileAttributeMatcher {
 		[CCode (has_construct_function = false)]
 		public FileAttributeMatcher (string attributes);
@@ -759,13 +759,13 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class FileIcon : GLib.Object, GLib.Icon, GLib.LoadableIcon {
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public FileIcon (GLib.File file);
 		public unowned GLib.File get_file ();
 		public GLib.File file { get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class FileIconClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -832,8 +832,8 @@ namespace GLib {
 		public void set_symlink_target (string symlink_target);
 		public void unset_attribute_mask ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class FileInfoClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -910,16 +910,16 @@ namespace GLib {
 		public GLib.OutputStream base_stream { get; construct; }
 		public bool close_base_stream { get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class IOExtension {
 		public unowned string get_name ();
 		public int get_priority ();
 		public GLib.Type get_type ();
 		public unowned GLib.TypeClass ref_class ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class IOExtensionPoint {
 		public unowned GLib.IOExtension get_extension_by_name (string name);
 		public unowned GLib.List<GLib.IOExtension> get_extensions ();
@@ -937,12 +937,12 @@ namespace GLib {
 		public static unowned string query ();
 		public void unload ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class IOModuleClass {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class IOSchedulerJob {
 		public bool send_to_mainloop (owned GLib.SourceFunc func);
 		public void send_to_mainloop_async (owned GLib.SourceFunc func);
@@ -967,8 +967,8 @@ namespace GLib {
 		public GLib.InputStream input_stream { get; }
 		public GLib.OutputStream output_stream { get; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class IOStreamAdapter {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -1015,7 +1015,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class InetSocketAddress : GLib.SocketAddress, GLib.SocketConnectable {
-		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketAddress*")]
 		public InetSocketAddress (GLib.InetAddress address, uint16 port);
 		public unowned GLib.InetAddress get_address ();
 		public uint16 get_port ();
@@ -1041,23 +1041,23 @@ namespace GLib {
 		public virtual ssize_t skip (size_t count, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		public virtual async ssize_t skip_async (size_t count, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class InputVector {
 		[CCode (array_length_cname = "size", array_length_type = "gsize")]
 		public uint8[] buffer;
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public MemoryInputStream ();
 		public void add_data ([CCode (array_length_type = "gsize")] owned uint8[] data, GLib.DestroyNotify? destroy);
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public MemoryInputStream.from_data ([CCode (array_length_type = "gsize")] owned uint8[] data, GLib.DestroyNotify? destroy);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public MemoryOutputStream ([CCode (array_length_type = "gsize")] owned uint8[]? data, GLib.ReallocFunc? realloc_function, GLib.DestroyNotify? destroy_function);
 		[CCode (array_length = false)]
 		public unowned uint8[] get_data ();
@@ -1111,7 +1111,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class NetworkAddress : GLib.Object, GLib.SocketConnectable {
-		[CCode (type = "GSocketConnectable*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketConnectable*")]
 		public NetworkAddress (string hostname, uint16 port);
 		public unowned string get_hostname ();
 		public uint16 get_port ();
@@ -1124,7 +1124,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class NetworkService : GLib.Object, GLib.SocketConnectable {
-		[CCode (type = "GSocketConnectable*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketConnectable*")]
 		public NetworkService (string service, string protocol, string domain);
 		public unowned string get_domain ();
 		public unowned string get_protocol ();
@@ -1158,8 +1158,8 @@ namespace GLib {
 		public bool write_all ([CCode (array_length_type = "gsize")] uint8[] buffer, out size_t bytes_written, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 		public virtual async ssize_t write_async ([CCode (array_length_type = "gsize")] uint8[] buffer, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.IOError;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class OutputVector {
 		[CCode (array_length_cname = "size", array_length_type = "gsize")]
 		public uint8[] buffer;
@@ -1182,7 +1182,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ProxyAddress : GLib.InetSocketAddress, GLib.SocketConnectable {
-		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketAddress*")]
 		public ProxyAddress (GLib.InetAddress inetaddr, uint16 port, string protocol, string dest_hostname, uint16 dest_port, string username, string password);
 		public unowned string get_destination_hostname ();
 		public uint16 get_destination_port ();
@@ -1347,13 +1347,13 @@ namespace GLib {
 		public void set_op_res_gssize (ssize_t op_res);
 		public void take_error (GLib.Error error);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class SimpleAsyncResultClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class SimplePermission : GLib.Permission {
-		[CCode (type = "GPermission*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GPermission*")]
 		public SimplePermission (bool allowed);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -1483,7 +1483,7 @@ namespace GLib {
 	public class SocketControlMessage : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SocketControlMessage ();
-		public virtual GLib.SocketControlMessage deserialize (int level, int type, [CCode (array_length_type = "gsize", array_length_pos = 2.9)] uint8[] data);
+		public virtual GLib.SocketControlMessage deserialize (int level, int type, [CCode (array_length_pos = 2.9, array_length_type = "gsize")] uint8[] data);
 		public virtual int get_level ();
 		public int get_msg_type ();
 		public virtual size_t get_size ();
@@ -1519,14 +1519,14 @@ namespace GLib {
 		public void stop ();
 		public virtual signal bool incoming (GLib.SocketConnection connection, GLib.Object? source_object);
 	}
+	[CCode (cheader_filename = "gio/gio.h", cname = "GSource")]
 	[Compact]
-	[CCode (cname = "GSource", cheader_filename = "gio/gio.h")]
 	public class SocketSource : GLib.Source {
 		[CCode (cname = "g_source_set_callback")]
 		public void set_callback ([CCode (type = "GSourceFunc")] owned GLib.SocketSourceFunc func);
 	}
+	[CCode (cheader_filename = "gio/gio.h", copy_function = "g_srv_target_copy", type_id = "G_TYPE_SRV_TARGET")]
 	[Compact]
-	[CCode (copy_function = "g_srv_target_copy", type_id = "G_TYPE_SRV_TARGET", cheader_filename = "gio/gio.h")]
 	public class SrvTarget {
 		[CCode (has_construct_function = false)]
 		public SrvTarget (string hostname, uint16 port, uint16 priority, uint16 weight);
@@ -1547,22 +1547,22 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class TcpWrapperConnection : GLib.TcpConnection {
-		[CCode (type = "GSocketConnection*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketConnection*")]
 		public TcpWrapperConnection (GLib.IOStream base_io_stream, GLib.Socket socket);
 		public unowned GLib.IOStream get_base_io_stream ();
 		public GLib.IOStream base_io_stream { get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ThemedIcon : GLib.Object, GLib.Icon {
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public ThemedIcon (string iconname);
 		public void append_name (string iconname);
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public ThemedIcon.from_names (string[] iconnames);
 		[CCode (array_length = false, array_null_terminated = true)]
 		public unowned string[] get_names ();
 		public void prepend_name (string iconname);
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public ThemedIcon.with_default_fallbacks (string iconname);
 		public string name { construct; }
 		[CCode (array_length = false, array_null_terminated = true)]
@@ -1570,13 +1570,13 @@ namespace GLib {
 		[NoAccessorMethod]
 		public bool use_default_fallbacks { get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class ThemedIconClass {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class ThreadedSocketService : GLib.SocketService {
-		[CCode (type = "GSocketService*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketService*")]
 		public ThreadedSocketService (int max_threads);
 		[NoAccessorMethod]
 		public int max_threads { get; construct; }
@@ -1637,12 +1637,12 @@ namespace GLib {
 		public bool use_system_certdb { get; set construct; }
 		public virtual signal bool accept_certificate (GLib.TlsCertificate peer_cert, GLib.TlsCertificateFlags errors);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class UnixCredentialsMessage {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gio.h")]
+	[Compact]
 	public class UnixFDList {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -2091,7 +2091,7 @@ namespace GLib {
 		public signal void changed ();
 		public signal void removed ();
 	}
-	[CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APP_INFO_CREATE_")]
 	[Flags]
 	public enum AppInfoCreateFlags {
 		NONE,
@@ -2099,7 +2099,7 @@ namespace GLib {
 		SUPPORTS_URIS,
 		SUPPORTS_STARTUP_NOTIFICATION
 	}
-	[CCode (cprefix = "G_APPLICATION_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APPLICATION_")]
 	[Flags]
 	public enum ApplicationFlags {
 		FLAGS_NONE,
@@ -2110,7 +2110,7 @@ namespace GLib {
 		SEND_ENVIRONMENT,
 		NON_UNIQUE
 	}
-	[CCode (cprefix = "G_ASK_PASSWORD_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ASK_PASSWORD_")]
 	[Flags]
 	public enum AskPasswordFlags {
 		NEED_PASSWORD,
@@ -2119,60 +2119,60 @@ namespace GLib {
 		SAVING_SUPPORTED,
 		ANONYMOUS_SUPPORTED
 	}
-	[CCode (cprefix = "G_BUS_NAME_OWNER_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_OWNER_FLAGS_")]
 	[Flags]
 	public enum BusNameOwnerFlags {
 		NONE,
 		ALLOW_REPLACEMENT,
 		REPLACE
 	}
-	[CCode (cprefix = "G_BUS_NAME_WATCHER_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_WATCHER_FLAGS_")]
 	[Flags]
 	public enum BusNameWatcherFlags {
 		NONE,
 		AUTO_START
 	}
-	[CCode (cprefix = "G_BUS_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_TYPE_")]
 	public enum BusType {
 		STARTER,
 		NONE,
 		SYSTEM,
 		SESSION
 	}
-	[CCode (cprefix = "G_CONVERTER_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_")]
 	[Flags]
 	public enum ConverterFlags {
 		NO_FLAGS,
 		INPUT_AT_END,
 		FLUSH
 	}
-	[CCode (cprefix = "G_CONVERTER_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_")]
 	public enum ConverterResult {
 		ERROR,
 		CONVERTED,
 		FINISHED,
 		FLUSHED
 	}
-	[CCode (cprefix = "G_CREDENTIALS_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CREDENTIALS_TYPE_")]
 	public enum CredentialsType {
 		INVALID,
 		LINUX_UCRED,
 		FREEBSD_CMSGCRED,
 		OPENBSD_SOCKPEERCRED
 	}
-	[CCode (cprefix = "G_DBUS_CALL_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CALL_FLAGS_")]
 	[Flags]
 	public enum DBusCallFlags {
 		NONE,
 		NO_AUTO_START
 	}
-	[CCode (cprefix = "G_DBUS_CAPABILITY_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CAPABILITY_FLAGS_")]
 	[Flags]
 	public enum DBusCapabilityFlags {
 		NONE,
 		UNIX_FD_PASSING
 	}
-	[CCode (cprefix = "G_DBUS_CONNECTION_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CONNECTION_FLAGS_")]
 	[Flags]
 	public enum DBusConnectionFlags {
 		NONE,
@@ -2182,25 +2182,25 @@ namespace GLib {
 		MESSAGE_BUS_CONNECTION,
 		DELAY_MESSAGE_PROCESSING
 	}
-	[CCode (cprefix = "G_DBUS_INTERFACE_SKELETON_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_INTERFACE_SKELETON_FLAGS_")]
 	[Flags]
 	public enum DBusInterfaceSkeletonFlags {
 		NONE,
 		HANDLE_METHOD_INVOCATIONS_IN_THREAD
 	}
-	[CCode (cprefix = "G_DBUS_MESSAGE_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_BYTE_ORDER_")]
 	public enum DBusMessageByteOrder {
 		BIG_ENDIAN,
 		LITTLE_ENDIAN
 	}
-	[CCode (cprefix = "G_DBUS_MESSAGE_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_FLAGS_")]
 	[Flags]
 	public enum DBusMessageFlags {
 		NONE,
 		NO_REPLY_EXPECTED,
 		NO_AUTO_START
 	}
-	[CCode (cprefix = "G_DBUS_MESSAGE_HEADER_FIELD_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_HEADER_FIELD_")]
 	public enum DBusMessageHeaderField {
 		INVALID,
 		PATH,
@@ -2213,7 +2213,7 @@ namespace GLib {
 		SIGNATURE,
 		NUM_UNIX_FDS
 	}
-	[CCode (cprefix = "G_DBUS_MESSAGE_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_TYPE_")]
 	public enum DBusMessageType {
 		INVALID,
 		METHOD_CALL,
@@ -2221,20 +2221,20 @@ namespace GLib {
 		ERROR,
 		SIGNAL
 	}
-	[CCode (cprefix = "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_")]
 	[Flags]
 	public enum DBusObjectManagerClientFlags {
 		NONE,
 		DO_NOT_AUTO_START
 	}
-	[CCode (cprefix = "G_DBUS_PROPERTY_INFO_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROPERTY_INFO_FLAGS_")]
 	[Flags]
 	public enum DBusPropertyInfoFlags {
 		NONE,
 		READABLE,
 		WRITABLE
 	}
-	[CCode (cprefix = "G_DBUS_PROXY_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROXY_FLAGS_")]
 	[Flags]
 	public enum DBusProxyFlags {
 		NONE,
@@ -2242,49 +2242,49 @@ namespace GLib {
 		DO_NOT_CONNECT_SIGNALS,
 		DO_NOT_AUTO_START
 	}
-	[CCode (cprefix = "G_DBUS_SEND_MESSAGE_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SEND_MESSAGE_FLAGS_")]
 	[Flags]
 	public enum DBusSendMessageFlags {
 		NONE,
 		PRESERVE_SERIAL
 	}
-	[CCode (cprefix = "G_DBUS_SERVER_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SERVER_FLAGS_")]
 	[Flags]
 	public enum DBusServerFlags {
 		NONE,
 		RUN_IN_THREAD,
 		AUTHENTICATION_ALLOW_ANONYMOUS
 	}
-	[CCode (cprefix = "G_DBUS_SIGNAL_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SIGNAL_FLAGS_")]
 	[Flags]
 	public enum DBusSignalFlags {
 		NONE,
 		NO_MATCH_RULE
 	}
-	[CCode (cprefix = "G_DBUS_SUBTREE_FLAGS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SUBTREE_FLAGS_")]
 	[Flags]
 	public enum DBusSubtreeFlags {
 		NONE,
 		DISPATCH_TO_UNENUMERATED_NODES
 	}
-	[CCode (cprefix = "G_DATA_STREAM_BYTE_ORDER_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_BYTE_ORDER_")]
 	public enum DataStreamByteOrder {
 		BIG_ENDIAN,
 		LITTLE_ENDIAN,
 		HOST_ENDIAN
 	}
-	[CCode (cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_NEWLINE_TYPE_")]
 	public enum DataStreamNewlineType {
 		LF,
 		CR,
 		CR_LF,
 		ANY
 	}
-	[CCode (cprefix = "G_DRIVE_START_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_")]
 	public enum DriveStartFlags {
 		NONE
 	}
-	[CCode (cprefix = "G_DRIVE_START_STOP_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_STOP_TYPE_")]
 	public enum DriveStartStopType {
 		UNKNOWN,
 		SHUTDOWN,
@@ -2292,27 +2292,27 @@ namespace GLib {
 		MULTIDISK,
 		PASSWORD
 	}
-	[CCode (cprefix = "G_EMBLEM_ORIGIN_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_EMBLEM_ORIGIN_")]
 	public enum EmblemOrigin {
 		UNKNOWN,
 		DEVICE,
 		LIVEMETADATA,
 		TAG
 	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_INFO_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_INFO_")]
 	[Flags]
 	public enum FileAttributeInfoFlags {
 		NONE,
 		COPY_WITH_FILE,
 		COPY_WHEN_MOVED
 	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_STATUS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_STATUS_")]
 	public enum FileAttributeStatus {
 		UNSET,
 		SET,
 		ERROR_SETTING
 	}
-	[CCode (cprefix = "G_FILE_ATTRIBUTE_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_TYPE_")]
 	public enum FileAttributeType {
 		INVALID,
 		STRING,
@@ -2325,7 +2325,7 @@ namespace GLib {
 		OBJECT,
 		STRINGV
 	}
-	[CCode (cprefix = "G_FILE_COPY_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_COPY_")]
 	[Flags]
 	public enum FileCopyFlags {
 		NONE,
@@ -2336,14 +2336,14 @@ namespace GLib {
 		NO_FALLBACK_FOR_MOVE,
 		TARGET_DEFAULT_PERMS
 	}
-	[CCode (cprefix = "G_FILE_CREATE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_CREATE_")]
 	[Flags]
 	public enum FileCreateFlags {
 		NONE,
 		PRIVATE,
 		REPLACE_DESTINATION
 	}
-	[CCode (cprefix = "G_FILE_MONITOR_EVENT_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_EVENT_")]
 	public enum FileMonitorEvent {
 		CHANGED,
 		CHANGES_DONE_HINT,
@@ -2354,20 +2354,20 @@ namespace GLib {
 		UNMOUNTED,
 		MOVED
 	}
-	[CCode (cprefix = "G_FILE_MONITOR_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_")]
 	[Flags]
 	public enum FileMonitorFlags {
 		NONE,
 		WATCH_MOUNTS,
 		SEND_MOVED
 	}
-	[CCode (cprefix = "G_FILE_QUERY_INFO_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_QUERY_INFO_")]
 	[Flags]
 	public enum FileQueryInfoFlags {
 		NONE,
 		NOFOLLOW_SYMLINKS
 	}
-	[CCode (cprefix = "G_FILE_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_TYPE_")]
 	public enum FileType {
 		UNKNOWN,
 		REGULAR,
@@ -2377,13 +2377,13 @@ namespace GLib {
 		SHORTCUT,
 		MOUNTABLE
 	}
-	[CCode (cprefix = "G_FILESYSTEM_PREVIEW_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILESYSTEM_PREVIEW_TYPE_")]
 	public enum FilesystemPreviewType {
 		IF_ALWAYS,
 		IF_LOCAL,
 		NEVER
 	}
-	[CCode (cprefix = "G_IO_STREAM_SPLICE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_STREAM_SPLICE_")]
 	[Flags]
 	public enum IOStreamSpliceFlags {
 		NONE,
@@ -2391,36 +2391,36 @@ namespace GLib {
 		CLOSE_STREAM2,
 		WAIT_FOR_BOTH
 	}
-	[CCode (cprefix = "G_MOUNT_MOUNT_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_MOUNT_")]
 	public enum MountMountFlags {
 		NONE
 	}
-	[CCode (cprefix = "G_MOUNT_OPERATION_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_OPERATION_")]
 	public enum MountOperationResult {
 		HANDLED,
 		ABORTED,
 		UNHANDLED
 	}
-	[CCode (cprefix = "G_MOUNT_UNMOUNT_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_UNMOUNT_")]
 	[Flags]
 	public enum MountUnmountFlags {
 		NONE,
 		FORCE
 	}
-	[CCode (cprefix = "G_OUTPUT_STREAM_SPLICE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_OUTPUT_STREAM_SPLICE_")]
 	[Flags]
 	public enum OutputStreamSpliceFlags {
 		NONE,
 		CLOSE_SOURCE,
 		CLOSE_TARGET
 	}
-	[CCode (cprefix = "G_PASSWORD_SAVE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_PASSWORD_SAVE_")]
 	public enum PasswordSave {
 		NEVER,
 		FOR_SESSION,
 		PERMANENTLY
 	}
-	[CCode (cprefix = "G_SETTINGS_BIND_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SETTINGS_BIND_")]
 	[Flags]
 	public enum SettingsBindFlags {
 		DEFAULT,
@@ -2430,21 +2430,21 @@ namespace GLib {
 		GET_NO_CHANGES,
 		INVERT_BOOLEAN
 	}
-	[CCode (cprefix = "G_SOCKET_FAMILY_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_FAMILY_")]
 	public enum SocketFamily {
 		INVALID,
 		UNIX,
 		IPV4,
 		IPV6
 	}
-	[CCode (cprefix = "G_SOCKET_MSG_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_MSG_")]
 	public enum SocketMsgFlags {
 		NONE,
 		OOB,
 		PEEK,
 		DONTROUTE
 	}
-	[CCode (cprefix = "G_SOCKET_PROTOCOL_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_PROTOCOL_")]
 	public enum SocketProtocol {
 		UNKNOWN,
 		DEFAULT,
@@ -2452,20 +2452,20 @@ namespace GLib {
 		UDP,
 		SCTP
 	}
-	[CCode (cprefix = "G_SOCKET_TYPE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_TYPE_")]
 	public enum SocketType {
 		INVALID,
 		STREAM,
 		DATAGRAM,
 		SEQPACKET
 	}
-	[CCode (cprefix = "G_TLS_AUTHENTICATION_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_AUTHENTICATION_")]
 	public enum TlsAuthenticationMode {
 		NONE,
 		REQUESTED,
 		REQUIRED
 	}
-	[CCode (cprefix = "G_TLS_CERTIFICATE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CERTIFICATE_")]
 	[Flags]
 	public enum TlsCertificateFlags {
 		UNKNOWN_CA,
@@ -2477,7 +2477,7 @@ namespace GLib {
 		GENERIC_ERROR,
 		VALIDATE_ALL
 	}
-	[CCode (cprefix = "G_TLS_ERROR_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_ERROR_")]
 	public enum TlsError {
 		UNAVAILABLE,
 		MISC,
@@ -2487,13 +2487,13 @@ namespace GLib {
 		CERTIFICATE_REQUIRED,
 		EOF
 	}
-	[CCode (cprefix = "G_TLS_REHANDSHAKE_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_REHANDSHAKE_")]
 	public enum TlsRehandshakeMode {
 		NEVER,
 		SAFELY,
 		UNSAFELY
 	}
-	[CCode (cprefix = "G_UNIX_SOCKET_ADDRESS_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_UNIX_SOCKET_ADDRESS_")]
 	public enum UnixSocketAddressType {
 		INVALID,
 		ANONYMOUS,
@@ -2501,13 +2501,13 @@ namespace GLib {
 		ABSTRACT,
 		ABSTRACT_PADDED
 	}
-	[CCode (cprefix = "G_ZLIB_COMPRESSOR_FORMAT_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ZLIB_COMPRESSOR_FORMAT_")]
 	public enum ZlibCompressorFormat {
 		ZLIB,
 		GZIP,
 		RAW
 	}
-	[CCode (cprefix = "G_DBUS_ERROR_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_ERROR_")]
 	public errordomain DBusError {
 		FAILED,
 		NO_MEMORY,
@@ -2551,7 +2551,7 @@ namespace GLib {
 		ADT_AUDIT_DATA_UNKNOWN,
 		OBJECT_PATH_IN_USE
 	}
-	[CCode (cprefix = "G_IO_ERROR_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_ERROR_")]
 	public errordomain IOError {
 		FAILED,
 		NOT_FOUND,
@@ -2598,7 +2598,7 @@ namespace GLib {
 		PROXY_NEED_AUTH,
 		PROXY_NOT_ALLOWED
 	}
-	[CCode (cprefix = "G_RESOLVER_ERROR_", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOLVER_ERROR_")]
 	public errordomain ResolverError {
 		NOT_FOUND,
 		TEMPORARY_FAILURE,
@@ -2832,108 +2832,108 @@ namespace GLib {
 	public const string VOLUME_IDENTIFIER_KIND_UUID;
 	[CCode (cheader_filename = "gio/gio.h")]
 	public const string VOLUME_MONITOR_EXTENSION_POINT_NAME;
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.can_be_executable")]
-	[CCode (cname = "g_content_type_can_be_executable", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_can_be_executable")]
+	[Deprecated (replacement = "GLib.ContentType.can_be_executable", since = "vala-0.12")]
 	public static bool g_content_type_can_be_executable (string type);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.equals")]
-	[CCode (cname = "g_content_type_equals", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_equals")]
+	[Deprecated (replacement = "GLib.ContentType.equals", since = "vala-0.12")]
 	public static bool g_content_type_equals (string type1, string type2);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.from_mime_type")]
-	[CCode (cname = "g_content_type_from_mime_type", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_from_mime_type")]
+	[Deprecated (replacement = "GLib.ContentType.from_mime_type", since = "vala-0.12")]
 	public static string g_content_type_from_mime_type (string mime_type);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.get_description")]
-	[CCode (cname = "g_content_type_get_description", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_get_description")]
+	[Deprecated (replacement = "GLib.ContentType.get_description", since = "vala-0.12")]
 	public static string g_content_type_get_description (string type);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.get_icon")]
-	[CCode (cname = "g_content_type_get_icon", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_get_icon")]
+	[Deprecated (replacement = "GLib.ContentType.get_icon", since = "vala-0.12")]
 	public static GLib.Icon g_content_type_get_icon (string type);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.get_mime_type")]
-	[CCode (cname = "g_content_type_get_mime_type", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_get_mime_type")]
+	[Deprecated (replacement = "GLib.ContentType.get_mime_type", since = "vala-0.12")]
 	public static string g_content_type_get_mime_type (string type);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.guess")]
-	[CCode (cname = "g_content_type_guess", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_guess")]
+	[Deprecated (replacement = "GLib.ContentType.guess", since = "vala-0.12")]
 	public static string g_content_type_guess (string filename, uchar[] data, out bool result_uncertain);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.guess_for_tree")]
-	[CCode (cname = "g_content_type_guess_for_tree", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_guess_for_tree")]
+	[Deprecated (replacement = "GLib.ContentType.guess_for_tree", since = "vala-0.12")]
 	public static string g_content_type_guess_for_tree (GLib.File root);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.is_a")]
-	[CCode (cname = "g_content_type_is_a", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_is_a")]
+	[Deprecated (replacement = "GLib.ContentType.is_a", since = "vala-0.12")]
 	public static bool g_content_type_is_a (string type, string supertype);
-	[Deprecated (since = "vala-0.12", replacement = "GLib.ContentType.is_unknown")]
-	[CCode (cname = "g_content_type_is_unknown", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_type_is_unknown")]
+	[Deprecated (replacement = "GLib.ContentType.is_unknown", since = "vala-0.12")]
 	public static bool g_content_type_is_unknown (string type);
-	[CCode (cname = "g_content_types_get_registered", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_content_types_get_registered")]
 	public static GLib.List<string> g_content_types_get_registered ();
-	[CCode (cname = "g_dbus_address_get_for_bus_sync", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_for_bus_sync")]
 	public static unowned string g_dbus_address_get_for_bus_sync (GLib.BusType bus_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cname = "g_dbus_address_get_stream", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_stream")]
 	public static async void g_dbus_address_get_stream (string address, GLib.Cancellable? cancellable = null);
-	[CCode (cname = "g_dbus_address_get_stream_finish", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_stream_finish")]
 	public static unowned GLib.IOStream g_dbus_address_get_stream_finish (GLib.AsyncResult res, string out_guid) throws GLib.Error;
-	[CCode (cname = "g_dbus_address_get_stream_sync", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_stream_sync")]
 	public static unowned GLib.IOStream g_dbus_address_get_stream_sync (string address, string out_guid, GLib.Cancellable? cancellable = null) throws GLib.Error;
-	[CCode (cname = "g_dbus_error_encode_gerror", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_encode_gerror")]
 	public static unowned string g_dbus_error_encode_gerror (GLib.Error error);
-	[CCode (cname = "g_dbus_error_get_remote_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_get_remote_error")]
 	public static unowned string g_dbus_error_get_remote_error (GLib.Error error);
-	[CCode (cname = "g_dbus_error_is_remote_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_is_remote_error")]
 	public static bool g_dbus_error_is_remote_error (GLib.Error error);
-	[CCode (cname = "g_dbus_error_new_for_dbus_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_new_for_dbus_error")]
 	public static unowned GLib.Error g_dbus_error_new_for_dbus_error (string dbus_error_name, string dbus_error_message);
-	[CCode (cname = "g_dbus_error_quark", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_quark")]
 	public static GLib.Quark g_dbus_error_quark ();
-	[CCode (cname = "g_dbus_error_register_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_register_error")]
 	public static bool g_dbus_error_register_error (GLib.Quark error_domain, int error_code, string dbus_error_name);
-	[CCode (cname = "g_dbus_error_register_error_domain", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_register_error_domain")]
 	public static void g_dbus_error_register_error_domain (string error_domain_quark_name, size_t quark_volatile, GLib.DBusErrorEntry entries, uint num_entries);
-	[CCode (cname = "g_dbus_error_set_dbus_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_set_dbus_error")]
 	public static void g_dbus_error_set_dbus_error (string dbus_error_name, string dbus_error_message, string format) throws GLib.Error;
-	[CCode (cname = "g_dbus_error_set_dbus_error_valist", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_set_dbus_error_valist")]
 	public static void g_dbus_error_set_dbus_error_valist (string dbus_error_name, string dbus_error_message, string format, void* var_args) throws GLib.Error;
-	[CCode (cname = "g_dbus_error_strip_remote_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_strip_remote_error")]
 	public static bool g_dbus_error_strip_remote_error (GLib.Error error);
-	[CCode (cname = "g_dbus_error_unregister_error", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_error_unregister_error")]
 	public static bool g_dbus_error_unregister_error (GLib.Quark error_domain, int error_code, string dbus_error_name);
-	[CCode (cname = "g_dbus_generate_guid", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_generate_guid")]
 	public static unowned string g_dbus_generate_guid ();
-	[CCode (cname = "g_dbus_gvalue_to_gvariant", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_gvalue_to_gvariant")]
 	public static unowned GLib.Variant g_dbus_gvalue_to_gvariant (GLib.Value gvalue, GLib.VariantType type);
-	[CCode (cname = "g_dbus_gvariant_to_gvalue", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_gvariant_to_gvalue")]
 	public static void g_dbus_gvariant_to_gvalue (GLib.Variant value, GLib.Value out_gvalue);
-	[CCode (cname = "g_dbus_is_address", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_address")]
 	public static bool g_dbus_is_address (string str);
-	[CCode (cname = "g_dbus_is_guid", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_guid")]
 	public static bool g_dbus_is_guid (string str);
-	[CCode (cname = "g_dbus_is_interface_name", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_interface_name")]
 	public static bool g_dbus_is_interface_name (string str);
-	[CCode (cname = "g_dbus_is_member_name", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_member_name")]
 	public static bool g_dbus_is_member_name (string str);
-	[CCode (cname = "g_dbus_is_name", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_name")]
 	public static bool g_dbus_is_name (string str);
-	[CCode (cname = "g_dbus_is_supported_address", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_supported_address")]
 	public static bool g_dbus_is_supported_address (string str) throws GLib.Error;
-	[CCode (cname = "g_dbus_is_unique_name", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_is_unique_name")]
 	public static bool g_dbus_is_unique_name (string str);
-	[CCode (cname = "g_io_error_from_errno", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_error_from_errno")]
 	public static unowned GLib.IOError g_io_error_from_errno (int err_no);
-	[CCode (cname = "g_io_error_quark", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_error_quark")]
 	public static GLib.Quark g_io_error_quark ();
-	[CCode (cname = "g_io_modules_load_all_in_directory", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_modules_load_all_in_directory")]
 	public static GLib.List<weak GLib.TypeModule> g_io_modules_load_all_in_directory (string dirname);
-	[CCode (cname = "g_io_modules_scan_all_in_directory", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_modules_scan_all_in_directory")]
 	public static void g_io_modules_scan_all_in_directory (string dirname);
-	[CCode (cname = "g_io_scheduler_cancel_all_jobs", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_scheduler_cancel_all_jobs")]
 	public static void g_io_scheduler_cancel_all_jobs ();
-	[CCode (cname = "g_io_scheduler_push_job", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_io_scheduler_push_job")]
 	public static void g_io_scheduler_push_job (owned GLib.IOSchedulerJobFunc job_func, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null);
-	[CCode (cname = "g_pollable_source_new", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_pollable_source_new")]
 	public static unowned GLib.TimeoutSource g_pollable_source_new (GLib.Object pollable_stream);
-	[CCode (cname = "g_simple_async_report_error_in_idle", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_simple_async_report_error_in_idle")]
 	public static void g_simple_async_report_error_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Quark domain, int code, string format);
-	[CCode (cname = "g_simple_async_report_gerror_in_idle", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_simple_async_report_gerror_in_idle")]
 	public static void g_simple_async_report_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Error error);
-	[CCode (cname = "g_simple_async_report_take_gerror_in_idle", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_simple_async_report_take_gerror_in_idle")]
 	public static void g_simple_async_report_take_gerror_in_idle (GLib.Object object, GLib.AsyncReadyCallback callback, GLib.Error error);
-	[CCode (cname = "g_tls_error_quark", cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", cname = "g_tls_error_quark")]
 	public static GLib.Quark g_tls_error_quark ();
 }
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index 8929287..43daa97 100644
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -26,18 +26,18 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixfdmessage.h")]
 	public class UnixFDMessage : GLib.SocketControlMessage {
-		[CCode (type = "GSocketControlMessage*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketControlMessage*")]
 		public UnixFDMessage ();
 		public bool append_fd (int fd) throws GLib.Error;
 		public unowned GLib.UnixFDList get_fd_list ();
 		public int steal_fds (int length);
-		[CCode (type = "GSocketControlMessage*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketControlMessage*")]
 		public UnixFDMessage.with_fd_list (GLib.UnixFDList fd_list);
 		public GLib.UnixFDList fd_list { get; construct; }
 	}
 	[CCode (cheader_filename = "gio/gunixinputstream.h")]
 	public class UnixInputStream : GLib.InputStream, GLib.PollableInputStream {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public UnixInputStream (int fd, bool close_fd);
 		public bool get_close_fd ();
 		public int get_fd ();
@@ -45,8 +45,8 @@ namespace GLib {
 		public bool close_fd { get; set; }
 		public int fd { get; construct; }
 	}
+	[CCode (cheader_filename = "gio/gunixmounts.h", free_function = "g_unix_mount_free")]
 	[Compact]
-	[CCode (free_function = "g_unix_mount_free", cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountEntry {
 		[CCode (cname = "g_unix_mount_at")]
 		public UnixMountEntry (string mount_path, uint64 time_read);
@@ -81,12 +81,12 @@ namespace GLib {
 		public virtual signal void mountpoints_changed ();
 		public virtual signal void mounts_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
+	[Compact]
 	public class UnixMountMonitorClass {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
+	[Compact]
 	public class UnixMountPoint {
 		public int compare (GLib.UnixMountPoint mount2);
 		public unowned string get_device_path ();
@@ -101,7 +101,7 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixoutputstream.h")]
 	public class UnixOutputStream : GLib.OutputStream, GLib.PollableOutputStream {
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public UnixOutputStream (int fd, bool close_fd);
 		public bool get_close_fd ();
 		public int get_fd ();
@@ -111,16 +111,16 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixsocketaddress.h")]
 	public class UnixSocketAddress : GLib.SocketAddress, GLib.SocketConnectable {
-		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketAddress*")]
 		public UnixSocketAddress (string path);
 		public static bool abstract_names_supported ();
-		[CCode (cname = "g_unix_socket_address_new_abstract", type = "GSocketAddress*", has_construct_function = false)]
+		[CCode (cname = "g_unix_socket_address_new_abstract", has_construct_function = false, type = "GSocketAddress*")]
 		public UnixSocketAddress.as_abstract (string path, int path_len);
 		public GLib.UnixSocketAddressType get_address_type ();
 		public bool get_is_abstract ();
 		public unowned string get_path ();
 		public size_t get_path_len ();
-		[CCode (type = "GSocketAddress*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GSocketAddress*")]
 		public UnixSocketAddress.with_type (string path, int path_len, GLib.UnixSocketAddressType type);
 		[NoAccessorMethod]
 		public bool @abstract { get; construct; }
@@ -141,10 +141,10 @@ namespace GLib {
 	public delegate void DesktopAppLaunchCallback (GLib.DesktopAppInfo appinfo, GLib.Pid pid);
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public const string DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME;
-	[CCode (cname = "g_unix_is_mount_path_system_internal", cheader_filename = "gio/gunixmounts.h")]
+	[CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_is_mount_path_system_internal")]
 	public static bool is_mount_path_system_internal (string mount_path);
-	[CCode (cname = "g_unix_mount_points_changed_since", cheader_filename = "gio/gunixmounts.h")]
+	[CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_mount_points_changed_since")]
 	public static bool mount_points_changed_since (uint64 time);
-	[CCode (cname = "g_unix_mounts_changed_since", cheader_filename = "gio/gunixmounts.h")]
+	[CCode (cheader_filename = "gio/gunixmounts.h", cname = "g_unix_mounts_changed_since")]
 	public static bool mounts_changed_since (uint64 time);
 }
diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi
index 4f147c8..53a4636 100644
--- a/vapi/gnome-desktop-2.0.vapi
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -4,7 +4,7 @@
 namespace Gnome {
 	[CCode (cheader_filename = "libgnomeui/gnome-ditem-edit.h")]
 	public class DItemEdit : Gtk.Notebook, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DItemEdit ();
 		public void clear ();
 		public unowned Gnome.DesktopItem get_ditem ();
@@ -19,8 +19,8 @@ namespace Gnome {
 		public virtual signal void icon_changed ();
 		public virtual signal void name_changed ();
 	}
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", ref_function = "gnome_desktop_item_ref", type_id = "GNOME_TYPE_DESKTOP_ITEM", unref_function = "gnome_desktop_item_unref")]
 	[Compact]
-	[CCode (ref_function = "gnome_desktop_item_ref", unref_function = "gnome_desktop_item_unref", type_id = "GNOME_TYPE_DESKTOP_ITEM", cheader_filename = "libgnome/gnome-desktop-item.h")]
 	public class DesktopItem {
 		[CCode (has_construct_function = false)]
 		public DesktopItem ();
@@ -69,10 +69,10 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/gnome-hint.h")]
 	public class Hint : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Hint (string hintfile, string title, string background_image, string logo_image, string startupkey);
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_ERROR_", has_type_id = false)]
 	public enum DesktopItemError {
 		NO_FILENAME,
 		UNKNOWN_ENCODING,
@@ -83,11 +83,11 @@ namespace Gnome {
 		NOT_LAUNCHABLE,
 		INVALID_TYPE
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_ICON_NO_", has_type_id = false)]
 	public enum DesktopItemIconFlags {
 		KDE
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_LAUNCH_", has_type_id = false)]
 	public enum DesktopItemLaunchFlags {
 		ONLY_ONE,
 		USE_CURRENT_DIR,
@@ -95,18 +95,18 @@ namespace Gnome {
 		APPEND_PATHS,
 		DO_NOT_REAP_CHILD
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_LOAD_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_LOAD_", has_type_id = false)]
 	public enum DesktopItemLoadFlags {
 		ONLY_IF_EXISTS,
 		NO_TRANSLATIONS
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_", has_type_id = false)]
 	public enum DesktopItemStatus {
 		UNCHANGED,
 		CHANGED,
 		DISAPPEARED
 	}
-	[CCode (cprefix = "GNOME_DESKTOP_ITEM_TYPE_", has_type_id = false, cheader_filename = "libgnome/gnome-desktop-item.h")]
+	[CCode (cheader_filename = "libgnome/gnome-desktop-item.h", cprefix = "GNOME_DESKTOP_ITEM_TYPE_", has_type_id = false)]
 	public enum DesktopItemType {
 		NULL,
 		OTHER,
diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
index 705698e..cbf4609 100644
--- a/vapi/gnome-keyring-1.vapi
+++ b/vapi/gnome-keyring-1.vapi
@@ -2,22 +2,22 @@
 
 [CCode (cprefix = "GnomeKeyring", lower_case_cprefix = "gnome_keyring_")]
 namespace GnomeKeyring {
+	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_access_control_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_keyring_access_control_copy", cheader_filename = "gnome-keyring.h")]
 	public class AccessControl {
 		[CCode (has_construct_function = false)]
 		public AccessControl (GnomeKeyring.ApplicationRef application, GnomeKeyring.AccessType types_allowed);
 		public GnomeKeyring.AccessControl copy ();
 	}
+	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_application_ref_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_keyring_application_ref_copy", cheader_filename = "gnome-keyring.h")]
 	public class ApplicationRef {
 		[CCode (has_construct_function = false)]
 		public ApplicationRef ();
 		public GnomeKeyring.ApplicationRef copy ();
 	}
+	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_attribute_list_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_keyring_attribute_list_copy", cheader_filename = "gnome-keyring.h")]
 	public class AttributeList {
 		[CCode (array_length = false)]
 		public GnomeKeyring.Attribute[] data;
@@ -28,16 +28,16 @@ namespace GnomeKeyring {
 		public GnomeKeyring.AttributeList copy ();
 		public GnomeKeyring.Attribute index (int i);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
+	[Compact]
 	public class Found {
 		public weak GnomeKeyring.AttributeList attributes;
 		public uint item_id;
 		public weak string keyring;
 		public weak string secret;
 	}
+	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_info_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_keyring_info_copy", cheader_filename = "gnome-keyring.h")]
 	public class Info {
 		public GnomeKeyring.Info copy ();
 		public ulong get_ctime ();
@@ -48,8 +48,8 @@ namespace GnomeKeyring {
 		public void set_lock_on_idle (bool value);
 		public void set_lock_timeout (uint32 value);
 	}
+	[CCode (cheader_filename = "gnome-keyring.h", copy_function = "gnome_keyring_item_info_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_keyring_item_info_copy", cheader_filename = "gnome-keyring.h")]
 	public class ItemInfo {
 		[CCode (has_construct_function = false)]
 		public ItemInfo ();
@@ -62,8 +62,8 @@ namespace GnomeKeyring {
 		public void set_secret (string value);
 		public void set_type (GnomeKeyring.ItemType type);
 	}
+	[CCode (cheader_filename = "gnome-keyring.h", free_function = "gnome_keyring_network_password_free")]
 	[Compact]
-	[CCode (free_function = "gnome_keyring_network_password_free", cheader_filename = "gnome-keyring.h")]
 	public class NetworkPasswordData {
 		public weak string authtype;
 		public weak string domain;
@@ -76,8 +76,8 @@ namespace GnomeKeyring {
 		public weak string server;
 		public weak string user;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
+	[Compact]
 	public class PasswordSchema {
 		public void* attributes;
 		public GnomeKeyring.ItemType item_type;
@@ -85,36 +85,36 @@ namespace GnomeKeyring {
 		public void* reserved2;
 		public void* reserved3;
 	}
-	[CCode (type_id = "GNOME_KEYRING_TYPE_ATTRIBUTE", cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", type_id = "GNOME_KEYRING_TYPE_ATTRIBUTE")]
 	public struct Attribute {
 		public weak string name;
 		public GnomeKeyring.AttributeType type;
 		public void* value;
 	}
-	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false)]
 	public enum AccessRestriction {
 		ASK,
 		DENY,
 		ALLOW
 	}
-	[CCode (cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ACCESS_", has_type_id = false)]
 	public enum AccessType {
 		READ,
 		WRITE,
 		REMOVE
 	}
-	[CCode (cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ATTRIBUTE_TYPE_", has_type_id = false)]
 	public enum AttributeType {
 		STRING,
 		UINT32
 	}
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ITEM_INFO_", has_type_id = false)]
 	public enum ItemInfoFlags {
 		ALL,
 		BASICS,
 		SECRET
 	}
-	[CCode (cprefix = "GNOME_KEYRING_ITEM_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_ITEM_", has_type_id = false)]
 	public enum ItemType {
 		APPLICATION_SECRET,
 		ITEM_TYPE_MASK,
@@ -126,7 +126,7 @@ namespace GnomeKeyring {
 		PK_STORAGE,
 		LAST_TYPE
 	}
-	[CCode (cprefix = "GNOME_KEYRING_RESULT_", has_type_id = false, cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cprefix = "GNOME_KEYRING_RESULT_", has_type_id = false)]
 	public enum Result {
 		OK,
 		DENIED,
@@ -153,7 +153,7 @@ namespace GnomeKeyring {
 	public delegate void OperationGetListCallback (GnomeKeyring.Result result, GLib.List<GnomeKeyring.NetworkPasswordData> list);
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public delegate void OperationGetStringCallback (GnomeKeyring.Result result, string? str);
-	[CCode (cname = "GNOME_KEYRING_NETWORK_PASSWORD", cheader_filename = "gnome-keyring.h")]
+	[CCode (cheader_filename = "gnome-keyring.h", cname = "GNOME_KEYRING_NETWORK_PASSWORD")]
 	public static GnomeKeyring.PasswordSchema NETWORK_PASSWORD;
 	[CCode (cheader_filename = "gnome-keyring.h")]
 	public const string DEFAULT;
diff --git a/vapi/gnome-vfs-2.0.vapi b/vapi/gnome-vfs-2.0.vapi
index 43e0e99..991527b 100644
--- a/vapi/gnome-vfs-2.0.vapi
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -46,18 +46,18 @@ namespace GnomeVFS {
 		public void @set (GnomeVFS.ACE ace);
 		public void unset (GnomeVFS.ACE ace);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ACLKind {
 		public unowned string to_string ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ACLPerm {
 		public unowned string to_string ();
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_ADDRESS")]
 	[Compact]
-	[CCode (type_id = "GNOME_VFS_TYPE_ADDRESS", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class Address {
 		public unowned GnomeVFS.Address dup ();
 		public bool equal (GnomeVFS.Address b);
@@ -71,12 +71,12 @@ namespace GnomeVFS {
 		public bool match (GnomeVFS.Address b, uint prefix);
 		public unowned string to_string ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class AsyncHandle {
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", free_function = "gnome_vfs_cancellation_destroy")]
 	[Compact]
-	[CCode (free_function = "gnome_vfs_cancellation_destroy", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class Cancellation {
 		[CCode (has_construct_function = false)]
 		public Cancellation ();
@@ -85,8 +85,8 @@ namespace GnomeVFS {
 		public bool check ();
 		public int get_fd ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class Context {
 		[CCode (has_construct_function = false)]
 		public Context ();
@@ -94,16 +94,16 @@ namespace GnomeVFS {
 		public unowned GnomeVFS.Cancellation get_cancellation ();
 		public static unowned GnomeVFS.Context peek_current ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class DNSSDBrowseHandle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class DNSSDResolveHandle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class DNSSDService {
 		public weak string domain;
 		public weak string name;
@@ -111,11 +111,11 @@ namespace GnomeVFS {
 		[CCode (cname = "gnome_vfs_dns_sd_service_list_free")]
 		public void list_free (int n_services);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class DirectoryHandle {
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_DRIVE", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_check_function = "GNOME_IS_VFS_DRIVE")]
 	public class Drive : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Drive ();
@@ -143,8 +143,8 @@ namespace GnomeVFS {
 		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
 		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", ref_function = "gnome_vfs_file_info_ref", ref_function_void = true, type_id = "GNOME_VFS_TYPE_FILE_INFO", unref_function = "gnome_vfs_file_info_unref")]
 	[Compact]
-	[CCode (ref_function = "gnome_vfs_file_info_ref", ref_function_void = true, unref_function = "gnome_vfs_file_info_unref", type_id = "GNOME_VFS_TYPE_FILE_INFO", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class FileInfo {
 		public weak GnomeVFS.ACL acl;
 		public ulong atime;
@@ -181,12 +181,12 @@ namespace GnomeVFS {
 		public static unowned GLib.List list_unref (GLib.List list);
 		public bool matches (GnomeVFS.FileInfo b);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class FileOffset {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class FindDirectoryResult {
 		public void* reserved1;
 		public void* reserved2;
@@ -194,28 +194,28 @@ namespace GnomeVFS {
 		public weak GnomeVFS.URI uri;
 		public unowned GnomeVFS.FindDirectoryResult dup ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class GetFileInfoResult {
 		public weak GnomeVFS.FileInfo file_info;
 		public GnomeVFS.Result result;
 		public weak GnomeVFS.URI uri;
 		public unowned GnomeVFS.GetFileInfoResult dup ();
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_GNOME_VFS_FIND_DIRECTORY_RESULT")]
 	[Compact]
-	[CCode (type_id = "GNOME_VFS_TYPE_GNOME_VFS_FIND_DIRECTORY_RESULT", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class GnomeVfsFindDirectoryResult {
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_id = "GNOME_VFS_TYPE_GNOME_VFS_GET_FILE_INFO_RESULT")]
 	[Compact]
-	[CCode (type_id = "GNOME_VFS_TYPE_GNOME_VFS_GET_FILE_INFO_RESULT", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class GnomeVfsGetFileInfoResult {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class Handle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class InodeNumber {
 	}
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
@@ -225,12 +225,12 @@ namespace GnomeVFS {
 		public static unowned GnomeVFS.MIMEMonitor @get ();
 		public virtual signal void data_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class MethodHandle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class MimeAction {
 		public void* action;
 		public GnomeVFS.MimeActionType action_type;
@@ -238,8 +238,8 @@ namespace GnomeVFS {
 		public GnomeVFS.Result launch (GLib.List uris);
 		public GnomeVFS.Result launch_with_env (GLib.List uris, out unowned string envp);
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs-mime-handlers.h", copy_function = "gnome_vfs_mime_application_copy")]
 	[Compact]
-	[CCode (copy_function = "gnome_vfs_mime_application_copy", cheader_filename = "libgnomevfs/gnome-vfs-mime-handlers.h")]
 	public class MimeApplication {
 		public bool can_open_multiple_files;
 		public weak string command;
@@ -269,22 +269,22 @@ namespace GnomeVFS {
 		public bool supports_startup_notification ();
 		public bool supports_uris ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackAdditionalHeadersIn {
 		public void* reserved1;
 		public void* reserved2;
 		public weak GnomeVFS.URI uri;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackAdditionalHeadersOut {
 		public weak GLib.List headers;
 		public void* reserved1;
 		public void* reserved2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackAuthenticationIn {
 		public GnomeVFS.ModuleCallbackAuthenticationAuthType auth_type;
 		public bool previous_attempt_failed;
@@ -293,16 +293,16 @@ namespace GnomeVFS {
 		public void* reserved2;
 		public weak string uri;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackAuthenticationOut {
 		public weak string password;
 		public void* reserved1;
 		public void* reserved2;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackFillAuthenticationIn {
 		public weak string authtype;
 		public weak string domain;
@@ -315,8 +315,8 @@ namespace GnomeVFS {
 		public weak string uri;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackFillAuthenticationOut {
 		public weak string domain;
 		public weak string password;
@@ -325,8 +325,8 @@ namespace GnomeVFS {
 		public weak string username;
 		public bool valid;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackFullAuthenticationIn {
 		public weak string authtype;
 		public weak string default_domain;
@@ -342,8 +342,8 @@ namespace GnomeVFS {
 		public weak string uri;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackFullAuthenticationOut {
 		public bool abort_auth;
 		public weak string domain;
@@ -354,8 +354,8 @@ namespace GnomeVFS {
 		public bool save_password;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackQuestionIn {
 		public weak string choices;
 		public weak string primary_message;
@@ -363,30 +363,30 @@ namespace GnomeVFS {
 		public void* reserved2;
 		public weak string secondary_message;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackQuestionOut {
 		public int answer;
 		public void* reserved1;
 		public void* reserved2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackReceivedHeadersIn {
 		public weak GLib.List headers;
 		public void* reserved1;
 		public void* reserved2;
 		public weak GnomeVFS.URI uri;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackReceivedHeadersOut {
 		public int dummy;
 		public void* reserved1;
 		public void* reserved2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackSaveAuthenticationIn {
 		public weak string authtype;
 		public weak string domain;
@@ -401,14 +401,14 @@ namespace GnomeVFS {
 		public weak string uri;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackSaveAuthenticationOut {
 		public void* reserved1;
 		public void* reserved2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackStatusMessageIn {
 		public weak string message;
 		public int percentage;
@@ -416,19 +416,19 @@ namespace GnomeVFS {
 		public void* reserved2;
 		public weak string uri;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ModuleCallbackStatusMessageOut {
 		public int dummy;
 		public void* reserved1;
 		public void* reserved2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class MonitorHandle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ProgressCallbackState {
 		public void* async_job_data;
 		public int64 next_text_update_callback_time;
@@ -441,12 +441,12 @@ namespace GnomeVFS {
 		public int64 update_callback_period;
 		public void* user_data;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ResolveHandle {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class ToplevelURI {
 		public weak string host_name;
 		public uint host_port;
@@ -457,8 +457,8 @@ namespace GnomeVFS {
 		public weak string urn;
 		public weak string user_name;
 	}
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", ref_function = "gnome_vfs_uri_ref", unref_function = "gnome_vfs_uri_unref")]
 	[Compact]
-	[CCode (ref_function = "gnome_vfs_uri_ref", unref_function = "gnome_vfs_uri_unref", cheader_filename = "libgnomevfs/gnome-vfs.h")]
 	public class URI {
 		public weak string fragment_id;
 		public void* method;
@@ -507,7 +507,7 @@ namespace GnomeVFS {
 		public void set_user_name (string user_name);
 		public unowned string to_string (GnomeVFS.URIHideOptions hide_options);
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_check_function = "GNOME_IS_VFS_VOLUME")]
 	public class Volume : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Volume ();
@@ -531,7 +531,7 @@ namespace GnomeVFS {
 		public void unmount (GnomeVFS.VolumeOpCallback callback);
 		public void unref ();
 	}
-	[CCode (type_check_function = "GNOME_IS_VFS_VOLUME_MONITOR", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", type_check_function = "GNOME_IS_VFS_VOLUME_MONITOR")]
 	public class VolumeMonitor : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected VolumeMonitor ();
@@ -548,8 +548,8 @@ namespace GnomeVFS {
 		public virtual signal void volume_pre_unmount (GnomeVFS.Volume volume);
 		public virtual signal void volume_unmounted (GnomeVFS.Volume volume);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[Compact]
 	public class XferProgressInfo {
 		public GnomeVFS.FileSize bytes_copied;
 		public GnomeVFS.FileSize bytes_total;
@@ -569,16 +569,16 @@ namespace GnomeVFS {
 		public GnomeVFS.Result vfs_status;
 	}
 	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h")]
-	[SimpleType]
 	[IntegerType (rank = 0)]
+	[SimpleType]
 	public struct FileSize : uint64 {
 	}
-	[CCode (cprefix = "GNOME_VFS_DNS_SD_SERVICE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_DNS_SD_SERVICE_")]
 	public enum DNSSDServiceStatus {
 		ADDED,
 		REMOVED
 	}
-	[CCode (cprefix = "GNOME_VFS_DEVICE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_DEVICE_TYPE_")]
 	public enum DeviceType {
 		UNKNOWN,
 		AUDIO_CD,
@@ -599,7 +599,7 @@ namespace GnomeVFS {
 		LOOPBACK,
 		NETWORK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_VISIT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_DIRECTORY_VISIT_")]
 	[Flags]
 	public enum DirectoryVisitOptions {
 		DEFAULT,
@@ -607,14 +607,14 @@ namespace GnomeVFS {
 		LOOPCHECK,
 		IGNORE_RECURSE_ERROR
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_FLAGS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_FILE_FLAGS_")]
 	[Flags]
 	public enum FileFlags {
 		NONE,
 		SYMLINK,
 		LOCAL
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_FIELDS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_FILE_INFO_FIELDS_")]
 	[Flags]
 	public enum FileInfoFields {
 		NONE,
@@ -637,7 +637,7 @@ namespace GnomeVFS {
 		ACL,
 		SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_FILE_INFO_")]
 	[Flags]
 	public enum FileInfoOptions {
 		DEFAULT,
@@ -650,7 +650,7 @@ namespace GnomeVFS {
 		GET_ACL,
 		GET_SELINUX_CONTEXT
 	}
-	[CCode (cprefix = "GNOME_VFS_PERM_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_PERM_")]
 	[Flags]
 	public enum FilePermissions {
 		SUID,
@@ -672,7 +672,7 @@ namespace GnomeVFS {
 		ACCESS_WRITABLE,
 		ACCESS_EXECUTABLE
 	}
-	[CCode (cprefix = "GNOME_VFS_FILE_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_FILE_TYPE_")]
 	public enum FileType {
 		UNKNOWN,
 		REGULAR,
@@ -683,42 +683,42 @@ namespace GnomeVFS {
 		BLOCK_DEVICE,
 		SYMBOLIC_LINK
 	}
-	[CCode (cprefix = "GNOME_VFS_DIRECTORY_KIND_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_DIRECTORY_KIND_")]
 	public enum FindDirectoryKind {
 		DESKTOP,
 		TRASH
 	}
-	[CCode (cprefix = "GNOME_VFS_MAKE_URI_DIR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MAKE_URI_DIR_")]
 	[Flags]
 	public enum MakeURIDirs {
 		NONE,
 		HOMEDIR,
 		CURRENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_ACTION_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MIME_ACTION_TYPE_")]
 	public enum MimeActionType {
 		NONE,
 		APPLICATION,
 		COMPONENT
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_")]
 	public enum MimeApplicationArgumentType {
 		URIS,
 		PATHS,
 		URIS_FOR_NON_FILES
 	}
-	[CCode (cprefix = "GNOME_VFS_MIME_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MIME_")]
 	public enum MimeEquivalence {
 		UNRELATED,
 		IDENTICAL,
 		PARENT
 	}
-	[CCode (cprefix = "", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "")]
 	public enum ModuleCallbackAuthenticationAuthType {
 		AuthTypeBasic,
 		AuthTypeDigest
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationFlags {
 		PREVIOUS_ATTEMPT_FAILED,
@@ -728,12 +728,12 @@ namespace GnomeVFS {
 		SAVING_SUPPORTED,
 		ANON_SUPPORTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_OUT_ANON_")]
 	[Flags]
 	public enum ModuleCallbackFullAuthenticationOutFlags {
 		SELECTED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_EVENT_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MONITOR_EVENT_")]
 	public enum MonitorEventType {
 		CHANGED,
 		DELETED,
@@ -742,12 +742,12 @@ namespace GnomeVFS {
 		CREATED,
 		METADATA_CHANGED
 	}
-	[CCode (cprefix = "GNOME_VFS_MONITOR_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_MONITOR_")]
 	public enum MonitorType {
 		FILE,
 		DIRECTORY
 	}
-	[CCode (cprefix = "GNOME_VFS_OPEN_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_OPEN_")]
 	[Flags]
 	public enum OpenMode {
 		NONE,
@@ -756,7 +756,7 @@ namespace GnomeVFS {
 		RANDOM,
 		TRUNCATE
 	}
-	[CCode (cprefix = "GNOME_VFS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_")]
 	public enum Result {
 		OK,
 		ERROR_NOT_FOUND,
@@ -812,13 +812,13 @@ namespace GnomeVFS {
 		ERROR_NOT_A_SYMBOLIC_LINK,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GNOME_VFS_SEEK_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_SEEK_")]
 	public enum SeekPosition {
 		START,
 		CURRENT,
 		END
 	}
-	[CCode (cprefix = "GNOME_VFS_SET_FILE_INFO_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_SET_FILE_INFO_")]
 	[Flags]
 	public enum SetFileInfoMask {
 		NONE,
@@ -830,7 +830,7 @@ namespace GnomeVFS {
 		SELINUX_CONTEXT,
 		SYMLINK_NAME
 	}
-	[CCode (cprefix = "GNOME_VFS_URI_HIDE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_URI_HIDE_")]
 	[Flags]
 	public enum URIHideOptions {
 		NONE,
@@ -841,24 +841,24 @@ namespace GnomeVFS {
 		TOPLEVEL_METHOD,
 		FRAGMENT_IDENTIFIER
 	}
-	[CCode (cprefix = "GNOME_VFS_VOLUME_TYPE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_VOLUME_TYPE_")]
 	public enum VolumeType {
 		MOUNTPOINT,
 		VFS_MOUNT,
 		CONNECTED_SERVER
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_ERROR_ACTION_")]
 	public enum XferErrorAction {
 		ABORT,
 		RETRY,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_ERROR_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_ERROR_MODE_")]
 	public enum XferErrorMode {
 		ABORT,
 		QUERY
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_")]
 	[Flags]
 	public enum XferOptions {
 		DEFAULT,
@@ -876,7 +876,7 @@ namespace GnomeVFS {
 		FOLLOW_LINKS_RECURSIVE,
 		TARGET_DEFAULT_PERMS
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_OVERWRITE_ACTION_")]
 	public enum XferOverwriteAction {
 		ABORT,
 		REPLACE,
@@ -884,14 +884,14 @@ namespace GnomeVFS {
 		SKIP,
 		SKIP_ALL
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_OVERWRITE_MODE_")]
 	public enum XferOverwriteMode {
 		ABORT,
 		QUERY,
 		REPLACE,
 		SKIP
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_")]
 	public enum XferPhase {
 		PHASE_INITIAL,
 		CHECKING_DESTINATION,
@@ -912,7 +912,7 @@ namespace GnomeVFS {
 		PHASE_COMPLETED,
 		NUM_PHASES
 	}
-	[CCode (cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_", cheader_filename = "libgnomevfs/gnome-vfs.h")]
+	[CCode (cheader_filename = "libgnomevfs/gnome-vfs.h", cprefix = "GNOME_VFS_XFER_PROGRESS_STATUS_")]
 	public enum XferProgressStatus {
 		OK,
 		VFSERROR,
diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index f2b1de5..8f7348e 100644
--- a/vapi/goocanvas.vapi
+++ b/vapi/goocanvas.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Goo", lower_case_cprefix = "goo_")]
 namespace Goo {
+	[CCode (cheader_filename = "goocanvas.h", copy_function = "goo_cairo_matrix_copy", type_id = "GOO_TYPE_CAIRO_MATRIX")]
 	[Compact]
-	[CCode (copy_function = "goo_cairo_matrix_copy", type_id = "GOO_TYPE_CAIRO_MATRIX", cheader_filename = "goocanvas.h")]
 	public class CairoMatrix {
 		public double x0;
 		public double xx;
@@ -13,8 +13,8 @@ namespace Goo {
 		public double yy;
 		public static Cairo.Matrix copy (Cairo.Matrix matrix);
 	}
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CAIRO_PATTERN")]
 	[Compact]
-	[CCode (type_id = "GOO_TYPE_CAIRO_PATTERN", cheader_filename = "goocanvas.h")]
 	public class CairoPattern {
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
@@ -456,8 +456,8 @@ namespace Goo {
 		[NoAccessorMethod]
 		public Gdk.Pixbuf stroke_pixbuf { set; }
 	}
+	[CCode (cheader_filename = "goocanvas.h", ref_function = "goo_canvas_line_dash_ref", type_id = "GOO_TYPE_CANVAS_LINE_DASH", unref_function = "goo_canvas_line_dash_unref")]
 	[Compact]
-	[CCode (ref_function = "goo_canvas_line_dash_ref", unref_function = "goo_canvas_line_dash_unref", type_id = "GOO_TYPE_CANVAS_LINE_DASH", cheader_filename = "goocanvas.h")]
 	public class CanvasLineDash {
 		public double dash_offset;
 		public double* dashes;
@@ -502,8 +502,8 @@ namespace Goo {
 		[NoAccessorMethod]
 		public double y { get; set; }
 	}
+	[CCode (cheader_filename = "goocanvas.h", ref_function = "goo_canvas_points_ref", type_id = "GOO_TYPE_CANVAS_POINTS", unref_function = "goo_canvas_points_unref")]
 	[Compact]
-	[CCode (ref_function = "goo_canvas_points_ref", unref_function = "goo_canvas_points_unref", type_id = "GOO_TYPE_CANVAS_POINTS", cheader_filename = "goocanvas.h")]
 	public class CanvasPoints {
 		public double* coords;
 		public int num_points;
@@ -542,8 +542,8 @@ namespace Goo {
 		[NoAccessorMethod]
 		public double y { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "goocanvas.h")]
+	[Compact]
 	public class CanvasPolylineArrowData {
 		public double arrow_length;
 		public double arrow_tip_length;
@@ -887,14 +887,14 @@ namespace Goo {
 		public signal void child_notify (GLib.ParamSpec pspec);
 		public signal void child_removed (int child_num);
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_BOUNDS", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_BOUNDS")]
 	public struct CanvasBounds {
 		public double x1;
 		public double y1;
 		public double x2;
 		public double y2;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_ITEM_SIMPLE_DATA", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_ITEM_SIMPLE_DATA")]
 	public struct CanvasItemSimpleData {
 		public Cairo.Matrix? transform;
 		public weak GLib.Array<Goo.CanvasPathCommand> clip_path_commands;
@@ -910,13 +910,13 @@ namespace Goo {
 		public uint cache_setting;
 		public uint has_tooltip;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_PATH_COMMAND", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND")]
 	public struct CanvasPathCommand {
 		public Goo.CanvasPathCommandSimple simple;
 		public Goo.CanvasPathCommandCurve curve;
 		public Goo.CanvasPathCommandArc arc;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_ARC", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_ARC")]
 	public struct CanvasPathCommandArc {
 		public uint type;
 		public uint relative;
@@ -928,7 +928,7 @@ namespace Goo {
 		public double x;
 		public double y;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_CURVE", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_CURVE")]
 	public struct CanvasPathCommandCurve {
 		public uint type;
 		public uint relative;
@@ -939,49 +939,49 @@ namespace Goo {
 		public double x2;
 		public double y2;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_SIMPLE", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_PATH_COMMAND_SIMPLE")]
 	public struct CanvasPathCommandSimple {
 		public uint type;
 		public uint relative;
 		public double x;
 		public double y;
 	}
-	[CCode (type_id = "GOO_TYPE_CANVAS_STYLE_PROPERTY", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", type_id = "GOO_TYPE_CANVAS_STYLE_PROPERTY")]
 	public struct CanvasStyleProperty {
 		public GLib.Quark id;
 		public GLib.Value value;
 	}
-	[CCode (cprefix = "CAIRO_ANTIALIAS_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_ANTIALIAS_")]
 	public enum CairoAntialias {
 		DEFAULT,
 		NONE,
 		GRAY,
 		SUBPIXEL
 	}
-	[CCode (cprefix = "CAIRO_FILL_RULE_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_FILL_RULE_")]
 	public enum CairoFillRule {
 		WINDING,
 		EVEN_ODD
 	}
-	[CCode (cprefix = "CAIRO_HINT_METRICS_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_HINT_METRICS_")]
 	public enum CairoHintMetrics {
 		DEFAULT,
 		OFF,
 		ON
 	}
-	[CCode (cprefix = "CAIRO_LINE_CAP_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_LINE_CAP_")]
 	public enum CairoLineCap {
 		BUTT,
 		ROUND,
 		SQUARE
 	}
-	[CCode (cprefix = "CAIRO_LINE_JOIN_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_LINE_JOIN_")]
 	public enum CairoLineJoin {
 		MITER,
 		ROUND,
 		BEVEL
 	}
-	[CCode (cprefix = "CAIRO_OPERATOR_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "CAIRO_OPERATOR_")]
 	public enum CairoOperator {
 		CLEAR,
 		SOURCE,
@@ -998,21 +998,21 @@ namespace Goo {
 		ADD,
 		SATURATE
 	}
-	[CCode (cprefix = "GOO_CANVAS_ANIMATE_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "GOO_CANVAS_ANIMATE_")]
 	public enum CanvasAnimateType {
 		FREEZE,
 		RESET,
 		RESTART,
 		BOUNCE
 	}
-	[CCode (cprefix = "GOO_CANVAS_ITEM_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "GOO_CANVAS_ITEM_")]
 	public enum CanvasItemVisibility {
 		HIDDEN,
 		INVISIBLE,
 		VISIBLE,
 		VISIBLE_ABOVE_THRESHOLD
 	}
-	[CCode (cprefix = "GOO_CANVAS_PATH_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "GOO_CANVAS_PATH_")]
 	public enum CanvasPathCommandType {
 		MOVE_TO,
 		CLOSE_PATH,
@@ -1025,7 +1025,7 @@ namespace Goo {
 		SMOOTH_QUADRATIC_CURVE_TO,
 		ELLIPTICAL_ARC
 	}
-	[CCode (cprefix = "GOO_CANVAS_EVENTS_", cheader_filename = "goocanvas.h")]
+	[CCode (cheader_filename = "goocanvas.h", cprefix = "GOO_CANVAS_EVENTS_")]
 	[Flags]
 	public enum CanvasPointerEvents {
 		VISIBLE_MASK,
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 94d49d0..2b41499 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class AllocTrace {
 		public int flags;
 		public int live;
@@ -19,8 +19,8 @@ namespace Gst {
 		public void set_flags (Gst.AllocTraceFlags flags);
 		public static void set_flags_all (Gst.AllocTraceFlags flags);
 	}
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_atomic_queue_ref", ref_function_void = true, unref_function = "gst_atomic_queue_unref")]
 	[Compact]
-	[CCode (ref_function = "gst_atomic_queue_ref", ref_function_void = true, unref_function = "gst_atomic_queue_unref", cheader_filename = "gst/gst.h")]
 	public class AtomicQueue {
 		[CCode (has_construct_function = false)]
 		public AtomicQueue (uint initial_size);
@@ -41,7 +41,7 @@ namespace Gst {
 		public bool polling;
 		public weak Gst.Clock provided_clock;
 		public bool state_dirty;
-		[CCode (type = "GstElement*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstElement*")]
 		public Bin (string? name);
 		public bool add (owned Gst.Element element);
 		[NoWrapper]
@@ -73,7 +73,7 @@ namespace Gst {
 		public virtual signal void element_added (Gst.Element child);
 		public virtual signal void element_removed (Gst.Element child);
 	}
-	[CCode (ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_buffer_ref", unref_function = "gst_buffer_unref")]
 	public class Buffer : Gst.MiniObject {
 		public weak Gst.Caps caps;
 		[CCode (array_length_cname = "size", array_length_type = "guint")]
@@ -127,7 +127,7 @@ namespace Gst {
 		public static Gst.Buffer? try_new_and_alloc (uint size);
 		public void unref ();
 	}
-	[CCode (ref_function = "gst_buffer_list_ref", unref_function = "gst_buffer_list_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_buffer_list_ref", unref_function = "gst_buffer_list_unref")]
 	public class BufferList : Gst.MiniObject {
 		[CCode (has_construct_function = false)]
 		public BufferList ();
@@ -141,8 +141,8 @@ namespace Gst {
 		public unowned Gst.BufferList @ref ();
 		public void unref ();
 	}
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_BUFFER_LIST_ITERATOR")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_BUFFER_LIST_ITERATOR", cheader_filename = "gst/gst.h")]
 	public class BufferListIterator {
 		public void add (owned Gst.Buffer buffer);
 		public void add_group ();
@@ -186,7 +186,7 @@ namespace Gst {
 		public virtual signal void message (Gst.Message message);
 		public virtual signal void sync_message (Gst.Message message);
 	}
-	[CCode (ref_function = "gst_caps_ref", unref_function = "gst_caps_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_caps_ref", unref_function = "gst_caps_unref")]
 	public class Caps {
 		public Gst.CapsFlags flags;
 		[CCode (has_construct_function = false)]
@@ -291,8 +291,8 @@ namespace Gst {
 		[NoAccessorMethod]
 		public int window_threshold { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class ClockEntry {
 		public weak Gst.Clock clock;
 		public weak GLib.DestroyNotify destroy_data;
@@ -306,8 +306,8 @@ namespace Gst {
 		public void* user_data;
 		public bool woken_up;
 	}
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref")]
 	[Compact]
-	[CCode (ref_function = "gst_clock_id_ref", unref_function = "gst_clock_id_unref", cheader_filename = "gst/gst.h")]
 	public class ClockID {
 		public static int compare_func (void* id1, void* id2);
 		public Gst.ClockTime get_time ();
@@ -320,12 +320,12 @@ namespace Gst {
 		public Gst.ClockReturn wait_async (Gst.ClockCallback func);
 		public Gst.ClockReturn wait_async_full (Gst.ClockCallback func, GLib.DestroyNotify destroy_data);
 	}
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_DATE")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_DATE", cheader_filename = "gst/gst.h")]
 	public class Date {
 	}
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_date_time_ref", type_id = "GST_TYPE_DATE_TIME", unref_function = "gst_date_time_unref")]
 	[Compact]
-	[CCode (ref_function = "gst_date_time_ref", unref_function = "gst_date_time_unref", type_id = "GST_TYPE_DATE_TIME", cheader_filename = "gst/gst.h")]
 	public class DateTime {
 		[CCode (has_construct_function = false)]
 		public DateTime (float tzoffset, int year, int month, int day, int hour, int minute, double seconds);
@@ -348,8 +348,8 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public DateTime.now_utc ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class DebugCategory {
 		[CCode (cname = "GST_CAT_DEBUG")]
 		public void debug (string format, ...);
@@ -382,8 +382,8 @@ namespace Gst {
 		[CCode (cname = "GST_CAT_WARNING_OBJECT")]
 		public void warning_object (GLib.Object obj, string format, ...);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class DebugMessage {
 		public unowned string @get ();
 	}
@@ -532,11 +532,11 @@ namespace Gst {
 		public bool list_is_type (Gst.ElementFactoryListType type);
 		public static Gst.Element? make (string factoryname, string? name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class ElementFactoryListType {
 	}
-	[CCode (ref_function = "gst_event_ref", unref_function = "gst_event_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_event_ref", unref_function = "gst_event_unref")]
 	public class Event : Gst.MiniObject {
 		public weak Gst.Object src;
 		public uint64 timestamp;
@@ -599,25 +599,25 @@ namespace Gst {
 		public static GLib.Quark type_to_quark (Gst.EventType type);
 		public void unref ();
 	}
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_GERROR")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_GERROR", cheader_filename = "gst/gst.h")]
 	public class GError {
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class GhostPad : Gst.Pad {
-		[CCode (type = "GstPad*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstPad*")]
 		public GhostPad (string? name, Gst.Pad target);
 		public static bool activate_pull_default (Gst.Pad pad, bool active);
 		public static bool activate_push_default (Gst.Pad pad, bool active);
-		[CCode (type = "GstPad*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstPad*")]
 		public GhostPad.from_template (string? name, Gst.Pad target, Gst.PadTemplate templ);
 		public Gst.Pad? get_target ();
 		public static bool internal_activate_pull_default (Gst.Pad pad, bool active);
 		public static bool internal_activate_push_default (Gst.Pad pad, bool active);
 		public static Gst.PadLinkReturn link_default (Gst.Pad pad, Gst.Pad peer);
-		[CCode (type = "GstPad*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstPad*")]
 		public GhostPad.no_target (string? name, Gst.PadDirection dir);
-		[CCode (type = "GstPad*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstPad*")]
 		public GhostPad.no_target_from_template (string? name, Gst.PadTemplate templ);
 		public bool set_target (Gst.Pad? newtarget);
 		public static bool setcaps_default (Gst.Pad pad, Gst.Caps caps);
@@ -655,8 +655,8 @@ namespace Gst {
 		public Gst.IndexResolver resolver { owned get; set; }
 		public virtual signal void entry_added (Gst.IndexEntry entry);
 	}
+	[CCode (cheader_filename = "gst/gst.h", copy_function = "gst_index_entry_copy")]
 	[Compact]
-	[CCode (copy_function = "gst_index_entry_copy", cheader_filename = "gst/gst.h")]
 	public class IndexEntry {
 		public Gst.IndexEntryType type;
 		[CCode (cname = "GST_INDEX_ASSOC_FLAGS")]
@@ -687,8 +687,8 @@ namespace Gst {
 		public static Gst.IndexFactory? find (string name);
 		public static Gst.Index? make (string name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class Iterator<T> {
 		public uint32 cookie;
 		public weak GLib.Mutex @lock;
@@ -708,7 +708,7 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public Iterator.single (GLib.Type type, T object, Gst.CopyFunction copy, GLib.FreeFunc free);
 	}
-	[CCode (ref_function = "gst_message_ref", unref_function = "gst_message_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_message_ref", unref_function = "gst_message_unref")]
 	public class Message : Gst.MiniObject {
 		public weak Gst.Object src;
 		public uint64 timestamp;
@@ -808,7 +808,7 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public Message.warning (Gst.Object src, GLib.Error error, string? debug);
 	}
-	[CCode (ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_mini_object_ref", unref_function = "gst_mini_object_unref")]
 	public abstract class MiniObject {
 		public Gst.MiniObjectFlags flags;
 		[CCode (has_construct_function = false)]
@@ -830,7 +830,7 @@ namespace Gst {
 		public void weak_ref (Gst.MiniObjectWeakNotify notify, void* data);
 		public void weak_unref (Gst.MiniObjectWeakNotify notify, void* data);
 	}
-	[CCode (ref_function = "gst_object_ref", unref_function = "gst_object_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_object_ref", unref_function = "gst_object_unref")]
 	public abstract class Object : GLib.Object {
 		public Gst.ObjectFlags flags;
 		public weak GLib.Mutex @lock;
@@ -1038,8 +1038,8 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class ParamSpecMiniObject : GLib.ParamSpec {
 	}
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_PARSE_CONTEXT")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_PARSE_CONTEXT", cheader_filename = "gst/gst.h")]
 	public class ParseContext {
 		[CCode (has_construct_function = false)]
 		public ParseContext ();
@@ -1048,7 +1048,7 @@ namespace Gst {
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class Pipeline : Gst.Bin, Gst.ChildProxy {
-		[CCode (type = "GstElement*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstElement*")]
 		public Pipeline (string? name);
 		public void auto_clock ();
 		public bool get_auto_flush_bus ();
@@ -1106,8 +1106,8 @@ namespace Gst {
 		[CCode (instance_pos = -1)]
 		public bool type_name_filter (Gst.PluginFeature feature, Gst.TypeNameData data);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class Poll {
 		[CCode (has_construct_function = false)]
 		public Poll (bool controllable);
@@ -1143,7 +1143,7 @@ namespace Gst {
 		public static bool setcaps_default (Gst.Pad pad, Gst.Caps caps);
 		public static void unlink_default (Gst.Pad pad);
 	}
-	[CCode (ref_function = "gst_query_ref", unref_function = "gst_query_unref", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", ref_function = "gst_query_ref", unref_function = "gst_query_unref")]
 	public class Query : Gst.MiniObject {
 		public weak Gst.Structure structure;
 		public Gst.QueryType type;
@@ -1231,8 +1231,8 @@ namespace Gst {
 		public virtual signal void feature_added (void* feature);
 		public virtual signal void plugin_added (void* plugin);
 	}
+	[CCode (cheader_filename = "gst/gst.h", copy_function = "gst_segment_copy", type_id = "GST_TYPE_SEGMENT")]
 	[Compact]
-	[CCode (copy_function = "gst_segment_copy", type_id = "GST_TYPE_SEGMENT", cheader_filename = "gst/gst.h")]
 	public class Segment {
 		public double abs_rate;
 		public int64 accum;
@@ -1260,9 +1260,9 @@ namespace Gst {
 		public int64 to_running_time (Gst.Format format, int64 position);
 		public int64 to_stream_time (Gst.Format format, int64 position);
 	}
+	[CCode (cheader_filename = "gst/gst.h", copy_function = "gst_structure_copy", type_id = "GST_TYPE_STRUCTURE")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "gst_structure_copy", type_id = "GST_TYPE_STRUCTURE", cheader_filename = "gst/gst.h")]
 	public class Structure {
 		[CCode (has_construct_function = false)]
 		public Structure (string name, string firstfield, ...);
@@ -1338,8 +1338,8 @@ namespace Gst {
 		[NoAccessorMethod]
 		public Gst.ClockType clock_type { get; set; }
 	}
+	[CCode (cheader_filename = "gst/gst.h", copy_function = "gst_tag_list_copy")]
 	[Compact]
-	[CCode (copy_function = "gst_tag_list_copy", cheader_filename = "gst/gst.h")]
 	public class TagList {
 		[CCode (has_construct_function = false)]
 		public TagList ();
@@ -1430,14 +1430,14 @@ namespace Gst {
 		public virtual void prepare () throws GLib.Error;
 		public virtual void* push (Gst.TaskPoolFunction func) throws GLib.Error;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class TaskThreadCallbacks {
 		public weak GLib.Callback enter_thread;
 		public weak GLib.Callback leave_thread;
 	}
+	[CCode (cheader_filename = "gst/gst.h", free_function = "gst_trace_destroy")]
 	[Compact]
-	[CCode (free_function = "gst_trace_destroy", cheader_filename = "gst/gst.h")]
 	public class Trace {
 		public weak Gst.TraceEntry buf;
 		public int bufoffset;
@@ -1451,8 +1451,8 @@ namespace Gst {
 		public void set_default ();
 		public void text_flush ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class TraceEntry {
 		public uint32 data;
 		[CCode (array_length = false)]
@@ -1460,8 +1460,8 @@ namespace Gst {
 		public uint32 sequence;
 		public int64 timestamp;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class TypeFind {
 		public void* data;
 		[CCode (cname = "gst_type_find_get_length")]
@@ -1493,14 +1493,14 @@ namespace Gst {
 		[CCode (cname = "gst_type_find_factory_get_list")]
 		public static GLib.List<Gst.PluginFeature> get_list ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class TypeNameData {
 		public weak string name;
 		public GLib.Type type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class ValueTable {
 		public weak Gst.ValueCompareFunc compare;
 		public weak Gst.ValueDeserializeFunc deserialize;
@@ -1590,12 +1590,12 @@ namespace Gst {
 		[HasEmitter]
 		public signal void new_uri (string uri);
 	}
-	[CCode (type_id = "GST_TYPE_ARRAY", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_ARRAY")]
 	public struct Array {
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	[SimpleType]
 	[IntegerType (rank = 0)]
+	[SimpleType]
 	public struct ClockTime : uint64 {
 		[CCode (cname = "GST_TIME_ARGS")]
 		public unowned string args ();
@@ -1603,45 +1603,45 @@ namespace Gst {
 		public bool is_valid ();
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
-	[SimpleType]
 	[IntegerType (rank = 0)]
+	[SimpleType]
 	public struct ClockTimeDiff : int64 {
 	}
-	[CCode (type_id = "GST_TYPE_DOUBLE_RANGE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_DOUBLE_RANGE")]
 	public struct DoubleRange {
 	}
-	[CCode (type_id = "GST_TYPE_ELEMENT_DETAILS", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_ELEMENT_DETAILS")]
 	public struct ElementDetails {
 		public weak string longname;
 		public weak string klass;
 		public weak string description;
 		public weak string author;
 	}
-	[CCode (type_id = "GST_TYPE_FORMAT_DEFINITION", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FORMAT_DEFINITION")]
 	public struct FormatDefinition {
 		public Gst.Format value;
 		public weak string nick;
 		public weak string description;
 		public GLib.Quark quark;
 	}
-	[CCode (type_id = "GST_TYPE_FRACTION", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FRACTION")]
 	public struct Fraction {
 	}
-	[CCode (type_id = "GST_TYPE_FRACTION_RANGE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_FRACTION_RANGE")]
 	public struct FractionRange {
 	}
-	[CCode (type_id = "GST_TYPE_INDEX_ASSOCIATION", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_INDEX_ASSOCIATION")]
 	public struct IndexAssociation {
 		public Gst.Format format;
 		public int64 value;
 	}
-	[CCode (type_id = "GST_TYPE_INT_RANGE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_INT_RANGE")]
 	public struct IntRange {
 	}
-	[CCode (type_id = "GST_TYPE_LIST", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_LIST")]
 	public struct List {
 	}
-	[CCode (type_id = "GST_TYPE_PLUGIN_DESC", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_PLUGIN_DESC")]
 	public struct PluginDesc {
 		public int major_version;
 		public int minor_version;
@@ -1655,7 +1655,7 @@ namespace Gst {
 		public weak string origin;
 		public weak void*[] _gst_reserved;
 	}
-	[CCode (type_id = "GST_TYPE_POLL_FD", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_POLL_FD")]
 	public struct PollFD {
 		public int fd;
 		public int idx;
@@ -1668,20 +1668,20 @@ namespace Gst {
 		public static void ignored (Gst.Poll @set, Gst.PollFD fd);
 		public void init ();
 	}
-	[CCode (type_id = "GST_TYPE_QUERY_TYPE_DEFINITION", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_QUERY_TYPE_DEFINITION")]
 	public struct QueryTypeDefinition {
 		public weak string description;
 		public weak string nick;
 		public GLib.Quark quark;
 		public Gst.QueryType value;
 	}
-	[CCode (type_id = "GST_TYPE_STATIC_CAPS", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_STATIC_CAPS")]
 	public struct StaticCaps {
 		[CCode (cname = "string")]
 		public weak string str;
 		public Gst.Caps @get ();
 	}
-	[CCode (type_id = "GST_TYPE_STATIC_PAD_TEMPLATE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_STATIC_PAD_TEMPLATE")]
 	public struct StaticPadTemplate {
 		public weak string name_template;
 		public Gst.PadDirection direction;
@@ -1690,7 +1690,7 @@ namespace Gst {
 		public Gst.PadTemplate @get ();
 		public Gst.Caps get_caps ();
 	}
-	[CCode (cname = "GValue", type_id = "G_TYPE_VALUE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cname = "GValue", type_id = "G_TYPE_VALUE")]
 	public struct Value : GLib.Value {
 		public void array_append_value (Gst.Value append_value);
 		public uint array_get_size ();
@@ -1750,19 +1750,19 @@ namespace Gst {
 		public void take_buffer (Gst.Buffer b);
 		public static bool union (Gst.Value dest, Gst.Value value1, Gst.Value value2);
 	}
-	[CCode (cprefix = "GST_ACTIVATE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ACTIVATE_")]
 	public enum ActivateMode {
 		NONE,
 		PUSH,
 		PULL
 	}
-	[CCode (cprefix = "GST_ALLOC_TRACE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ALLOC_TRACE_")]
 	[Flags]
 	public enum AllocTraceFlags {
 		LIVE,
 		MEM_LIVE
 	}
-	[CCode (cprefix = "GST_ASSOCIATION_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ASSOCIATION_FLAG_")]
 	[Flags]
 	public enum AssocFlags {
 		NONE,
@@ -1770,19 +1770,19 @@ namespace Gst {
 		DELTA_UNIT,
 		LAST
 	}
-	[CCode (cprefix = "GST_BIN_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BIN_FLAG_")]
 	[Flags]
 	public enum BinFlags {
 		LAST
 	}
-	[CCode (cprefix = "GST_BUFFER_COPY_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUFFER_COPY_")]
 	[Flags]
 	public enum BufferCopyFlags {
 		FLAGS,
 		TIMESTAMPS,
 		CAPS
 	}
-	[CCode (cprefix = "GST_BUFFER_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUFFER_FLAG_")]
 	[Flags]
 	public enum BufferFlag {
 		READONLY,
@@ -1797,47 +1797,47 @@ namespace Gst {
 		MEDIA3,
 		LAST
 	}
-	[CCode (cprefix = "GST_BUFFER_LIST_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUFFER_LIST_")]
 	public enum BufferListItem {
 		CONTINUE,
 		SKIP_GROUP,
 		END
 	}
-	[CCode (cprefix = "GST_BUFFERING_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUFFERING_")]
 	public enum BufferingMode {
 		STREAM,
 		DOWNLOAD,
 		TIMESHIFT,
 		LIVE
 	}
-	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUS_")]
 	[Flags]
 	public enum BusFlags {
 		FLUSHING,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_BUS_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BUS_")]
 	public enum BusSyncReply {
 		DROP,
 		PASS,
 		ASYNC
 	}
-	[CCode (cprefix = "GST_CAPS_FLAGS_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CAPS_FLAGS_")]
 	[Flags]
 	public enum CapsFlags {
 		ANY
 	}
-	[CCode (cprefix = "GST_CAPS_INTERSECT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CAPS_INTERSECT_")]
 	public enum CapsIntersectMode {
 		ZIG_ZAG,
 		FIRST
 	}
-	[CCode (cprefix = "GST_CLOCK_ENTRY_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CLOCK_ENTRY_")]
 	public enum ClockEntryType {
 		SINGLE,
 		PERIODIC
 	}
-	[CCode (cprefix = "GST_CLOCK_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CLOCK_FLAG_")]
 	[Flags]
 	public enum ClockFlags {
 		CAN_DO_SINGLE_SYNC,
@@ -1848,7 +1848,7 @@ namespace Gst {
 		CAN_SET_MASTER,
 		LAST
 	}
-	[CCode (cprefix = "GST_CLOCK_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CLOCK_")]
 	public enum ClockReturn {
 		OK,
 		EARLY,
@@ -1859,12 +1859,12 @@ namespace Gst {
 		UNSUPPORTED,
 		DONE
 	}
-	[CCode (cprefix = "GST_CLOCK_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CLOCK_TYPE_")]
 	public enum ClockType {
 		REALTIME,
 		MONOTONIC
 	}
-	[CCode (cprefix = "GST_DEBUG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_DEBUG_")]
 	public enum DebugColorFlags {
 		FG_BLACK,
 		FG_RED,
@@ -1885,7 +1885,7 @@ namespace Gst {
 		BOLD,
 		UNDERLINE
 	}
-	[CCode (cprefix = "GST_DEBUG_GRAPH_SHOW_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_DEBUG_GRAPH_SHOW_")]
 	[Flags]
 	public enum DebugGraphDetails {
 		MEDIA_TYPE,
@@ -1894,7 +1894,7 @@ namespace Gst {
 		STATES,
 		ALL
 	}
-	[CCode (cprefix = "GST_LEVEL_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_LEVEL_")]
 	public enum DebugLevel {
 		NONE,
 		ERROR,
@@ -1909,7 +1909,7 @@ namespace Gst {
 		[CCode (cname = "gst_debug_level_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_ELEMENT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ELEMENT_")]
 	[Flags]
 	public enum ElementFlags {
 		LOCKED_STATE,
@@ -1918,7 +1918,7 @@ namespace Gst {
 		IS_SOURCE,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_EVENT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_EVENT_")]
 	public enum EventType {
 		UNKNOWN,
 		FLUSH_START,
@@ -1944,14 +1944,14 @@ namespace Gst {
 		[CCode (cname = "gst_event_type_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_EVENT_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_EVENT_TYPE_")]
 	[Flags]
 	public enum EventTypeFlags {
 		UPSTREAM,
 		DOWNSTREAM,
 		SERIALIZED
 	}
-	[CCode (cprefix = "GST_FLOW_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_FLOW_")]
 	public enum FlowReturn {
 		CUSTOM_SUCCESS_2,
 		CUSTOM_SUCCESS_1,
@@ -1974,7 +1974,7 @@ namespace Gst {
 		[CCode (cname = "gst_flow_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_FORMAT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_FORMAT_")]
 	public enum Format {
 		UNDEFINED,
 		DEFAULT,
@@ -1990,52 +1990,52 @@ namespace Gst {
 		public const int64 PERCENT_MAX;
 		public const int64 PERCENT_SCALE;
 	}
-	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_")]
 	public enum IndexCertainty {
 		UNKNOWN,
 		CERTAIN,
 		FUZZY
 	}
-	[CCode (cprefix = "GST_INDEX_ENTRY_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_ENTRY_")]
 	public enum IndexEntryType {
 		ID,
 		ASSOCIATION,
 		OBJECT,
 		FORMAT
 	}
-	[CCode (cprefix = "GST_INDEX_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_")]
 	[Flags]
 	public enum IndexFlags {
 		WRITABLE,
 		READABLE,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_INDEX_LOOKUP_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_LOOKUP_")]
 	public enum IndexLookupMethod {
 		EXACT,
 		BEFORE,
 		AFTER
 	}
-	[CCode (cprefix = "GST_INDEX_RESOLVER_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_INDEX_RESOLVER_")]
 	public enum IndexResolverMethod {
 		CUSTOM,
 		GTYPE,
 		PATH
 	}
-	[CCode (cprefix = "GST_ITERATOR_ITEM_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ITERATOR_ITEM_")]
 	public enum IteratorItem {
 		SKIP,
 		PASS,
 		END
 	}
-	[CCode (cprefix = "GST_ITERATOR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ITERATOR_")]
 	public enum IteratorResult {
 		DONE,
 		OK,
 		RESYNC,
 		ERROR
 	}
-	[CCode (cprefix = "GST_LIBRARY_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_LIBRARY_ERROR_")]
 	public enum LibraryError {
 		FAILED,
 		TOO_LAZY,
@@ -2045,7 +2045,7 @@ namespace Gst {
 		ENCODE,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GST_MESSAGE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_MESSAGE_")]
 	[Flags]
 	public enum MessageType {
 		UNKNOWN,
@@ -2081,27 +2081,27 @@ namespace Gst {
 		[CCode (cname = "gst_message_type_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_MINI_OBJECT_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_MINI_OBJECT_FLAG_")]
 	[Flags]
 	public enum MiniObjectFlags {
 		READONLY,
 		RESERVED1,
 		LAST
 	}
-	[CCode (cprefix = "GST_OBJECT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_OBJECT_")]
 	[Flags]
 	public enum ObjectFlags {
 		DISPOSING,
 		FLOATING,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_")]
 	public enum PadDirection {
 		UNKNOWN,
 		SRC,
 		SINK
 	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_")]
 	[Flags]
 	public enum PadFlags {
 		BLOCKED,
@@ -2111,7 +2111,7 @@ namespace Gst {
 		BLOCKING,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_PAD_LINK_CHECK_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_LINK_CHECK_")]
 	[Flags]
 	public enum PadLinkCheck {
 		NOTHING,
@@ -2119,7 +2119,7 @@ namespace Gst {
 		TEMPLATE_CAPS,
 		CAPS
 	}
-	[CCode (cprefix = "GST_PAD_LINK_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_LINK_")]
 	public enum PadLinkReturn {
 		OK,
 		WRONG_HIERARCHY,
@@ -2133,19 +2133,19 @@ namespace Gst {
 		[CCode (cname = "GST_PAD_LINK_SUCCESSFUL")]
 		public bool successful ();
 	}
-	[CCode (cprefix = "GST_PAD_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_")]
 	public enum PadPresence {
 		ALWAYS,
 		SOMETIMES,
 		REQUEST
 	}
-	[CCode (cprefix = "GST_PAD_TEMPLATE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_TEMPLATE_")]
 	[Flags]
 	public enum PadTemplateFlags {
 		FIXED,
 		FLAG_LAST
 	}
-	[CCode (cprefix = "GST_PARSE_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PARSE_ERROR_")]
 	public enum ParseError {
 		SYNTAX,
 		NO_SUCH_ELEMENT,
@@ -2155,19 +2155,19 @@ namespace Gst {
 		EMPTY_BIN,
 		EMPTY
 	}
-	[CCode (cprefix = "GST_PARSE_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PARSE_FLAG_")]
 	[Flags]
 	public enum ParseFlags {
 		NONE,
 		FATAL_ERRORS
 	}
-	[CCode (cprefix = "GST_PIPELINE_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PIPELINE_FLAG_")]
 	[Flags]
 	public enum PipelineFlags {
 		FIXED_CLOCK,
 		LAST
 	}
-	[CCode (cprefix = "GST_PLUGIN_DEPENDENCY_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PLUGIN_DEPENDENCY_FLAG_")]
 	[Flags]
 	public enum PluginDependencyFlags {
 		NONE,
@@ -2175,19 +2175,19 @@ namespace Gst {
 		PATHS_ARE_DEFAULT_ONLY,
 		FILE_NAME_IS_SUFFIX
 	}
-	[CCode (cprefix = "GST_PLUGIN_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PLUGIN_ERROR_")]
 	public enum PluginError {
 		MODULE,
 		DEPENDENCIES,
 		NAME_MISMATCH
 	}
-	[CCode (cprefix = "GST_PLUGIN_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PLUGIN_FLAG_")]
 	[Flags]
 	public enum PluginFlags {
 		CACHED,
 		BLACKLISTED
 	}
-	[CCode (cprefix = "GST_PROGRESS_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PROGRESS_TYPE_")]
 	public enum ProgressType {
 		START,
 		CONTINUE,
@@ -2195,13 +2195,13 @@ namespace Gst {
 		CANCELED,
 		ERROR
 	}
-	[CCode (cprefix = "GST_QOS_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_QOS_TYPE_")]
 	public enum QOSType {
 		OVERFLOW,
 		UNDERFLOW,
 		THROTTLE
 	}
-	[CCode (cprefix = "GST_QUERY_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_QUERY_")]
 	public enum QueryType {
 		NONE,
 		POSITION,
@@ -2225,14 +2225,14 @@ namespace Gst {
 		[CCode (cname = "gst_query_type_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_RANK_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_RANK_")]
 	public enum Rank {
 		NONE,
 		MARGINAL,
 		SECONDARY,
 		PRIMARY
 	}
-	[CCode (cprefix = "GST_RESOURCE_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_RESOURCE_ERROR_")]
 	public enum ResourceError {
 		FAILED,
 		TOO_LAZY,
@@ -2250,13 +2250,13 @@ namespace Gst {
 		NO_SPACE_LEFT,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GST_SEARCH_MODE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_SEARCH_MODE_")]
 	public enum SearchMode {
 		EXACT,
 		BEFORE,
 		AFTER
 	}
-	[CCode (cprefix = "GST_SEEK_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_SEEK_FLAG_")]
 	[Flags]
 	public enum SeekFlags {
 		NONE,
@@ -2266,14 +2266,14 @@ namespace Gst {
 		SEGMENT,
 		SKIP
 	}
-	[CCode (cprefix = "GST_SEEK_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_SEEK_TYPE_")]
 	public enum SeekType {
 		NONE,
 		CUR,
 		SET,
 		END
 	}
-	[CCode (cprefix = "GST_STATE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STATE_")]
 	public enum State {
 		VOID_PENDING,
 		NULL,
@@ -2285,7 +2285,7 @@ namespace Gst {
 		[CCode (cname = "gst_element_state_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STATE_CHANGE_")]
 	public enum StateChange {
 		NULL_TO_READY,
 		READY_TO_PAUSED,
@@ -2300,7 +2300,7 @@ namespace Gst {
 		[CCode (cname = "GST_STATE_TRANSITION_NEXT")]
 		public static Gst.State transition_next ();
 	}
-	[CCode (cprefix = "GST_STATE_CHANGE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STATE_CHANGE_")]
 	public enum StateChangeReturn {
 		FAILURE,
 		SUCCESS,
@@ -2309,7 +2309,7 @@ namespace Gst {
 		[CCode (cname = "gst_element_state_change_return_get_name")]
 		public unowned string to_string ();
 	}
-	[CCode (cprefix = "GST_STREAM_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STREAM_ERROR_")]
 	public enum StreamError {
 		FAILED,
 		TOO_LAZY,
@@ -2326,7 +2326,7 @@ namespace Gst {
 		DECRYPT_NOKEY,
 		NUM_ERRORS
 	}
-	[CCode (cprefix = "GST_STREAM_STATUS_TYPE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STREAM_STATUS_TYPE_")]
 	public enum StreamStatusType {
 		CREATE,
 		ENTER,
@@ -2336,12 +2336,12 @@ namespace Gst {
 		PAUSE,
 		STOP
 	}
-	[CCode (cprefix = "GST_STRUCTURE_CHANGE_TYPE_PAD_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STRUCTURE_CHANGE_TYPE_PAD_")]
 	public enum StructureChangeType {
 		LINK,
 		UNLINK
 	}
-	[CCode (cprefix = "GST_TAG_FLAG_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_TAG_FLAG_")]
 	public enum TagFlag {
 		UNDEFINED,
 		META,
@@ -2349,7 +2349,7 @@ namespace Gst {
 		DECODED,
 		COUNT
 	}
-	[CCode (cprefix = "GST_TAG_MERGE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_TAG_MERGE_")]
 	public enum TagMergeMode {
 		UNDEFINED,
 		REPLACE_ALL,
@@ -2360,13 +2360,13 @@ namespace Gst {
 		KEEP_ALL,
 		COUNT
 	}
-	[CCode (cprefix = "GST_TASK_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_TASK_")]
 	public enum TaskState {
 		STARTED,
 		STOPPED,
 		PAUSED
 	}
-	[CCode (cprefix = "GST_TYPE_FIND_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_TYPE_FIND_")]
 	public enum TypeFindProbability {
 		MINIMUM,
 		POSSIBLE,
@@ -2374,13 +2374,13 @@ namespace Gst {
 		NEARLY_CERTAIN,
 		MAXIMUM
 	}
-	[CCode (cprefix = "GST_URI_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_URI_")]
 	public enum URIType {
 		UNKNOWN,
 		SINK,
 		SRC
 	}
-	[CCode (cprefix = "GST_CORE_ERROR_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CORE_ERROR_")]
 	public errordomain CoreError {
 		FAILED,
 		TOO_LAZY,
@@ -2822,9 +2822,9 @@ namespace Gst {
 	public static GLib.Quark core_error_quark ();
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static void debug_add_log_function (Gst.LogFunction func, void* data);
-	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cname = "GST_DEBUG_BIN_TO_DOT_FILE")]
 	public static void debug_bin_to_dot_file (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
-	[CCode (cname = "GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cname = "GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS")]
 	public static void debug_bin_to_dot_file_with_ts (Gst.Bin bin, Gst.DebugGraphDetails details, string prefix);
 	[CCode (cheader_filename = "gst/gst.h")]
 	public static unowned string debug_construct_term_color (uint colorinfo);
diff --git a/vapi/gstreamer-app-0.10.vapi b/vapi/gstreamer-app-0.10.vapi
index 1075b72..e47a834 100644
--- a/vapi/gstreamer-app-0.10.vapi
+++ b/vapi/gstreamer-app-0.10.vapi
@@ -20,8 +20,8 @@ namespace Gst {
 		public virtual signal void new_buffer_list ();
 		public virtual signal void new_preroll ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/app/gstappsink.h")]
+	[Compact]
 	public class AppSinkCallbacks {
 		public weak GLib.Callback eos;
 		public weak GLib.Callback new_buffer;
@@ -56,14 +56,14 @@ namespace Gst {
 		public virtual signal void need_data (uint length);
 		public virtual signal bool seek_data (uint64 offset);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/app/gstappsrc.h")]
+	[Compact]
 	public class AppSrcCallbacks {
 		public weak GLib.Callback enough_data;
 		public weak GLib.Callback need_data;
 		public weak GLib.Callback seek_data;
 	}
-	[CCode (cprefix = "GST_APP_STREAM_TYPE_", cheader_filename = "gst/app/gstappsrc.h")]
+	[CCode (cheader_filename = "gst/app/gstappsrc.h", cprefix = "GST_APP_STREAM_TYPE_")]
 	public enum AppStreamType {
 		STREAM,
 		SEEKABLE,
diff --git a/vapi/gstreamer-audio-0.10.vapi b/vapi/gstreamer-audio-0.10.vapi
index ce3bce7..95986ca 100644
--- a/vapi/gstreamer-audio-0.10.vapi
+++ b/vapi/gstreamer-audio-0.10.vapi
@@ -8,10 +8,10 @@ namespace Gst {
 		public weak Gst.AudioClockGetTimeFunc func;
 		public Gst.ClockTime last_time;
 		public void* user_data;
-		[CCode (type = "GstClock*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstClock*")]
 		public AudioClock (string name, Gst.AudioClockGetTimeFunc func);
 		public static Gst.ClockTime adjust (Gst.Clock clock, Gst.ClockTime time);
-		[CCode (type = "GstClock*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstClock*")]
 		public AudioClock.full (string name, Gst.AudioClockGetTimeFunc func, GLib.DestroyNotify destroy_notify);
 		public static Gst.ClockTime get_time (Gst.Clock clock);
 		public static void invalidate (Gst.Clock clock);
@@ -167,8 +167,8 @@ namespace Gst {
 		public virtual bool start ();
 		public virtual bool stop ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/audio/gstaudiofilter.h")]
+	[Compact]
 	public class RingBufferSpec {
 		public bool bigend;
 		public uint64 buffer_time;
@@ -188,7 +188,7 @@ namespace Gst {
 		public Gst.BufferFormatType type;
 		public int width;
 	}
-	[CCode (cprefix = "GST_AUDIO_CHANNEL_POSITION_", cheader_filename = "gst/audio/multichannel.h")]
+	[CCode (cheader_filename = "gst/audio/multichannel.h", cprefix = "GST_AUDIO_CHANNEL_POSITION_")]
 	public enum AudioChannelPosition {
 		INVALID,
 		FRONT_MONO,
@@ -206,7 +206,7 @@ namespace Gst {
 		NONE,
 		NUM
 	}
-	[CCode (cprefix = "GST_AUDIO_FIELD_", has_type_id = false, cheader_filename = "gst/audio/audio.h")]
+	[CCode (cheader_filename = "gst/audio/audio.h", cprefix = "GST_AUDIO_FIELD_", has_type_id = false)]
 	public enum AudioFieldFlag {
 		RATE,
 		CHANNELS,
@@ -215,20 +215,20 @@ namespace Gst {
 		DEPTH,
 		SIGNED
 	}
-	[CCode (cprefix = "GST_BASE_AUDIO_SINK_SLAVE_", cheader_filename = "gst/audio/gstbaseaudiosink.h")]
+	[CCode (cheader_filename = "gst/audio/gstbaseaudiosink.h", cprefix = "GST_BASE_AUDIO_SINK_SLAVE_")]
 	public enum BaseAudioSinkSlaveMethod {
 		RESAMPLE,
 		SKEW,
 		NONE
 	}
-	[CCode (cprefix = "GST_BASE_AUDIO_SRC_SLAVE_", cheader_filename = "gst/audio/audio.h")]
+	[CCode (cheader_filename = "gst/audio/audio.h", cprefix = "GST_BASE_AUDIO_SRC_SLAVE_")]
 	public enum BaseAudioSrcSlaveMethod {
 		RESAMPLE,
 		RETIMESTAMP,
 		SKEW,
 		NONE
 	}
-	[CCode (cprefix = "GST_", cheader_filename = "gst/audio/gstringbuffer.h")]
+	[CCode (cheader_filename = "gst/audio/gstringbuffer.h", cprefix = "GST_")]
 	public enum BufferFormat {
 		UNKNOWN,
 		S8,
@@ -273,7 +273,7 @@ namespace Gst {
 		MPEG2_AAC,
 		MPEG4_AAC
 	}
-	[CCode (cprefix = "GST_BUFTYPE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+	[CCode (cheader_filename = "gst/audio/gstringbuffer.h", cprefix = "GST_BUFTYPE_")]
 	public enum BufferFormatType {
 		LINEAR,
 		FLOAT,
@@ -289,14 +289,14 @@ namespace Gst {
 		MPEG2_AAC,
 		MPEG4_AAC
 	}
-	[CCode (cprefix = "GST_SEGSTATE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+	[CCode (cheader_filename = "gst/audio/gstringbuffer.h", cprefix = "GST_SEGSTATE_")]
 	public enum RingBufferSegState {
 		INVALID,
 		EMPTY,
 		FILLED,
 		PARTIAL
 	}
-	[CCode (cprefix = "GST_RING_BUFFER_STATE_", cheader_filename = "gst/audio/gstringbuffer.h")]
+	[CCode (cheader_filename = "gst/audio/gstringbuffer.h", cprefix = "GST_RING_BUFFER_STATE_")]
 	public enum RingBufferState {
 		STOPPED,
 		PAUSED,
diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index 58ca951..bec20fc 100644
--- a/vapi/gstreamer-base-0.10.vapi
+++ b/vapi/gstreamer-base-0.10.vapi
@@ -59,8 +59,8 @@ namespace Gst {
 		[NoWrapper]
 		public virtual bool stop ();
 	}
+	[CCode (cheader_filename = "gst/gst.h", type_id = "GST_TYPE_BASE_PARSE_FRAME")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_BASE_PARSE_FRAME", cheader_filename = "gst/gst.h")]
 	public class BaseParseFrame {
 		public weak Gst.Buffer buffer;
 		public uint flags;
@@ -214,7 +214,7 @@ namespace Gst {
 		[NoWrapper]
 		public virtual bool query (Gst.Query query);
 		public bool query_latency (bool live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency);
-		[CCode (type = "gboolean", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "gboolean")]
 		public BaseSrc.seamless_segment (Gst.BaseSrc src, int64 start, int64 stop, int64 position);
 		public void set_blocksize (ulong blocksize);
 		[NoWrapper]
@@ -301,8 +301,8 @@ namespace Gst {
 		[NoAccessorMethod]
 		public bool qos { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/base/gstbitreader.h")]
+	[Compact]
 	public class BitReader {
 		public uint bit;
 		public uint byte;
@@ -329,8 +329,8 @@ namespace Gst {
 		public bool skip (uint nbits);
 		public bool skip_to_byte ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/base/gstbytereader.h")]
+	[Compact]
 	public class ByteReader {
 		public uint byte;
 		public uchar data;
@@ -403,8 +403,8 @@ namespace Gst {
 		public bool skip_string_utf32 ();
 		public bool skip_string_utf8 ();
 	}
+	[CCode (cheader_filename = "gst/base/gstbytewriter.h", free_function = "gst_byte_writer_free")]
 	[Compact]
-	[CCode (free_function = "gst_byte_writer_free", cheader_filename = "gst/base/gstbytewriter.h")]
 	public class ByteWriter : Gst.ByteReader {
 		public uint alloc_size;
 		public bool fixed;
@@ -456,8 +456,8 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public ByteWriter.with_size (uint size, bool fixed);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/base/gstcollectpads.h")]
+	[Compact]
 	public class CollectData {
 		public Gst.Buffer buffer;
 		public weak Gst.CollectPads collect;
@@ -532,8 +532,8 @@ namespace Gst {
 		public virtual signal void empty ();
 		public virtual signal void full ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
+	[Compact]
 	public class DataQueueItem {
 		public weak GLib.DestroyNotify destroy;
 		public uint64 duration;
@@ -541,8 +541,8 @@ namespace Gst {
 		public uint size;
 		public bool visible;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/base/gstdataqueue.h")]
+	[Compact]
 	public class DataQueueSize {
 		public uint bytes;
 		public uint64 time;
@@ -555,13 +555,13 @@ namespace Gst {
 		[NoWrapper]
 		public virtual Gst.FlowReturn create (out unowned Gst.Buffer buf);
 	}
-	[CCode (cprefix = "GST_BASE_PARSE_FRAME_FLAG_", has_type_id = false, cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_BASE_PARSE_FRAME_FLAG_", has_type_id = false)]
 	public enum BaseParseFrameFlags {
 		NONE,
 		NO_FRAME,
 		CLIP
 	}
-	[CCode (cprefix = "GST_BASE_SRC_", has_type_id = false, cheader_filename = "gst/base/gstbasesrc.h")]
+	[CCode (cheader_filename = "gst/base/gstbasesrc.h", cprefix = "GST_BASE_SRC_", has_type_id = false)]
 	public enum BaseSrcFlags {
 		STARTED,
 		FLAG_LAST
diff --git a/vapi/gstreamer-cdda-0.10.vapi b/vapi/gstreamer-cdda-0.10.vapi
index 1e9c690..0131223 100644
--- a/vapi/gstreamer-cdda-0.10.vapi
+++ b/vapi/gstreamer-cdda-0.10.vapi
@@ -41,8 +41,8 @@ namespace Gst {
 		[NoAccessorMethod]
 		public uint track { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/cdda/gstcddabasesrc.h")]
+	[Compact]
 	public class CddaBaseSrcTrack {
 		public uint end;
 		public bool is_audio;
@@ -50,7 +50,7 @@ namespace Gst {
 		public uint start;
 		public weak Gst.TagList tags;
 	}
-	[CCode (cprefix = "GST_CDDA_BASE_SRC_MODE_", cheader_filename = "gst/cdda/gstcddabasesrc.h")]
+	[CCode (cheader_filename = "gst/cdda/gstcddabasesrc.h", cprefix = "GST_CDDA_BASE_SRC_MODE_")]
 	public enum CddaBaseSrcMode {
 		NORMAL,
 		CONTINUOUS
diff --git a/vapi/gstreamer-check-0.10.vapi b/vapi/gstreamer-check-0.10.vapi
index 9d4364f..76ecdff 100644
--- a/vapi/gstreamer-check-0.10.vapi
+++ b/vapi/gstreamer-check-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
+	[Compact]
 	public class CheckABIStruct {
 		public int abi_size;
 		public weak string name;
diff --git a/vapi/gstreamer-controller-0.10.vapi b/vapi/gstreamer-controller-0.10.vapi
index bb905cd..5a884da 100644
--- a/vapi/gstreamer-controller-0.10.vapi
+++ b/vapi/gstreamer-controller-0.10.vapi
@@ -73,21 +73,21 @@ namespace Gst {
 		[NoAccessorMethod]
 		public Gst.LFOWaveform waveform { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
+	[Compact]
 	public class TimedValue {
 		public Gst.ClockTime timestamp;
 		public Gst.Value value;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
+	[Compact]
 	public class ValueArray {
 		public int nbsamples;
 		public weak string property_name;
 		public Gst.ClockTime sample_interval;
 		public void* values;
 	}
-	[CCode (cprefix = "GST_INTERPOLATE_", has_type_id = false, cheader_filename = "gst/controller/gstcontroller.h")]
+	[CCode (cheader_filename = "gst/controller/gstcontroller.h", cprefix = "GST_INTERPOLATE_", has_type_id = false)]
 	public enum InterpolateMode {
 		NONE,
 		TRIGGER,
@@ -96,7 +96,7 @@ namespace Gst {
 		CUBIC,
 		USER
 	}
-	[CCode (cprefix = "GST_LFO_WAVEFORM_", cheader_filename = "gst/controller/gstlfocontrolsource.h")]
+	[CCode (cheader_filename = "gst/controller/gstlfocontrolsource.h", cprefix = "GST_LFO_WAVEFORM_")]
 	public enum LFOWaveform {
 		SINE,
 		SQUARE,
diff --git a/vapi/gstreamer-dataprotocol-0.10.vapi b/vapi/gstreamer-dataprotocol-0.10.vapi
index 6af1e0b..368e703 100644
--- a/vapi/gstreamer-dataprotocol-0.10.vapi
+++ b/vapi/gstreamer-dataprotocol-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[Compact]
 	public class DPPacketizer {
 		public weak Gst.DPHeaderFromBufferFunction header_from_buffer;
 		public weak Gst.DPPacketFromCapsFunction packet_from_caps;
@@ -12,21 +12,21 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public DPPacketizer (Gst.DPVersion version);
 	}
-	[CCode (cprefix = "GST_DP_HEADER_FLAG_", has_type_id = false, cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", cprefix = "GST_DP_HEADER_FLAG_", has_type_id = false)]
 	public enum DPHeaderFlag {
 		NONE,
 		CRC_HEADER,
 		CRC_PAYLOAD,
 		CRC
 	}
-	[CCode (cprefix = "GST_DP_PAYLOAD_", has_type_id = false, cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", cprefix = "GST_DP_PAYLOAD_", has_type_id = false)]
 	public enum DPPayloadType {
 		NONE,
 		BUFFER,
 		CAPS,
 		EVENT_NONE
 	}
-	[CCode (cprefix = "GST_DP_VERSION_", cheader_filename = "gst/dataprotocol/dataprotocol.h")]
+	[CCode (cheader_filename = "gst/dataprotocol/dataprotocol.h", cprefix = "GST_DP_VERSION_")]
 	public enum DPVersion {
 		@0_2,
 		@1_0
diff --git a/vapi/gstreamer-fft-0.10.vapi b/vapi/gstreamer-fft-0.10.vapi
index e97fbb9..92287b7 100644
--- a/vapi/gstreamer-fft-0.10.vapi
+++ b/vapi/gstreamer-fft-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf32.h")]
+	[Compact]
 	public class FFTF32 {
 		public void* cfg;
 		public bool inverse;
@@ -14,14 +14,14 @@ namespace Gst {
 		public void inverse_fft (Gst.FFTF32Complex freqdata, float timedata);
 		public void window (float timedata, Gst.FFTWindow window);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf32.h")]
+	[Compact]
 	public class FFTF32Complex {
 		public float i;
 		public float r;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf64.h")]
+	[Compact]
 	public class FFTF64 {
 		public void* cfg;
 		public bool inverse;
@@ -32,14 +32,14 @@ namespace Gst {
 		public void inverse_fft (Gst.FFTF64Complex freqdata, double timedata);
 		public void window (double timedata, Gst.FFTWindow window);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstfftf64.h")]
+	[Compact]
 	public class FFTF64Complex {
 		public double i;
 		public double r;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts16.h")]
+	[Compact]
 	public class FFTS16 {
 		public void* cfg;
 		public bool inverse;
@@ -50,14 +50,14 @@ namespace Gst {
 		public void inverse_fft (Gst.FFTS16Complex freqdata, int16 timedata);
 		public void window (int16 timedata, Gst.FFTWindow window);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts16.h")]
+	[Compact]
 	public class FFTS16Complex {
 		public int16 i;
 		public int16 r;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
+	[Compact]
 	public class FFTS32 {
 		public void* cfg;
 		public bool inverse;
@@ -68,13 +68,13 @@ namespace Gst {
 		public void inverse_fft (Gst.FFTS32Complex freqdata, int32 timedata);
 		public void window (int32 timedata, Gst.FFTWindow window);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/fft/gstffts32.h")]
+	[Compact]
 	public class FFTS32Complex {
 		public int32 i;
 		public int32 r;
 	}
-	[CCode (cprefix = "GST_FFT_WINDOW_", has_type_id = false, cheader_filename = "gst/fft/gstfft.h")]
+	[CCode (cheader_filename = "gst/fft/gstfft.h", cprefix = "GST_FFT_WINDOW_", has_type_id = false)]
 	public enum FFTWindow {
 		RECTANGULAR,
 		HAMMING,
diff --git a/vapi/gstreamer-interfaces-0.10.vapi b/vapi/gstreamer-interfaces-0.10.vapi
index 8dd885b..45aec50 100644
--- a/vapi/gstreamer-interfaces-0.10.vapi
+++ b/vapi/gstreamer-interfaces-0.10.vapi
@@ -181,12 +181,12 @@ namespace Gst {
 		public abstract void set_window_handle (uint handle);
 		public abstract void set_xwindow_id (ulong xwindow_id);
 	}
-	[CCode (cprefix = "GST_COLOR_BALANCE_", cheader_filename = "gst/interfaces/colorbalance.h")]
+	[CCode (cheader_filename = "gst/interfaces/colorbalance.h", cprefix = "GST_COLOR_BALANCE_")]
 	public enum ColorBalanceType {
 		HARDWARE,
 		SOFTWARE
 	}
-	[CCode (cprefix = "GST_MIXER_FLAG_", cheader_filename = "gst/interfaces/mixer.h")]
+	[CCode (cheader_filename = "gst/interfaces/mixer.h", cprefix = "GST_MIXER_FLAG_")]
 	[Flags]
 	public enum MixerFlags {
 		NONE,
@@ -194,7 +194,7 @@ namespace Gst {
 		HAS_WHITELIST,
 		GROUPING
 	}
-	[CCode (cprefix = "GST_MIXER_MESSAGE_", cheader_filename = "gst/interfaces/mixer.h")]
+	[CCode (cheader_filename = "gst/interfaces/mixer.h", cprefix = "GST_MIXER_MESSAGE_")]
 	public enum MixerMessageType {
 		INVALID,
 		MUTE_TOGGLED,
@@ -204,7 +204,7 @@ namespace Gst {
 		OPTIONS_LIST_CHANGED,
 		MIXER_CHANGED
 	}
-	[CCode (cprefix = "GST_MIXER_TRACK_", cheader_filename = "gst/interfaces/mixertrack.h")]
+	[CCode (cheader_filename = "gst/interfaces/mixertrack.h", cprefix = "GST_MIXER_TRACK_")]
 	[Flags]
 	public enum MixerTrackFlags {
 		INPUT,
@@ -219,12 +219,12 @@ namespace Gst {
 		READONLY,
 		WRITEONLY
 	}
-	[CCode (cprefix = "GST_MIXER_", cheader_filename = "gst/interfaces/mixer.h")]
+	[CCode (cheader_filename = "gst/interfaces/mixer.h", cprefix = "GST_MIXER_")]
 	public enum MixerType {
 		HARDWARE,
 		SOFTWARE
 	}
-	[CCode (cprefix = "GST_NAVIGATION_COMMAND_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_NAVIGATION_COMMAND_")]
 	public enum NavigationCommand {
 		INVALID,
 		MENU1,
@@ -242,7 +242,7 @@ namespace Gst {
 		PREV_ANGLE,
 		NEXT_ANGLE
 	}
-	[CCode (cprefix = "GST_NAVIGATION_EVENT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_NAVIGATION_EVENT_")]
 	public enum NavigationEventType {
 		INVALID,
 		KEY_PRESS,
@@ -252,26 +252,26 @@ namespace Gst {
 		MOUSE_MOVE,
 		COMMAND
 	}
-	[CCode (cprefix = "GST_NAVIGATION_MESSAGE_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_NAVIGATION_MESSAGE_")]
 	public enum NavigationMessageType {
 		INVALID,
 		MOUSE_OVER,
 		COMMANDS_CHANGED,
 		ANGLES_CHANGED
 	}
-	[CCode (cprefix = "GST_NAVIGATION_QUERY_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_NAVIGATION_QUERY_")]
 	public enum NavigationQueryType {
 		INVALID,
 		COMMANDS,
 		ANGLES
 	}
-	[CCode (cprefix = "GST_STREAM_VOLUME_FORMAT_", cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STREAM_VOLUME_FORMAT_")]
 	public enum StreamVolumeFormat {
 		LINEAR,
 		CUBIC,
 		DB
 	}
-	[CCode (cprefix = "GST_TUNER_CHANNEL_", cheader_filename = "gst/interfaces/tuner.h")]
+	[CCode (cheader_filename = "gst/interfaces/tuner.h", cprefix = "GST_TUNER_CHANNEL_")]
 	[Flags]
 	public enum TunerChannelFlags {
 		INPUT,
diff --git a/vapi/gstreamer-net-0.10.vapi b/vapi/gstreamer-net-0.10.vapi
index 673b2ad..513a772 100644
--- a/vapi/gstreamer-net-0.10.vapi
+++ b/vapi/gstreamer-net-0.10.vapi
@@ -10,15 +10,15 @@ namespace Gst {
 		public void* servaddr;
 		public int sock;
 		public weak GLib.Thread thread;
-		[CCode (type = "GstClock*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstClock*")]
 		public NetClientClock (string name, string remote_address, int remote_port, Gst.ClockTime base_time);
 		[NoAccessorMethod]
 		public string address { owned get; set; }
 		[NoAccessorMethod]
 		public int port { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/net/gstnet.h")]
+	[Compact]
 	public class NetTimePacket {
 		public Gst.ClockTime local_time;
 		public Gst.ClockTime remote_time;
diff --git a/vapi/gstreamer-netbuffer-0.10.vapi b/vapi/gstreamer-netbuffer-0.10.vapi
index 468f14f..42aca31 100644
--- a/vapi/gstreamer-netbuffer-0.10.vapi
+++ b/vapi/gstreamer-netbuffer-0.10.vapi
@@ -10,7 +10,7 @@ namespace Gst {
 		[CCode (cname = "gst_netbuffer_new", has_construct_function = false)]
 		public NetBuffer ();
 	}
-	[CCode (type_id = "GST_TYPE_NET_ADDRESS", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h", type_id = "GST_TYPE_NET_ADDRESS")]
 	public struct NetAddress {
 		public Gst.NetType type;
 		public void* address;
@@ -34,7 +34,7 @@ namespace Gst {
 		[CCode (cname = "gst_netaddress_to_string")]
 		public int to_string (string dest, ulong len);
 	}
-	[CCode (cprefix = "GST_NET_TYPE_", has_type_id = false, cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h", cprefix = "GST_NET_TYPE_", has_type_id = false)]
 	public enum NetType {
 		UNKNOWN,
 		IP4,
diff --git a/vapi/gstreamer-pbutils-0.10.vapi b/vapi/gstreamer-pbutils-0.10.vapi
index 5732c75..1ca7921 100644
--- a/vapi/gstreamer-pbutils-0.10.vapi
+++ b/vapi/gstreamer-pbutils-0.10.vapi
@@ -80,7 +80,7 @@ namespace Gst {
 		public bool contains_profile (Gst.EncodingProfile profile);
 		public unowned GLib.List<Gst.EncodingProfile> get_profiles ();
 	}
-	[CCode (ref_function = "gst_encoding_profile_ref", unref_function = "gst_encoding_profile_unref", cheader_filename = "gst/pbutils/pbutils.h")]
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h", ref_function = "gst_encoding_profile_ref", unref_function = "gst_encoding_profile_unref")]
 	public class EncodingProfile : Gst.MiniObject {
 		public static Gst.EncodingProfile find (string targetname, string profilename, string category);
 		public unowned string get_description ();
@@ -101,7 +101,7 @@ namespace Gst {
 		public void set_restriction (Gst.Caps restriction);
 		public void unref ();
 	}
-	[CCode (ref_function = "gst_encoding_target_ref", unref_function = "gst_encoding_target_unref", cheader_filename = "gst/pbutils/pbutils.h")]
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h", ref_function = "gst_encoding_target_ref", unref_function = "gst_encoding_target_unref")]
 	public class EncodingTarget : Gst.MiniObject {
 		[CCode (has_construct_function = false)]
 		public EncodingTarget (string name, string category, string description, GLib.List<Gst.EncodingProfile> profiles);
@@ -127,14 +127,14 @@ namespace Gst {
 		public void set_pass (uint pass);
 		public void set_variableframerate (bool variableframerate);
 	}
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h", type_id = "GST_TYPE_INSTALL_PLUGINS_CONTEXT")]
 	[Compact]
-	[CCode (type_id = "GST_TYPE_INSTALL_PLUGINS_CONTEXT", cheader_filename = "gst/pbutils/pbutils.h")]
 	public class InstallPluginsContext {
 		[CCode (has_construct_function = false)]
 		public InstallPluginsContext ();
 		public void set_xid (uint xid);
 	}
-	[CCode (cprefix = "GST_DISCOVERER_", cheader_filename = "gst/pbutils/pbutils.h")]
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h", cprefix = "GST_DISCOVERER_")]
 	public enum DiscovererResult {
 		OK,
 		URI_INVALID,
@@ -143,7 +143,7 @@ namespace Gst {
 		BUSY,
 		MISSING_PLUGINS
 	}
-	[CCode (cprefix = "GST_INSTALL_PLUGINS_", cheader_filename = "gst/pbutils/pbutils.h")]
+	[CCode (cheader_filename = "gst/pbutils/pbutils.h", cprefix = "GST_INSTALL_PLUGINS_")]
 	public enum InstallPluginsReturn {
 		SUCCESS,
 		NOT_FOUND,
diff --git a/vapi/gstreamer-riff-0.10.vapi b/vapi/gstreamer-riff-0.10.vapi
index 06ea630..f9c0f8e 100644
--- a/vapi/gstreamer-riff-0.10.vapi
+++ b/vapi/gstreamer-riff-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_acid {
 		public uint32 loop_type;
 		public uint16 meter_d;
@@ -14,21 +14,21 @@ namespace Gst {
 		public uint16 unknown1;
 		public float unknown2;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_dmlh {
 		public uint32 totalframes;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_index_entry {
 		public uint32 flags;
 		public uint32 id;
 		public uint32 offset;
 		public uint32 size;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_strf_auds {
 		public uint32 av_bps;
 		public uint16 blockalign;
@@ -37,8 +37,8 @@ namespace Gst {
 		public uint32 rate;
 		public uint16 size;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_strf_iavs {
 		public uint32 DVAAuxCtl;
 		public uint32 DVAAuxCtl1;
@@ -49,8 +49,8 @@ namespace Gst {
 		public uint32 DVVAuxCtl;
 		public uint32 DVVAuxSrc;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_strf_vids {
 		public uint16 bit_cnt;
 		public uint32 compression;
@@ -64,8 +64,8 @@ namespace Gst {
 		public uint32 xpels_meter;
 		public uint32 ypels_meter;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/riff/riff-ids.h")]
+	[Compact]
 	public class gst_riff_strh {
 		public uint32 bufsize;
 		public uint32 fcc_handler;
diff --git a/vapi/gstreamer-rtp-0.10.vapi b/vapi/gstreamer-rtp-0.10.vapi
index 35eceae..6a9f628 100644
--- a/vapi/gstreamer-rtp-0.10.vapi
+++ b/vapi/gstreamer-rtp-0.10.vapi
@@ -112,8 +112,8 @@ namespace Gst {
 		[NoAccessorMethod]
 		public uint timestamp_offset { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtp/gstrtppayloads.h")]
+	[Compact]
 	public class RTPPayloadInfo {
 		public uint bitrate;
 		public uint clock_rate;
@@ -124,7 +124,7 @@ namespace Gst {
 		public static unowned Gst.RTPPayloadInfo for_name (string media, string encoding_name);
 		public static unowned Gst.RTPPayloadInfo for_pt (uchar payload_type);
 	}
-	[CCode (type_id = "GST_TYPE_RTCP_PACKET", cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h", type_id = "GST_TYPE_RTCP_PACKET")]
 	public struct RTCPPacket {
 		public weak Gst.Buffer buffer;
 		public uint offset;
@@ -175,7 +175,7 @@ namespace Gst {
 		public void sr_get_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
 		public void sr_set_sender_info (uint32 ssrc, uint64 ntptime, uint32 rtptime, uint32 packet_count, uint32 octet_count);
 	}
-	[CCode (cprefix = "GST_RTCP_", has_type_id = false, cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h", cprefix = "GST_RTCP_", has_type_id = false)]
 	public enum RTCPFBType {
 		FB_TYPE_INVALID,
 		RTPFB_TYPE_NACK,
@@ -184,7 +184,7 @@ namespace Gst {
 		PSFB_TYPE_RPSI,
 		PSFB_TYPE_AFB
 	}
-	[CCode (cprefix = "GST_RTCP_SDES_", has_type_id = false, cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h", cprefix = "GST_RTCP_SDES_", has_type_id = false)]
 	public enum RTCPSDESType {
 		INVALID,
 		END,
@@ -197,7 +197,7 @@ namespace Gst {
 		NOTE,
 		PRIV
 	}
-	[CCode (cprefix = "GST_RTCP_TYPE_", has_type_id = false, cheader_filename = "gst/rtp/gstrtcpbuffer.h")]
+	[CCode (cheader_filename = "gst/rtp/gstrtcpbuffer.h", cprefix = "GST_RTCP_TYPE_", has_type_id = false)]
 	public enum RTCPType {
 		INVALID,
 		SR,
@@ -208,7 +208,7 @@ namespace Gst {
 		RTPFB,
 		PSFB
 	}
-	[CCode (cprefix = "GST_RTP_PAYLOAD_", has_type_id = false, cheader_filename = "gst/rtp/gstbasertpaudiopayload.h")]
+	[CCode (cheader_filename = "gst/rtp/gstbasertpaudiopayload.h", cprefix = "GST_RTP_PAYLOAD_", has_type_id = false)]
 	public enum RTPPayload {
 		PCMU,
 		@1016,
diff --git a/vapi/gstreamer-rtsp-0.10.vapi b/vapi/gstreamer-rtsp-0.10.vapi
index fb75b92..8f68465 100644
--- a/vapi/gstreamer-rtsp-0.10.vapi
+++ b/vapi/gstreamer-rtsp-0.10.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[Compact]
 	public class RTSPConnection {
 		public static Gst.RTSPResult accept (int sock, out unowned Gst.RTSPConnection conn);
 		public void clear_auth_params ();
@@ -34,8 +34,8 @@ namespace Gst {
 		public void set_tunneled (bool tunneled);
 		public Gst.RTSPResult write (uchar data, uint size, GLib.TimeVal timeout);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtspmessage.h")]
+	[Compact]
 	public class RTSPMessage {
 		public uchar body;
 		public uint body_size;
@@ -65,29 +65,29 @@ namespace Gst {
 		public Gst.RTSPResult take_header (Gst.RTSPHeaderField field, owned string value);
 		public Gst.RTSPResult unset ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[Compact]
 	public class RTSPRange {
 		public int max;
 		public int min;
 		public static Gst.RTSPResult parse (string rangestr, out Gst.RTSPTimeRange range);
 		public static string to_string (Gst.RTSPTimeRange range);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[Compact]
 	public class RTSPTime {
 		public double seconds;
 		public Gst.RTSPTimeType type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[Compact]
 	public class RTSPTimeRange {
 		public Gst.RTSPTime max;
 		public Gst.RTSPTime min;
 		public Gst.RTSPRangeUnit unit;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+	[Compact]
 	public class RTSPTransport {
 		public bool append;
 		public Gst.RTSPRange client_port;
@@ -111,8 +111,8 @@ namespace Gst {
 		public static Gst.RTSPResult @new (out Gst.RTSPTransport transport);
 		public static Gst.RTSPResult parse (string str, Gst.RTSPTransport transport);
 	}
+	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", copy_function = "gst_rtsp_url_copy", type_id = "GST_TYPE_RTSP_URL")]
 	[Compact]
-	[CCode (copy_function = "gst_rtsp_url_copy", type_id = "GST_TYPE_RTSP_URL", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
 	public class RTSPUrl {
 		public string abspath;
 		public Gst.RTSPFamily family;
@@ -129,8 +129,8 @@ namespace Gst {
 		public static Gst.RTSPResult parse (string urlstr, out Gst.RTSPUrl url);
 		public Gst.RTSPResult set_port (uint16 port);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[Compact]
 	public class RTSPWatch {
 		[CCode (has_construct_function = false)]
 		public RTSPWatch (Gst.RTSPConnection conn, Gst.RTSPWatchFuncs funcs, GLib.DestroyNotify notify);
@@ -141,8 +141,8 @@ namespace Gst {
 		public Gst.RTSPResult send_message (Gst.RTSPMessage message, uint id);
 		public Gst.RTSPResult write_data (uchar data, uint size, uint id);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[Compact]
 	public class RTSPWatchFuncs {
 		public weak GLib.Callback closed;
 		public weak GLib.Callback error;
@@ -167,25 +167,25 @@ namespace Gst {
 		[HasEmitter]
 		public signal Gst.RTSPResult send (void* req, void* resp);
 	}
-	[CCode (cprefix = "GST_RTSP_AUTH_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", cprefix = "GST_RTSP_AUTH_")]
 	public enum RTSPAuthMethod {
 		NONE,
 		BASIC,
 		DIGEST
 	}
-	[CCode (cprefix = "GST_RTSP_EV_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", cprefix = "GST_RTSP_EV_")]
 	[Flags]
 	public enum RTSPEvent {
 		READ,
 		WRITE
 	}
-	[CCode (cprefix = "GST_RTSP_FAM_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_FAM_")]
 	public enum RTSPFamily {
 		NONE,
 		INET,
 		INET6
 	}
-	[CCode (cprefix = "GST_RTSP_HDR_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_HDR_")]
 	public enum RTSPHeaderField {
 		INVALID,
 		ACCEPT,
@@ -270,7 +270,7 @@ namespace Gst {
 		X_SESSIONCOOKIE,
 		LAST
 	}
-	[CCode (cprefix = "GST_RTSP_LOWER_TRANS_", cheader_filename = "gst/rtsp/gstrtspextension.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspextension.h", cprefix = "GST_RTSP_LOWER_TRANS_")]
 	[Flags]
 	public enum RTSPLowerTrans {
 		UDP,
@@ -278,7 +278,7 @@ namespace Gst {
 		TCP,
 		HTTP
 	}
-	[CCode (cprefix = "GST_RTSP_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_")]
 	[Flags]
 	public enum RTSPMethod {
 		INVALID,
@@ -296,7 +296,7 @@ namespace Gst {
 		GET,
 		POST
 	}
-	[CCode (cprefix = "GST_RTSP_MESSAGE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtspmessage.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspmessage.h", cprefix = "GST_RTSP_MESSAGE_", has_type_id = false)]
 	public enum RTSPMsgType {
 		INVALID,
 		REQUEST,
@@ -305,13 +305,13 @@ namespace Gst {
 		HTTP_RESPONSE,
 		DATA
 	}
-	[CCode (cprefix = "GST_RTSP_PROFILE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtsptransport.h", cprefix = "GST_RTSP_PROFILE_", has_type_id = false)]
 	public enum RTSPProfile {
 		UNKNOWN,
 		AVP,
 		SAVP
 	}
-	[CCode (cprefix = "GST_RTSP_RANGE_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtsprange.h", cprefix = "GST_RTSP_RANGE_", has_type_id = false)]
 	public enum RTSPRangeUnit {
 		SMPTE,
 		SMPTE_30_DROP,
@@ -319,7 +319,7 @@ namespace Gst {
 		NPT,
 		CLOCK
 	}
-	[CCode (cprefix = "GST_RTSP_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspconnection.h", cprefix = "GST_RTSP_")]
 	public enum RTSPResult {
 		OK,
 		ERROR,
@@ -340,7 +340,7 @@ namespace Gst {
 		ETPOST,
 		ELAST
 	}
-	[CCode (cprefix = "GST_RTSP_STATE_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_STATE_")]
 	public enum RTSPState {
 		INVALID,
 		INIT,
@@ -349,7 +349,7 @@ namespace Gst {
 		PLAYING,
 		RECORDING
 	}
-	[CCode (cprefix = "GST_RTSP_STS_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_STS_")]
 	public enum RTSPStatusCode {
 		INVALID,
 		CONTINUE,
@@ -397,19 +397,19 @@ namespace Gst {
 		RTSP_VERSION_NOT_SUPPORTED,
 		OPTION_NOT_SUPPORTED
 	}
-	[CCode (cprefix = "GST_RTSP_TIME_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsprange.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtsprange.h", cprefix = "GST_RTSP_TIME_", has_type_id = false)]
 	public enum RTSPTimeType {
 		SECONDS,
 		NOW,
 		END
 	}
-	[CCode (cprefix = "GST_RTSP_TRANS_", has_type_id = false, cheader_filename = "gst/rtsp/gstrtsptransport.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtsptransport.h", cprefix = "GST_RTSP_TRANS_", has_type_id = false)]
 	public enum RTSPTransMode {
 		UNKNOWN,
 		RTP,
 		RDT
 	}
-	[CCode (cprefix = "GST_RTSP_VERSION_", cheader_filename = "gst/rtsp/gstrtspdefs.h")]
+	[CCode (cheader_filename = "gst/rtsp/gstrtspdefs.h", cprefix = "GST_RTSP_VERSION_")]
 	public enum RTSPVersion {
 		INVALID,
 		@1_0,
diff --git a/vapi/gstreamer-sdp-0.10.vapi b/vapi/gstreamer-sdp-0.10.vapi
index bf5acd7..469056d 100644
--- a/vapi/gstreamer-sdp-0.10.vapi
+++ b/vapi/gstreamer-sdp-0.10.vapi
@@ -2,20 +2,20 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPAttribute {
 		public weak string key;
 		public weak string value;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPBandwidth {
 		public uint bandwidth;
 		public weak string bwtype;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPConnection {
 		public uint addr_number;
 		public weak string address;
@@ -23,14 +23,14 @@ namespace Gst {
 		public weak string nettype;
 		public uint ttl;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPKey {
 		public weak string data;
 		public weak string type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPMedia {
 		public weak GLib.Array<Gst.SDPAttribute> attributes;
 		public weak GLib.Array<Gst.SDPBandwidth> bandwidths;
@@ -42,7 +42,7 @@ namespace Gst {
 		public uint num_ports;
 		public uint port;
 		public weak string proto;
-		[CCode (type = "GstSDPResult", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstSDPResult")]
 		public SDPMedia (out unowned Gst.SDPMedia media);
 		public Gst.SDPResult add_attribute (string key, string value);
 		public Gst.SDPResult add_bandwidth (string bwtype, uint bandwidth);
@@ -73,8 +73,8 @@ namespace Gst {
 		public Gst.SDPResult set_proto (string proto);
 		public Gst.SDPResult uninit ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPMessage {
 		public weak GLib.Array<Gst.SDPAttribute> attributes;
 		public weak GLib.Array<Gst.SDPBandwidth> bandwidths;
@@ -90,7 +90,7 @@ namespace Gst {
 		public weak string uri;
 		public weak string version;
 		public weak GLib.Array<Gst.SDPZone> zones;
-		[CCode (type = "GstSDPResult", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GstSDPResult")]
 		public SDPMessage (out unowned Gst.SDPMessage msg);
 		public Gst.SDPResult add_attribute (string key, string value);
 		public Gst.SDPResult add_bandwidth (string bwtype, uint bandwidth);
@@ -137,8 +137,8 @@ namespace Gst {
 		public Gst.SDPResult uninit ();
 		public uint zones_len ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPOrigin {
 		public weak string addr;
 		public weak string addrtype;
@@ -147,20 +147,20 @@ namespace Gst {
 		public weak string sess_version;
 		public weak string username;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPTime {
 		public weak GLib.Array<Gst.SDPTime> repeat;
 		public weak string start;
 		public weak string stop;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/sdp/gstsdpmessage.h")]
+	[Compact]
 	public class SDPZone {
 		public weak string time;
 		public weak string typed_time;
 	}
-	[CCode (cprefix = "GST_SDP_", has_type_id = false, cheader_filename = "gst/sdp/gstsdp.h")]
+	[CCode (cheader_filename = "gst/sdp/gstsdp.h", cprefix = "GST_SDP_", has_type_id = false)]
 	public enum SDPResult {
 		OK,
 		EINVAL
diff --git a/vapi/gstreamer-tag-0.10.vapi b/vapi/gstreamer-tag-0.10.vapi
index 47edbc4..465c460 100644
--- a/vapi/gstreamer-tag-0.10.vapi
+++ b/vapi/gstreamer-tag-0.10.vapi
@@ -23,13 +23,13 @@ namespace Gst {
 		public void remove_schema (string schema);
 		public unowned Gst.Buffer tag_list_to_xmp_buffer (Gst.TagList taglist, bool read_only);
 	}
-	[CCode (cprefix = "GST_TAG_DEMUX_RESULT_", cheader_filename = "gst/tag/gsttagdemux.h")]
+	[CCode (cheader_filename = "gst/tag/gsttagdemux.h", cprefix = "GST_TAG_DEMUX_RESULT_")]
 	public enum TagDemuxResult {
 		BROKEN_TAG,
 		AGAIN,
 		OK
 	}
-	[CCode (cprefix = "GST_TAG_IMAGE_TYPE_", cheader_filename = "gst/tag/tag.h")]
+	[CCode (cheader_filename = "gst/tag/tag.h", cprefix = "GST_TAG_IMAGE_TYPE_")]
 	public enum TagImageType {
 		NONE,
 		UNDEFINED,
diff --git a/vapi/gstreamer-video-0.10.vapi b/vapi/gstreamer-video-0.10.vapi
index 3295a05..0cee371 100644
--- a/vapi/gstreamer-video-0.10.vapi
+++ b/vapi/gstreamer-video-0.10.vapi
@@ -32,78 +32,78 @@ namespace Gst {
 		public const string xRGB;
 		[CCode (cheader_filename = "gst/video/video.h")]
 		public const string xRGB_HOST_ENDIAN;
-		[CCode (cname = "GST_VIDEO_CAPS_YUV", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_CAPS_YUV")]
 		public static unowned string YUV (string fourcc);
 	}
 	[CCode (cprefix = "GstVideoMask15", lower_case_cprefix = "gst_video_mask15_")]
 	namespace VideoMask15 {
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_15")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_15_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_15_INT")]
 		public const int BLUE_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_GREEN_MASK_15")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_15_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_GREEN_MASK_15_INT")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_15")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_RED_MASK_15_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_15_INT")]
 		public const int RED_INT;
 	}
 	[CCode (cprefix = "GstVideoMask16", lower_case_cprefix = "gst_video_mask16_")]
 	namespace VideoMask16 {
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_16")]
 		public const string BLUE;
-		[CCode (cname = "GST_VIDEO_BLUE_MASK_16_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BLUE_MASK_16_INT")]
 		public const int BLUE_INT;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_GREEN_MASK_16")]
 		public const string GREEN;
-		[CCode (cname = "GST_VIDEO_GREEN_MASK_16_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_GREEN_MASK_16_INT")]
 		public const int GREEN_INT;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_16")]
 		public const string RED;
-		[CCode (cname = "GST_VIDEO_RED_MASK_16_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_RED_MASK_16_INT")]
 		public const int RED_INT;
 	}
 	[CCode (cprefix = "GstVideoMask24", lower_case_cprefix = "gst_video_mask24_")]
 	namespace VideoMask24 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_24")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_24_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_24_INT")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE2_MASK_24")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_24_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE2_MASK_24_INT")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE3_MASK_24")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_24_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE3_MASK_24_INT")]
 		public const int BYTE3_INT;
 	}
 	[CCode (cprefix = "GstVideoMask32", lower_case_cprefix = "gst_video_mask32_")]
 	namespace VideoMask32 {
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_32")]
 		public const string BYTE1;
-		[CCode (cname = "GST_VIDEO_BYTE1_MASK_32_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE1_MASK_32_INT")]
 		public const int BYTE1_INT;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE2_MASK_32")]
 		public const string BYTE2;
-		[CCode (cname = "GST_VIDEO_BYTE2_MASK_32_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE2_MASK_32_INT")]
 		public const int BYTE2_INT;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE3_MASK_32")]
 		public const string BYTE3;
-		[CCode (cname = "GST_VIDEO_BYTE3_MASK_32_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE3_MASK_32_INT")]
 		public const int BYTE3_INT;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE4_MASK_32")]
 		public const string BYTE4;
-		[CCode (cname = "GST_VIDEO_BYTE4_MASK_32_INT", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_BYTE4_MASK_32_INT")]
 		public const int BYTE4_INT;
 	}
 	[CCode (cprefix = "GstVideoRange", lower_case_cprefix = "gst_video_range_")]
 	namespace VideoRange {
-		[CCode (cname = "GST_VIDEO_FPS_RANGE", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_FPS_RANGE")]
 		public const string FPS;
-		[CCode (cname = "GST_VIDEO_SIZE_RANGE", cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", cname = "GST_VIDEO_SIZE_RANGE")]
 		public const string SIZE;
 	}
 	[CCode (cheader_filename = "gst/video/gstvideofilter.h")]
@@ -112,8 +112,8 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		protected VideoFilter ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gst/video/gstvideosink.h")]
+	[Compact]
 	public class VideoRectangle {
 		public int h;
 		public int w;
@@ -132,7 +132,7 @@ namespace Gst {
 		[NoAccessorMethod]
 		public bool show_preroll_frame { get; set construct; }
 	}
-	[CCode (cprefix = "GST_VIDEO_FORMAT_", cheader_filename = "gst/video/video.h")]
+	[CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_FORMAT_")]
 	public enum VideoFormat {
 		UNKNOWN,
 		I420,
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 243502f..2c2a31a 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1,6 +1,6 @@
 /* gtk+-2.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_", gir_namespace = "Gtk", gir_version = "2.0")]
+[CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "2.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
 	[CCode (cprefix = "GtkStock", lower_case_cprefix = "gtk_stock_")]
 	namespace Stock {
@@ -225,7 +225,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AboutDialog ();
 		public unowned string get_artists ();
 		public unowned string get_authors ();
@@ -299,8 +299,8 @@ namespace Gtk {
 		public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
 		public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class AccelGroupEntry {
 		public GLib.Quark accel_path_quark;
 		public weak GLib.Closure closure;
@@ -313,7 +313,7 @@ namespace Gtk {
 		public weak string accel_string;
 		public uint16 accel_string_width;
 		public uint gtk_reserved;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AccelLabel (string str);
 		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
@@ -344,8 +344,8 @@ namespace Gtk {
 		public static void unlock_path (string accel_path);
 		public virtual signal void changed (string p0, uint p1, Gdk.ModifierType p2);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class AccelMapClass {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -456,7 +456,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Adjustment : Gtk.Object {
-		[CCode (type = "GtkObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkObject*")]
 		public Adjustment (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
 		public void clamp_page (double lower, double upper);
 		public void configure (double value, double lower, double upper, double step_increment, double page_increment, double page_size);
@@ -485,7 +485,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Alignment (float xalign, float yalign, float xscale, float yscale);
 		public void get_padding (out uint padding_top, out uint padding_bottom, out uint padding_left, out uint padding_right);
 		public void @set (float xalign, float yalign, float xscale, float yscale);
@@ -507,15 +507,15 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public float yscale { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class Arg {
 		public weak string name;
 		public GLib.Type type;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
 		public void @set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
 		[NoAccessorMethod]
@@ -526,7 +526,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
 		public Gtk.Allocation center_allocation;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
 		public void @set (float xalign, float yalign, float ratio, bool obey_child);
 		[NoAccessorMethod]
@@ -543,7 +543,7 @@ namespace Gtk {
 		public weak Gtk.Widget back;
 		public weak Gtk.Widget forward;
 		public weak Gtk.Widget last;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Assistant ();
 		public void add_action_widget (Gtk.Widget child);
 		public int append_page (Gtk.Widget page);
@@ -578,13 +578,13 @@ namespace Gtk {
 		protected Bin ();
 		public unowned Gtk.Widget get_child ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingArg {
 		public GLib.Type arg_type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingEntry {
 		public weak Gtk.BindingSet binding_set;
 		public uint destroyed;
@@ -600,8 +600,8 @@ namespace Gtk {
 		public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 		public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingSet {
 		public weak Gtk.BindingEntry current;
 		public weak Gtk.BindingEntry entries;
@@ -615,16 +615,16 @@ namespace Gtk {
 		public static unowned Gtk.BindingSet by_class (void* object_class);
 		public static unowned Gtk.BindingSet find (string set_name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingSignal {
 		public weak Gtk.BindingArg args;
 		public uint n_args;
 		public weak Gtk.BindingSignal next;
 		public weak string signal_name;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_border_copy", type_id = "GTK_TYPE_BORDER")]
 	[Compact]
-	[CCode (copy_function = "gtk_border_copy", type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
 	public class Border {
 		public int bottom;
 		public int left;
@@ -651,8 +651,8 @@ namespace Gtk {
 		public bool homogeneous { get; set; }
 		public int spacing { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BoxChild {
 		public uint expand;
 		public uint fill;
@@ -691,9 +691,9 @@ namespace Gtk {
 		public weak Gdk.Window event_window;
 		public uint in_button;
 		public weak string label_text;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.from_stock (string stock_id);
 		public void get_alignment (out float xalign, out float yalign);
 		public bool get_focus_on_click ();
@@ -711,9 +711,9 @@ namespace Gtk {
 		public void set_relief (Gtk.ReliefStyle newstyle);
 		public void set_use_stock (bool use_stock);
 		public void set_use_underline (bool use_underline);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.with_mnemonic (string label);
 		public bool focus_on_click { get; set; }
 		public Gtk.Widget image { get; set; }
@@ -774,7 +774,7 @@ namespace Gtk {
 		public int num_marked_dates;
 		public int selected_day;
 		public weak Gdk.GC xor_gc;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Calendar ();
 		public void clear_marks ();
 		public void get_date (out uint year, out uint month, out uint day);
@@ -871,7 +871,7 @@ namespace Gtk {
 		public weak Gtk.Widget edit_widget;
 		public weak Gtk.Widget grab_widget;
 		public weak Gtk.Widget sizing_label;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererAccel ();
 		[NoAccessorMethod]
 		public uint accel_key { get; set; }
@@ -887,7 +887,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererCombo : Gtk.CellRendererText {
 		public uint focus_out_id;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererCombo ();
 		[NoAccessorMethod]
 		public bool has_entry { get; set; }
@@ -899,7 +899,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererPixbuf : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererPixbuf ();
 		[NoAccessorMethod]
 		public bool follow_state { get; set; }
@@ -922,7 +922,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererProgress : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererProgress ();
 		[NoAccessorMethod]
 		public Gtk.ProgressBarOrientation orientation { get; set; }
@@ -939,7 +939,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererSpin : Gtk.CellRendererText {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererSpin ();
 		[NoAccessorMethod]
 		public Gtk.Adjustment adjustment { owned get; set; }
@@ -950,7 +950,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererSpinner : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererSpinner ();
 		[NoAccessorMethod]
 		public bool active { get; set; }
@@ -966,7 +966,7 @@ namespace Gtk {
 		public int fixed_height_rows;
 		public double font_scale;
 		public Pango.Underline underline_style;
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererText ();
 		public void set_fixed_height_from_font (int number_of_rows);
 		[NoAccessorMethod]
@@ -1061,7 +1061,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererToggle : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererToggle ();
 		public bool get_activatable ();
 		public bool get_active ();
@@ -1080,7 +1080,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView ();
 		public unowned Gtk.TreePath get_displayed_row ();
 		public unowned Gtk.TreeModel get_model ();
@@ -1088,11 +1088,11 @@ namespace Gtk {
 		public void set_background_color (Gdk.Color color);
 		public void set_displayed_row (Gtk.TreePath path);
 		public void set_model (Gtk.TreeModel? model);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_markup (string markup);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_text (string text);
 		[NoAccessorMethod]
 		public string background { set; }
@@ -1104,19 +1104,19 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton ();
 		[NoWrapper]
 		public virtual void draw_indicator (Gdk.Rectangle area);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint always_show_toggle;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem ();
 		[NoWrapper]
 		public virtual void draw_indicator (Gdk.Rectangle area);
@@ -1126,9 +1126,9 @@ namespace Gtk {
 		public void set_active (bool is_active);
 		public void set_draw_as_radio (bool draw_as_radio);
 		public void set_inconsistent (bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem.with_mnemonic (string label);
 		public bool active { get; set; }
 		public bool draw_as_radio { get; set; }
@@ -1174,7 +1174,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton ();
 		public uint16 get_alpha ();
 		public void get_color (out Gdk.Color color);
@@ -1184,7 +1184,7 @@ namespace Gtk {
 		public void set_color (Gdk.Color color);
 		public void set_title (string title);
 		public void set_use_alpha (bool use_alpha);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton.with_color (Gdk.Color color);
 		public uint alpha { get; set; }
 		public Gdk.Color color { get; set; }
@@ -1194,7 +1194,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorSelection ();
 		public uint16 get_current_alpha ();
 		public void get_current_color (out Gdk.Color color);
@@ -1221,7 +1221,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.Widget colorsel;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorSelectionDialog (string title);
 		public unowned Gtk.Widget get_color_selection ();
 		[NoAccessorMethod]
@@ -1234,7 +1234,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox ();
 		public void append_text (string text);
 		public int get_active ();
@@ -1264,9 +1264,9 @@ namespace Gtk {
 		public void set_row_span_column (int row_span);
 		public void set_title (string title);
 		public void set_wrap_width (int width);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.text ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_model (Gtk.TreeModel model);
 		public int active { get; set; }
 		public bool add_tearoffs { get; set; }
@@ -1291,13 +1291,13 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ComboBoxEntry : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellEditable, Gtk.CellLayout {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBoxEntry ();
 		public int get_text_column ();
 		public void set_text_column (int text_column);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBoxEntry.text ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBoxEntry.with_model (Gtk.TreeModel model, int text_column);
 		public int text_column { get; set; }
 	}
@@ -1372,7 +1372,7 @@ namespace Gtk {
 		public int num_points;
 		public weak Gdk.Pixmap pixmap;
 		public Gdk.Point point;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Curve ();
 		public void get_vector (int veclen, float[] vector);
 		public void reset ();
@@ -1397,7 +1397,7 @@ namespace Gtk {
 		public Gtk.HButtonBox action_area;
 		public weak Gtk.Widget separator;
 		public Gtk.VBox vbox;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
 		public unowned Gtk.Widget add_button (string button_text, int response_id);
@@ -1414,7 +1414,7 @@ namespace Gtk {
 		public void set_default_response (int response_id);
 		public void set_has_separator (bool setting);
 		public void set_response_sensitive (int response_id, bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
 		public bool has_separator { get; set; }
 		public virtual signal void close ();
@@ -1424,7 +1424,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		public void* draw_data;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DrawingArea ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1459,7 +1459,7 @@ namespace Gtk {
 		public uint visible;
 		public uint16 x_n_bytes;
 		public uint16 x_text_size;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry ();
 		public bool get_activates_default ();
 		public float get_alignment ();
@@ -1522,7 +1522,7 @@ namespace Gtk {
 		public void set_width_chars (int n_chars);
 		public int text_index_to_layout_index (int text_index);
 		public void unset_invisible_char ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry.with_buffer (Gtk.EntryBuffer buffer);
 		public bool activates_default { get; set; }
 		public Gtk.EntryBuffer buffer { get; set construct; }
@@ -1670,7 +1670,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EventBox ();
 		public bool get_above_child ();
 		public bool get_visible_window ();
@@ -1681,7 +1681,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Expander (string label);
 		public bool get_expanded ();
 		public unowned string get_label ();
@@ -1695,7 +1695,7 @@ namespace Gtk {
 		public void set_spacing (int spacing);
 		public void set_use_markup (bool use_markup);
 		public void set_use_underline (bool use_underline);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Expander.with_mnemonic (string label);
 		public bool expanded { get; set construct; }
 		public string label { get; set construct; }
@@ -1707,7 +1707,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserButton : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserButton (string title, Gtk.FileChooserAction action);
 		public bool get_focus_on_click ();
 		public unowned string get_title ();
@@ -1715,7 +1715,7 @@ namespace Gtk {
 		public void set_focus_on_click (bool focus_on_click);
 		public void set_title (string title);
 		public void set_width_chars (int n_chars);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserButton.with_dialog (Gtk.Widget dialog);
 		public Gtk.FileChooser dialog { construct; }
 		public bool focus_on_click { get; set; }
@@ -1725,12 +1725,12 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserWidget (Gtk.FileChooserAction action);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1746,8 +1746,8 @@ namespace Gtk {
 		public Gtk.FileFilterFlags get_needed ();
 		public void set_name (string name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class FileFilterInfo {
 		public Gtk.FileFilterFlags contains;
 		public weak string display_name;
@@ -1758,15 +1758,15 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		public weak GLib.List<Gtk.FixedChild> children;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Fixed ();
 		public bool get_has_window ();
 		public void move (Gtk.Widget widget, int x, int y);
 		public void put (Gtk.Widget widget, int x, int y);
 		public void set_has_window (bool has_window);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class FixedChild {
 		public weak Gtk.Widget widget;
 		public int x;
@@ -1774,7 +1774,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontButton ();
 		public unowned string get_font_name ();
 		public bool get_show_size ();
@@ -1788,7 +1788,7 @@ namespace Gtk {
 		public void set_title (string title);
 		public void set_use_font (bool use_font);
 		public void set_use_size (bool use_size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontButton.with_font (string fontname);
 		public string font_name { get; set; }
 		public bool show_size { get; set; }
@@ -1813,7 +1813,7 @@ namespace Gtk {
 		public int size;
 		public weak Gtk.Widget size_entry;
 		public weak Gtk.Widget size_list;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontSelection ();
 		public unowned Pango.FontFace get_face ();
 		public unowned Gtk.Widget get_face_list ();
@@ -1842,7 +1842,7 @@ namespace Gtk {
 		public weak Gtk.Widget fontsel;
 		public weak Gtk.Widget main_vbox;
 		public weak Gtk.Widget ok_button;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontSelectionDialog (string title);
 		public unowned Gtk.Widget get_cancel_button ();
 		public unowned string get_font_name ();
@@ -1854,7 +1854,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		public Gtk.Allocation child_allocation;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Frame (string? label);
 		[NoWrapper]
 		public virtual void compute_child_allocation (Gtk.Allocation allocation);
@@ -1885,32 +1885,32 @@ namespace Gtk {
 		public weak Gtk.Widget gamma_dialog;
 		public weak Gtk.Widget gamma_text;
 		public weak Gtk.Widget table;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public GammaCurve ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HRuler ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HSV ();
 		public void get_color (double h, double s, double v);
 		public void get_metrics (int size, int ring_width);
@@ -1923,19 +1923,19 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScale (Gtk.Adjustment? adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1949,7 +1949,7 @@ namespace Gtk {
 		public uint float_window_mapped;
 		public uint in_drag;
 		public uint shrink_on_detach;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HandleBox ();
 		public bool get_child_detached ();
 		public Gtk.PositionType get_handle_position ();
@@ -1999,7 +1999,7 @@ namespace Gtk {
 		public weak GLib.SList tables;
 		public unichar tentative_match;
 		public int tentative_match_len;
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkIMContext*")]
 		public IMContextSimple ();
 		public void add_table (uint16 data, int max_seq_len, int n_seqs);
 	}
@@ -2007,7 +2007,7 @@ namespace Gtk {
 	public class IMMulticontext : Gtk.IMContext {
 		public weak string context_id;
 		public weak Gtk.IMContext slave;
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkIMContext*")]
 		public IMMulticontext ();
 		public void append_menuitems (Gtk.MenuShell menushell);
 		public unowned string get_context_id ();
@@ -2024,8 +2024,8 @@ namespace Gtk {
 		public static unowned Gtk.IconSet lookup_default (string stock_id);
 		public void remove_default ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO")]
 	[Compact]
-	[CCode (copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO", cheader_filename = "gtk/gtk.h")]
 	public class IconInfo {
 		public Gtk.IconInfo copy ();
 		[CCode (has_construct_function = false)]
@@ -2039,8 +2039,8 @@ namespace Gtk {
 		public Gdk.Pixbuf load_icon () throws GLib.Error;
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "GTK_TYPE_ICON_SET", unref_function = "gtk_icon_set_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref", type_id = "GTK_TYPE_ICON_SET", cheader_filename = "gtk/gtk.h")]
 	public class IconSet {
 		[CCode (has_construct_function = false)]
 		public IconSet ();
@@ -2051,8 +2051,8 @@ namespace Gtk {
 		public void get_sizes (Gtk.IconSize[] sizes);
 		public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE")]
 	[Compact]
-	[CCode (copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE", cheader_filename = "gtk/gtk.h")]
 	public class IconSource {
 		[CCode (has_construct_function = false)]
 		public IconSource ();
@@ -2104,7 +2104,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconView ();
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
 		public unowned Gdk.Pixmap create_drag_icon (Gtk.TreePath path);
@@ -2159,7 +2159,7 @@ namespace Gtk {
 		public void unselect_path (Gtk.TreePath path);
 		public void unset_model_drag_dest ();
 		public void unset_model_drag_source ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconView.with_model (Gtk.TreeModel model);
 		public int column_spacing { get; set; }
 		public int columns { get; set; }
@@ -2189,26 +2189,26 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image ();
 		public void clear ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_animation (Gdk.PixbufAnimation animation);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_file (string filename);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_gicon (GLib.Icon icon, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_icon_name (string icon_name, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_image (Gdk.Image image, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_pixmap (Gdk.Pixmap pixmap, Gdk.Bitmap mask);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_stock (string stock_id, Gtk.IconSize size);
 		public unowned Gdk.PixbufAnimation get_animation ();
 		public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size);
@@ -2255,42 +2255,42 @@ namespace Gtk {
 		public string stock { owned get; set; }
 		public Gtk.ImageType storage_type { get; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageAnimationData {
 		public weak Gdk.PixbufAnimation anim;
 		public uint frame_timeout;
 		public weak Gdk.PixbufAnimationIter iter;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageGIconData {
 		public weak GLib.Icon icon;
 		public weak Gdk.Pixbuf pixbuf;
 		public uint theme_change_id;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageIconNameData {
 		public weak string icon_name;
 		public weak Gdk.Pixbuf pixbuf;
 		public uint theme_change_id;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageIconSetData {
 		public weak Gtk.IconSet icon_set;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageImageData {
 		public weak Gdk.Image image;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
 		public bool get_always_show_image ();
 		public unowned Gtk.Widget get_image ();
@@ -2299,33 +2299,33 @@ namespace Gtk {
 		public void set_always_show_image (bool always_show);
 		public void set_image (Gtk.Widget image);
 		public void set_use_stock (bool use_stock);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.with_mnemonic (string label);
 		public Gtk.AccelGroup accel_group { set; }
 		public bool always_show_image { get; set construct; }
 		public Gtk.Widget image { get; set; }
 		public bool use_stock { get; set construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImagePixbufData {
 		public weak Gdk.Pixbuf pixbuf;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImagePixmapData {
 		public weak Gdk.Pixmap pixmap;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ImageStockData {
 		public weak string stock_id;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class InfoBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public InfoBar ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
 		public unowned Gtk.Widget add_button (string button_text, int response_id);
@@ -2336,7 +2336,7 @@ namespace Gtk {
 		public void set_default_response (int response_id);
 		public void set_message_type (Gtk.MessageType message_type);
 		public void set_response_sensitive (int response_id, bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public InfoBar.with_buttons (...);
 		public Gtk.MessageType message_type { get; set construct; }
 		public virtual signal void close ();
@@ -2355,7 +2355,7 @@ namespace Gtk {
 		public weak Gtk.Widget keys_listbox;
 		public weak Gtk.Widget mode_optionmenu;
 		public weak Gtk.Widget save_button;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public InputDialog ();
 		public virtual signal void disable_device (Gdk.Device device);
 		public virtual signal void enable_device (Gdk.Device device);
@@ -2363,9 +2363,9 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		public bool has_user_ref_count;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Invisible ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Invisible.for_screen (Gdk.Screen screen);
 		public unowned Gdk.Screen get_screen ();
 		public void set_screen (Gdk.Screen screen);
@@ -2394,7 +2394,7 @@ namespace Gtk {
 		public uint pattern_set;
 		public weak Gtk.LabelSelectionInfo select_info;
 		public uint track_links;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Label (string? str);
 		public double get_angle ();
 		public unowned Pango.AttrList get_attributes ();
@@ -2438,7 +2438,7 @@ namespace Gtk {
 		public void set_use_markup (bool setting);
 		public void set_use_underline (bool setting);
 		public void set_width_chars (int n_chars);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Label.with_mnemonic (string str);
 		public double angle { get; set; }
 		public Pango.AttrList attributes { get; set; }
@@ -2469,8 +2469,8 @@ namespace Gtk {
 		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
 		public virtual signal void populate_popup (Gtk.Menu menu);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class LabelSelectionInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2481,7 +2481,7 @@ namespace Gtk {
 		public int scroll_x;
 		public int scroll_y;
 		public Gdk.VisibilityState visibility;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Layout (Gtk.Adjustment? hadjustment = null, Gtk.Adjustment? vadjustment = null);
 		public unowned Gdk.Window get_bin_window ();
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -2502,14 +2502,14 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LinkButton (string uri);
 		public unowned string get_uri ();
 		public bool get_visited ();
 		public void set_uri (string uri);
 		public static void set_uri_hook (owned Gtk.LinkButtonUriFunc func);
 		public void set_visited (bool visited);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LinkButton.with_label (string uri, string label);
 		public string uri { get; set; }
 		public bool visited { get; set; }
@@ -2529,7 +2529,7 @@ namespace Gtk {
 		public int sort_column_id;
 		public weak GLib.List sort_list;
 		public int stamp;
-		[CCode (sentinel = "", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "")]
 		public ListStore (int n_columns, ...);
 		public void append (out Gtk.TreeIter iter);
 		public void clear ();
@@ -2583,7 +2583,7 @@ namespace Gtk {
 		public uint upper_arrow_prelight;
 		public uint upper_arrow_visible;
 		public weak Gdk.Window view_window;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Menu ();
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
 		public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc? detacher);
@@ -2623,7 +2623,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuBar ();
 		public Gtk.PackDirection get_child_pack_direction ();
 		public Gtk.PackDirection get_pack_direction ();
@@ -2644,7 +2644,7 @@ namespace Gtk {
 		public uint timer;
 		public uint timer_from_keypress;
 		public uint16 toggle_size;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem ();
 		public unowned string get_accel_path ();
 		public virtual unowned string get_label ();
@@ -2656,9 +2656,9 @@ namespace Gtk {
 		public void set_right_justified (bool right_justified);
 		public void set_submenu (Gtk.Widget submenu);
 		public void set_use_underline (bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem.with_mnemonic (string label);
 		public string accel_path { get; set; }
 		public string label { get; set; }
@@ -2713,9 +2713,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public MenuToolButton (Gtk.Widget? icon_widget, string? label);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public MenuToolButton.from_stock (string stock_id);
 		public unowned Gtk.Widget get_menu ();
 		public void set_arrow_tooltip_markup (string markup);
@@ -2727,8 +2727,8 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak Gtk.Widget label;
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		[PrintfFormat]
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
 		[PrintfFormat]
 		public void format_secondary_markup (string message_format, ...);
@@ -2737,8 +2737,8 @@ namespace Gtk {
 		public unowned Gtk.Widget get_image ();
 		public void set_image (Gtk.Widget image);
 		public void set_markup (string str);
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		[PrintfFormat]
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
 		[NoAccessorMethod]
 		public Gtk.ButtonsType buttons { construct; }
@@ -2773,7 +2773,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MountOperation : GLib.MountOperation {
-		[CCode (type = "GMountOperation*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GMountOperation*")]
 		public MountOperation (Gtk.Window? parent);
 		public unowned Gtk.Window get_parent ();
 		public unowned Gdk.Screen get_screen ();
@@ -2803,7 +2803,7 @@ namespace Gtk {
 		public weak Gtk.Widget menu;
 		public uint need_timer;
 		public uint32 timer;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Notebook ();
 		public int append_page (Gtk.Widget child, Gtk.Widget? tab_label);
 		public int append_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label);
@@ -2880,8 +2880,8 @@ namespace Gtk {
 		public virtual signal bool select_page (bool move_focus);
 		public virtual signal void switch_page (Gtk.NotebookPage page, uint page_num);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class NotebookPage {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -2900,13 +2900,13 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public OffscreenWindow ();
 		public unowned Gdk.Pixbuf get_pixbuf ();
 		public unowned Gdk.Pixmap get_pixmap ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class PageRange {
 		public int end;
 		public int start;
@@ -2989,8 +2989,8 @@ namespace Gtk {
 		public virtual signal bool move_handle (Gtk.ScrollType scroll);
 		public virtual signal bool toggle_handle_focus ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE")]
 	[Compact]
-	[CCode (copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE", cheader_filename = "gtk/gtk.h")]
 	public class PaperSize {
 		[CCode (has_construct_function = false)]
 		public PaperSize (string name);
@@ -3023,11 +3023,11 @@ namespace Gtk {
 		public weak Gtk.WindowGroup modality_group;
 		public weak Gtk.Widget modality_window;
 		public uint same_app;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Plug (Gdk.NativeWindow socket_id);
 		public void @construct (Gdk.NativeWindow socket_id);
 		public void construct_for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Plug.for_display (Gdk.Display display, Gdk.NativeWindow socket_id);
 		public bool get_embedded ();
 		public Gdk.NativeWindow get_id ();
@@ -3212,7 +3212,7 @@ namespace Gtk {
 		public uint dirty;
 		public int in_block;
 		public double pulse_fraction;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ProgressBar ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public double get_fraction ();
@@ -3258,19 +3258,19 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton (GLib.SList<Gtk.RadioButton>? group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
 		public unowned GLib.SList<Gtk.RadioButton> get_group ();
 		public void set_group (GLib.SList<Gtk.RadioButton> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_label (GLib.SList<Gtk.RadioButton>? group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_label_from_widget (Gtk.RadioButton radio_group_member, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_mnemonic (GLib.SList<Gtk.RadioButton>? group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_mnemonic_from_widget (Gtk.RadioButton radio_group_member, string label);
 		[NoAccessorMethod]
 		public Gtk.RadioButton group { set; }
@@ -3278,34 +3278,34 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.from_widget (Gtk.RadioMenuItem group);
 		public unowned GLib.SList<Gtk.RadioMenuItem> get_group ();
 		public void set_group (GLib.SList<Gtk.RadioMenuItem> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_label (GLib.SList<Gtk.RadioMenuItem> group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_mnemonic (GLib.SList<Gtk.RadioMenuItem> group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label);
 		public Gtk.RadioMenuItem group { set; }
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton (GLib.SList<Gtk.RadioToolButton>? group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.from_stock (GLib.SList<Gtk.RadioToolButton>? group, string stock_id);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.from_widget (Gtk.RadioToolButton group);
 		public unowned GLib.SList<Gtk.RadioToolButton> get_group ();
 		public void set_group (GLib.SList<Gtk.RadioToolButton> group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id);
 		public Gtk.RadioToolButton group { set; }
 	}
@@ -3377,20 +3377,20 @@ namespace Gtk {
 		public virtual signal void move_slider (Gtk.ScrollType scroll);
 		public virtual signal void value_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RangeLayout {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RangeStepTimer {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RcContext {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RcProperty {
 		public weak string origin;
 		public GLib.Quark property_name;
@@ -3438,9 +3438,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkAction*")]
 		public RecentAction (string name, string label, string tooltip, string stock_id);
-		[CCode (type = "GtkAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkAction*")]
 		public RecentAction.for_manager (string name, string label, string tooltip, string stock_id, Gtk.RecentManager manager);
 		public bool get_show_numbers ();
 		public void set_show_numbers (bool show_numbers);
@@ -3448,16 +3448,16 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserDialog (string title, Gtk.Window parent, ...);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserMenu ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserMenu.for_manager (Gtk.RecentManager manager);
 		public bool get_show_numbers ();
 		[NoWrapper]
@@ -3473,9 +3473,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserWidget : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserWidget ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -3494,8 +3494,8 @@ namespace Gtk {
 		public Gtk.RecentFilterFlags get_needed ();
 		public void set_name (string name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RecentFilterInfo {
 		public int age;
 		public weak string applications;
@@ -3505,8 +3505,8 @@ namespace Gtk {
 		public weak string mime_type;
 		public weak string uri;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "GTK_TYPE_RECENT_INFO", unref_function = "gtk_recent_info_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", type_id = "GTK_TYPE_RECENT_INFO", cheader_filename = "gtk/gtk.h")]
 	public class RecentInfo {
 		public bool exists ();
 		public ulong get_added ();
@@ -3580,8 +3580,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public double upper { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RulerMetric {
 		public weak string abbrev;
 		public weak string metric_name;
@@ -3614,7 +3614,7 @@ namespace Gtk {
 	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Activatable {
 		public weak Gtk.Widget minus_button;
 		public weak Gtk.Widget plus_button;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ScaleButton (Gtk.IconSize size, double min, double max, double step, [CCode (array_length = false)] string[] icons);
 		public unowned Gtk.Adjustment get_adjustment ();
 		public unowned Gtk.Widget get_minus_button ();
@@ -3625,8 +3625,8 @@ namespace Gtk {
 		public void set_icons ([CCode (array_length = false)] string[] icons);
 		public void set_value (double value);
 		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
 		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
 		public string[] icons { owned get; set; }
 		[NoAccessorMethod]
 		public Gtk.IconSize size { get; set; }
@@ -3647,7 +3647,7 @@ namespace Gtk {
 		public uint hscrollbar_visible;
 		public weak Gtk.Widget vscrollbar;
 		public uint vscrollbar_visible;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void add_with_viewport (Gtk.Widget child);
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -3677,8 +3677,8 @@ namespace Gtk {
 		public virtual signal void move_focus_out (Gtk.DirectionType direction);
 		public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA")]
 	[Compact]
-	[CCode (copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA", cheader_filename = "gtk/gtk.h")]
 	public class SelectionData {
 		[CCode (array_length = false)]
 		public weak uchar[] data;
@@ -3718,12 +3718,12 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SeparatorMenuItem ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public SeparatorToolItem ();
 		public bool get_draw ();
 		public void set_draw (bool draw);
@@ -3855,12 +3855,12 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string gtk_xft_rgba { owned get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class SettingsPropertyValue {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class SettingsValue {
 		public weak string origin;
 		public GLib.Value value;
@@ -3900,7 +3900,7 @@ namespace Gtk {
 		public uint same_app;
 		public weak Gtk.Widget toplevel;
 		public short xembed_version;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Socket ();
 		public void add_id (Gdk.NativeWindow window_id);
 		public Gdk.NativeWindow get_id ();
@@ -3918,7 +3918,7 @@ namespace Gtk {
 		public uint32 timer;
 		public uint timer_calls;
 		public double timer_step;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public unowned Gtk.Adjustment get_adjustment ();
@@ -3942,7 +3942,7 @@ namespace Gtk {
 		public void set_wrap (bool wrap);
 		public void spin (Gtk.SpinType direction, double increment);
 		public void update ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpinButton.with_range (double min, double max, double step);
 		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
@@ -3961,7 +3961,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Spinner : Gtk.DrawingArea, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Spinner ();
 		public void start ();
 		public void stop ();
@@ -4053,7 +4053,7 @@ namespace Gtk {
 		public weak GLib.SList messages;
 		public uint seq_context_id;
 		public uint seq_message_id;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Statusbar ();
 		public uint get_context_id (string context_description);
 		public bool get_has_resize_grip ();
@@ -4187,7 +4187,7 @@ namespace Gtk {
 		public uint16 ncols;
 		public uint16 nrows;
 		public weak Gtk.TableRowCol rows;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Table (uint rows, uint columns, bool homogeneous);
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
 		public void attach_defaults (Gtk.Widget widget, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
@@ -4212,8 +4212,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public uint row_spacing { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TableChild {
 		public uint16 bottom_attach;
 		public uint16 left_attach;
@@ -4229,8 +4229,8 @@ namespace Gtk {
 		public uint16 ypadding;
 		public uint yshrink;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TableRowCol {
 		public uint16 allocation;
 		public uint empty;
@@ -4241,8 +4241,8 @@ namespace Gtk {
 		public uint shrink;
 		public uint16 spacing;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "GTK_TYPE_TARGET_LIST", unref_function = "gtk_target_list_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref", type_id = "GTK_TYPE_TARGET_LIST", cheader_filename = "gtk/gtk.h")]
 	public class TargetList {
 		public weak GLib.List<Gtk.TargetPair> list;
 		public uint ref_count;
@@ -4257,8 +4257,8 @@ namespace Gtk {
 		public bool find (Gdk.Atom target, uint info);
 		public void remove (Gdk.Atom target);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TargetPair {
 		public uint flags;
 		public uint info;
@@ -4267,11 +4267,11 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
 		public uint torn_off;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TearoffMenuItem ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextAppearance {
 		public Gdk.Color bg_color;
 		public weak Gdk.Bitmap bg_stipple;
@@ -4289,8 +4289,8 @@ namespace Gtk {
 		public uint strikethrough;
 		public uint underline;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", unref_function = "gtk_text_attributes_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", cheader_filename = "gtk/gtk.h")]
 	public class TextAttributes {
 		public weak Gtk.TextAppearance appearance;
 		public uint bg_full_height;
@@ -4321,8 +4321,8 @@ namespace Gtk {
 		public Gtk.TextAttributes copy ();
 		public void copy_values (Gtk.TextAttributes dest);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextBTree {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4438,8 +4438,8 @@ namespace Gtk {
 		public bool get_deleted ();
 		public GLib.List<weak Gtk.Widget> get_widgets ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextLogAttrCache {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4456,8 +4456,8 @@ namespace Gtk {
 		public bool left_gravity { get; construct; }
 		public string name { get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextPendingScroll {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4662,7 +4662,7 @@ namespace Gtk {
 		public uint width_changed;
 		public int xoffset;
 		public int yoffset;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TextView ();
 		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
 		public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos);
@@ -4721,7 +4721,7 @@ namespace Gtk {
 		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
 		public bool starts_display_line (Gtk.TextIter iter);
 		public void window_to_buffer_coords (Gtk.TextWindowType win, int window_x, int window_y, out int buffer_x, out int buffer_y);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TextView.with_buffer (Gtk.TextBuffer buffer);
 		public bool accepts_tab { get; set; }
 		public Gtk.TextBuffer buffer { get; set; }
@@ -4756,12 +4756,12 @@ namespace Gtk {
 		public virtual signal void toggle_cursor_visible ();
 		public virtual signal void toggle_overwrite ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextWindow {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ThemeEngine {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4779,7 +4779,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton ();
 		public bool get_active ();
 		public bool get_inconsistent ();
@@ -4787,9 +4787,9 @@ namespace Gtk {
 		public void set_active (bool is_active);
 		public void set_inconsistent (bool setting);
 		public void set_mode (bool draw_indicator);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton.with_mnemonic (string label);
 		public bool active { get; set; }
 		[NoAccessorMethod]
@@ -4800,9 +4800,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToggleToolButton ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToggleToolButton.from_stock (string stock_id);
 		public bool get_active ();
 		public void set_active (bool is_active);
@@ -4811,9 +4811,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToolButton (Gtk.Widget? icon_widget, string? label);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToolButton.from_stock (string stock_id);
 		public unowned string get_icon_name ();
 		public unowned Gtk.Widget get_icon_widget ();
@@ -4873,7 +4873,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToolItemGroup (string label);
 		public bool get_collapsed ();
 		public unowned Gtk.ToolItem get_drop_item (int x, int y);
@@ -4899,7 +4899,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToolPalette ();
 		public void add_drag_dest (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.ToolPaletteDragTargets targets, Gdk.DragAction actions);
 		public unowned Gtk.Widget get_drag_item (Gtk.SelectionData selection);
@@ -4931,7 +4931,7 @@ namespace Gtk {
 		public Gtk.Orientation orientation;
 		public Gtk.ToolbarStyle style;
 		public uint style_set;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Toolbar ();
 		public int get_drop_index (int x, int y);
 		public int get_item_index (Gtk.ToolItem item);
@@ -4974,7 +4974,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkTreeModel*")]
 		public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
 		public void clear_cache ();
 		public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_iter, Gtk.TreeIter child_iter);
@@ -5019,13 +5019,13 @@ namespace Gtk {
 		public unowned Gtk.TreeModel get_model ();
 		public bool iter_is_valid (Gtk.TreeIter iter);
 		public void reset_default_sort_func ();
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkTreeModel*")]
 		public TreeModelSort.with_model (Gtk.TreeModel child_model);
 		public Gtk.TreeModel model { get; construct; }
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "GTK_TYPE_TREE_PATH")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "gtk_tree_path_copy", const_cname = "GtkTreePath", type_id = "GTK_TYPE_TREE_PATH", cheader_filename = "gtk/gtk.h")]
 	public class TreePath {
 		[CCode (has_construct_function = false)]
 		public TreePath ();
@@ -5035,7 +5035,7 @@ namespace Gtk {
 		public void down ();
 		[CCode (has_construct_function = false)]
 		public TreePath.first ();
-		[CCode (sentinel = "-1", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "-1")]
 		public TreePath.from_indices (...);
 		[CCode (has_construct_function = false)]
 		public TreePath.from_string (string path);
@@ -5050,9 +5050,9 @@ namespace Gtk {
 		public unowned string to_string ();
 		public bool up ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE", cheader_filename = "gtk/gtk.h")]
 	public class TreeRowReference {
 		[CCode (has_construct_function = false)]
 		public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
@@ -5112,7 +5112,7 @@ namespace Gtk {
 		public int sort_column_id;
 		public weak GLib.List sort_list;
 		public int stamp;
-		[CCode (sentinel = "", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "")]
 		public TreeStore (int n_columns, ...);
 		public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
 		public void clear ();
@@ -5142,7 +5142,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TreeView ();
 		public int append_column (Gtk.TreeViewColumn column);
 		public void collapse_all ();
@@ -5239,7 +5239,7 @@ namespace Gtk {
 		public void set_vadjustment (Gtk.Adjustment adjustment);
 		public void unset_rows_drag_dest ();
 		public void unset_rows_drag_source ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TreeView.with_model (Gtk.TreeModel model);
 		[NoAccessorMethod]
 		public Gtk.TreeViewGridLines enable_grid_lines { get; set; }
@@ -5398,46 +5398,46 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VRuler : Gtk.Ruler, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VRuler ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScale (Gtk.Adjustment? adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
 		public weak Gdk.Window bin_window;
 		public weak Gdk.Window view_window;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public unowned Gdk.Window get_bin_window ();
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -5453,7 +5453,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VolumeButton ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -5463,7 +5463,7 @@ namespace Gtk {
 		public uchar saved_state;
 		public uchar state;
 		public Gdk.Window window;
-		[CCode (has_new_function = false, construct_function = "gtk_widget_new")]
+		[CCode (construct_function = "gtk_widget_new", has_new_function = false)]
 		public Widget (...);
 		public bool activate ();
 		public void add_accelerator (string accel_signal, Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags);
@@ -5750,8 +5750,8 @@ namespace Gtk {
 		public virtual signal bool visibility_notify_event (Gdk.Event event);
 		public virtual signal bool window_state_event (Gdk.EventWindowState event);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class WidgetAuxInfo {
 		public int height;
 		public int width;
@@ -5760,8 +5760,8 @@ namespace Gtk {
 		public int y;
 		public uint y_set;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class WidgetShapeInfo {
 		public int16 offset_x;
 		public int16 offset_y;
@@ -5795,7 +5795,7 @@ namespace Gtk {
 		public weak string wm_role;
 		public weak string wmclass_class;
 		public weak string wmclass_name;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Window (Gtk.WindowType type = Gtk.WindowType.TOPLEVEL);
 		public bool activate_default ();
 		public bool activate_focus ();
@@ -5944,8 +5944,8 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void set_focus (Gtk.Widget? focus);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class WindowGeometryInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6239,30 +6239,30 @@ namespace Gtk {
 		[HasEmitter]
 		public signal void sort_column_changed ();
 	}
-	[CCode (type_id = "GTK_TYPE_ACCEL_KEY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACCEL_KEY")]
 	public struct AccelKey {
 		public uint accel_key;
 		public Gdk.ModifierType accel_mods;
 		public uint accel_flags;
 	}
-	[CCode (type_id = "GTK_TYPE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACTION_ENTRY")]
 	public struct ActionEntry {
 		public weak string name;
 		public weak string stock_id;
 		public weak string label;
 		public weak string accelerator;
 		public weak string tooltip;
-		[CCode (type = "GCallback", delegate_target = false)]
+		[CCode (delegate_target = false, type = "GCallback")]
 		public weak Gtk.ActionCallback callback;
 	}
-	[CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ALLOCATION")]
 	public struct Allocation {
 		public int x;
 		public int y;
 		public int width;
 		public int height;
 	}
-	[CCode (type_id = "GTK_TYPE_IM_CONTEXT_INFO", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_IM_CONTEXT_INFO")]
 	public struct IMContextInfo {
 		public weak string context_id;
 		public weak string context_name;
@@ -6270,7 +6270,7 @@ namespace Gtk {
 		public weak string domain_dirname;
 		public weak string default_locales;
 	}
-	[CCode (type_id = "GTK_TYPE_RADIO_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_RADIO_ACTION_ENTRY")]
 	public struct RadioActionEntry {
 		public weak string name;
 		public weak string stock_id;
@@ -6279,7 +6279,7 @@ namespace Gtk {
 		public weak string tooltip;
 		public int value;
 	}
-	[CCode (type_id = "GTK_TYPE_RECENT_DATA", has_copy_function = false, has_destroy_function = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false, type_id = "GTK_TYPE_RECENT_DATA")]
 	public struct RecentData {
 		public string display_name;
 		public string description;
@@ -6290,14 +6290,14 @@ namespace Gtk {
 		public string[] groups;
 		public bool is_private;
 	}
-	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_REQUISITION")]
 	public struct Requisition {
 		public int width;
 		public int height;
 		public Gtk.Requisition copy ();
 		public void free ();
 	}
-	[CCode (type_id = "GTK_TYPE_STOCK_ITEM", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_STOCK_ITEM")]
 	public struct StockItem {
 		public weak string stock_id;
 		public weak string label;
@@ -6307,13 +6307,13 @@ namespace Gtk {
 		public Gtk.StockItem copy ();
 		public void free ();
 	}
-	[CCode (type_id = "GTK_TYPE_TARGET_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TARGET_ENTRY")]
 	public struct TargetEntry {
 		public weak string target;
 		public uint flags;
 		public uint info;
 	}
-	[CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TEXT_ITER")]
 	public struct TextIter {
 		public void* dummy1;
 		public void* dummy2;
@@ -6420,32 +6420,32 @@ namespace Gtk {
 		public bool starts_word ();
 		public bool toggles_tag (Gtk.TextTag tag);
 	}
-	[CCode (type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY")]
 	public struct ToggleActionEntry {
 		public weak string name;
 		public weak string stock_id;
 		public weak string label;
 		public weak string accelerator;
 		public weak string tooltip;
-		[CCode (type = "GCallback", delegate_target = false)]
+		[CCode (delegate_target = false, type = "GCallback")]
 		public weak Gtk.ActionCallback callback;
 		public bool is_active;
 	}
-	[CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TREE_ITER")]
 	public struct TreeIter {
 		public int stamp;
 		public void* user_data;
 		public void* user_data2;
 		public void* user_data3;
 	}
-	[CCode (cprefix = "GTK_ACCEL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ACCEL_")]
 	[Flags]
 	public enum AccelFlags {
 		VISIBLE,
 		LOCKED,
 		MASK
 	}
-	[CCode (cprefix = "GTK_ANCHOR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ANCHOR_")]
 	public enum AnchorType {
 		CENTER,
 		NORTH,
@@ -6465,7 +6465,7 @@ namespace Gtk {
 		W,
 		E
 	}
-	[CCode (cprefix = "GTK_ARG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARG_")]
 	[Flags]
 	public enum ArgFlags {
 		READABLE,
@@ -6474,13 +6474,13 @@ namespace Gtk {
 		CONSTRUCT_ONLY,
 		CHILD_ARG
 	}
-	[CCode (cprefix = "GTK_ARROWS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARROWS_")]
 	public enum ArrowPlacement {
 		BOTH,
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_ARROW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARROW_")]
 	public enum ArrowType {
 		UP,
 		DOWN,
@@ -6488,7 +6488,7 @@ namespace Gtk {
 		RIGHT,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ASSISTANT_PAGE_")]
 	public enum AssistantPageType {
 		CONTENT,
 		INTRO,
@@ -6496,14 +6496,14 @@ namespace Gtk {
 		SUMMARY,
 		PROGRESS
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	[Flags]
 	public enum AttachOptions {
 		EXPAND,
 		SHRINK,
 		FILL
 	}
-	[CCode (cprefix = "GTK_BUTTON_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTON_")]
 	[Flags]
 	public enum ButtonAction {
 		IGNORED,
@@ -6511,7 +6511,7 @@ namespace Gtk {
 		DRAGS,
 		EXPANDS
 	}
-	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTONBOX_")]
 	public enum ButtonBoxStyle {
 		DEFAULT_STYLE,
 		SPREAD,
@@ -6520,7 +6520,7 @@ namespace Gtk {
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "GTK_BUTTONS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTONS_")]
 	public enum ButtonsType {
 		NONE,
 		OK,
@@ -6529,21 +6529,21 @@ namespace Gtk {
 		YES_NO,
 		OK_CANCEL
 	}
-	[CCode (cprefix = "GTK_CLIST_DRAG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CLIST_DRAG_")]
 	public enum CListDragPos {
 		NONE,
 		BEFORE,
 		INTO,
 		AFTER
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANDER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CTREE_EXPANDER_")]
 	public enum CTreeExpanderStyle {
 		NONE,
 		SQUARE,
 		TRIANGLE,
 		CIRCULAR
 	}
-	[CCode (cprefix = "GTK_CTREE_EXPANSION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CTREE_EXPANSION_")]
 	public enum CTreeExpansionType {
 		EXPAND,
 		EXPAND_RECURSIVE,
@@ -6552,20 +6552,20 @@ namespace Gtk {
 		TOGGLE,
 		TOGGLE_RECURSIVE
 	}
-	[CCode (cprefix = "GTK_CTREE_LINES_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CTREE_LINES_")]
 	public enum CTreeLineStyle {
 		NONE,
 		SOLID,
 		DOTTED,
 		TABBED
 	}
-	[CCode (cprefix = "GTK_CTREE_POS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CTREE_POS_")]
 	public enum CTreePos {
 		BEFORE,
 		AS_CHILD,
 		AFTER
 	}
-	[CCode (cprefix = "GTK_CALENDAR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CALENDAR_")]
 	[Flags]
 	public enum CalendarDisplayOptions {
 		SHOW_HEADING,
@@ -6575,18 +6575,18 @@ namespace Gtk {
 		WEEK_START_MONDAY,
 		SHOW_DETAILS
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_")]
 	public enum CellRendererAccelMode {
 		GTK,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_MODE_")]
 	public enum CellRendererMode {
 		INERT,
 		ACTIVATABLE,
 		EDITABLE
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_")]
 	[Flags]
 	public enum CellRendererState {
 		SELECTED,
@@ -6595,7 +6595,7 @@ namespace Gtk {
 		SORTED,
 		FOCUSED
 	}
-	[CCode (cprefix = "GTK_CELL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_")]
 	public enum CellType {
 		EMPTY,
 		TEXT,
@@ -6603,20 +6603,20 @@ namespace Gtk {
 		PIXTEXT,
 		WIDGET
 	}
-	[CCode (cprefix = "GTK_CORNER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CORNER_")]
 	public enum CornerType {
 		TOP_LEFT,
 		BOTTOM_LEFT,
 		TOP_RIGHT,
 		BOTTOM_RIGHT
 	}
-	[CCode (cprefix = "GTK_CURVE_TYPE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CURVE_TYPE_")]
 	public enum CurveType {
 		LINEAR,
 		SPLINE,
 		FREE
 	}
-	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DEBUG_")]
 	[Flags]
 	public enum DebugFlag {
 		MISC,
@@ -6632,7 +6632,7 @@ namespace Gtk {
 		PRINTING,
 		BUILDER
 	}
-	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DELETE_")]
 	public enum DeleteType {
 		CHARS,
 		WORD_ENDS,
@@ -6643,7 +6643,7 @@ namespace Gtk {
 		PARAGRAPHS,
 		WHITESPACE
 	}
-	[CCode (cprefix = "GTK_DEST_DEFAULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DEST_DEFAULT_")]
 	[Flags]
 	public enum DestDefaults {
 		MOTION,
@@ -6651,14 +6651,14 @@ namespace Gtk {
 		DROP,
 		ALL
 	}
-	[CCode (cprefix = "GTK_DIALOG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DIALOG_")]
 	[Flags]
 	public enum DialogFlags {
 		MODAL,
 		DESTROY_WITH_PARENT,
 		NO_SEPARATOR
 	}
-	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DIR_")]
 	public enum DirectionType {
 		TAB_FORWARD,
 		TAB_BACKWARD,
@@ -6667,7 +6667,7 @@ namespace Gtk {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_DRAG_RESULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DRAG_RESULT_")]
 	public enum DragResult {
 		SUCCESS,
 		NO_TARGET,
@@ -6676,39 +6676,39 @@ namespace Gtk {
 		GRAB_BROKEN,
 		ERROR
 	}
-	[CCode (cprefix = "GTK_ENTRY_ICON_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ENTRY_ICON_")]
 	public enum EntryIconPosition {
 		PRIMARY,
 		SECONDARY
 	}
-	[CCode (cprefix = "GTK_EXPANDER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_EXPANDER_")]
 	public enum ExpanderStyle {
 		COLLAPSED,
 		SEMI_COLLAPSED,
 		SEMI_EXPANDED,
 		EXPANDED
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ACTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ACTION_")]
 	public enum FileChooserAction {
 		OPEN,
 		SAVE,
 		SELECT_FOLDER,
 		CREATE_FOLDER
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_")]
 	public enum FileChooserConfirmation {
 		CONFIRM,
 		ACCEPT_FILENAME,
 		SELECT_AGAIN
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")]
 	public enum FileChooserError {
 		NONEXISTENT,
 		BAD_FILENAME,
 		ALREADY_EXISTS,
 		INCOMPLETE_HOSTNAME
 	}
-	[CCode (cprefix = "GTK_FILE_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_FILTER_")]
 	[Flags]
 	public enum FileFilterFlags {
 		FILENAME,
@@ -6716,19 +6716,19 @@ namespace Gtk {
 		DISPLAY_NAME,
 		MIME_TYPE
 	}
-	[CCode (cprefix = "GTK_IM_PREEDIT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IM_PREEDIT_")]
 	public enum IMPreeditStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_IM_STATUS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IM_STATUS_")]
 	public enum IMStatusStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ICON_LOOKUP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_LOOKUP_")]
 	[Flags]
 	public enum IconLookupFlags {
 		NO_SVG,
@@ -6737,7 +6737,7 @@ namespace Gtk {
 		GENERIC_FALLBACK,
 		FORCE_SIZE
 	}
-	[CCode (cprefix = "GTK_ICON_SIZE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_SIZE_")]
 	public enum IconSize {
 		INVALID,
 		MENU,
@@ -6747,12 +6747,12 @@ namespace Gtk {
 		DND,
 		DIALOG
 	}
-	[CCode (cprefix = "GTK_ICON_THEME_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")]
 	public enum IconThemeError {
 		NOT_FOUND,
 		FAILED
 	}
-	[CCode (cprefix = "GTK_ICON_VIEW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_VIEW_")]
 	public enum IconViewDropPosition {
 		NO_DROP,
 		DROP_INTO,
@@ -6761,7 +6761,7 @@ namespace Gtk {
 		DROP_ABOVE,
 		DROP_BELOW
 	}
-	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IMAGE_")]
 	public enum ImageType {
 		EMPTY,
 		PIXMAP,
@@ -6773,14 +6773,14 @@ namespace Gtk {
 		ICON_NAME,
 		GICON
 	}
-	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_JUSTIFY_")]
 	public enum Justification {
 		LEFT,
 		RIGHT,
 		CENTER,
 		FILL
 	}
-	[CCode (cprefix = "GTK_MATCH_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MATCH_")]
 	public enum MatchType {
 		ALL,
 		ALL_TAIL,
@@ -6789,14 +6789,14 @@ namespace Gtk {
 		EXACT,
 		LAST
 	}
-	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MENU_DIR_")]
 	public enum MenuDirectionType {
 		PARENT,
 		CHILD,
 		NEXT,
 		PREV
 	}
-	[CCode (cprefix = "GTK_MESSAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MESSAGE_")]
 	public enum MessageType {
 		INFO,
 		WARNING,
@@ -6804,13 +6804,13 @@ namespace Gtk {
 		ERROR,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	public enum MetricType {
 		PIXELS,
 		INCHES,
 		CENTIMETERS
 	}
-	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MOVEMENT_")]
 	public enum MovementStep {
 		LOGICAL_POSITIONS,
 		VISUAL_POSITIONS,
@@ -6823,12 +6823,12 @@ namespace Gtk {
 		BUFFER_ENDS,
 		HORIZONTAL_PAGES
 	}
-	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_NOTEBOOK_TAB_")]
 	public enum NotebookTab {
 		FIRST,
 		LAST
 	}
-	[CCode (cprefix = "GTK_NUMBER_UP_LAYOUT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_NUMBER_UP_LAYOUT_")]
 	public enum NumberUpLayout {
 		LEFT_TO_RIGHT_TOP_TO_BOTTOM,
 		LEFT_TO_RIGHT_BOTTOM_TO_TOP,
@@ -6839,7 +6839,7 @@ namespace Gtk {
 		BOTTOM_TO_TOP_LEFT_TO_RIGHT,
 		BOTTOM_TO_TOP_RIGHT_TO_LEFT
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	[Flags]
 	public enum ObjectFlags {
 		IN_DESTRUCTION,
@@ -6847,37 +6847,37 @@ namespace Gtk {
 		RESERVED_1,
 		RESERVED_2
 	}
-	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ORIENTATION_")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PACK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PACK_DIRECTION_")]
 	public enum PackDirection {
 		LTR,
 		RTL,
 		TTB,
 		BTT
 	}
-	[CCode (cprefix = "GTK_PACK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PACK_")]
 	public enum PackType {
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PAGE_ORIENTATION_")]
 	public enum PageOrientation {
 		PORTRAIT,
 		LANDSCAPE,
 		REVERSE_PORTRAIT,
 		REVERSE_LANDSCAPE
 	}
-	[CCode (cprefix = "GTK_PAGE_SET_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PAGE_SET_")]
 	public enum PageSet {
 		ALL,
 		EVEN,
 		ODD
 	}
-	[CCode (cprefix = "GTK_PATH_PRIO_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PATH_PRIO_")]
 	public enum PathPriorityType {
 		LOWEST,
 		GTK,
@@ -6886,72 +6886,72 @@ namespace Gtk {
 		RC,
 		HIGHEST
 	}
-	[CCode (cprefix = "GTK_PATH_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PATH_")]
 	public enum PathType {
 		WIDGET,
 		WIDGET_CLASS,
 		CLASS
 	}
-	[CCode (cprefix = "GTK_POLICY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_POLICY_")]
 	public enum PolicyType {
 		ALWAYS,
 		AUTOMATIC,
 		NEVER
 	}
-	[CCode (cprefix = "GTK_POS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_POS_")]
 	public enum PositionType {
 		LEFT,
 		RIGHT,
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_PREVIEW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PREVIEW_")]
 	public enum PreviewType {
 		COLOR,
 		GRAYSCALE
 	}
-	[CCode (cprefix = "GTK_PRINT_DUPLEX_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_DUPLEX_")]
 	public enum PrintDuplex {
 		SIMPLEX,
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PRINT_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
 	public enum PrintError {
 		GENERAL,
 		INTERNAL_ERROR,
 		NOMEM,
 		INVALID_FILE
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_ACTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_OPERATION_ACTION_")]
 	public enum PrintOperationAction {
 		PRINT_DIALOG,
 		PRINT,
 		PREVIEW,
 		EXPORT
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_RESULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_OPERATION_RESULT_")]
 	public enum PrintOperationResult {
 		ERROR,
 		APPLY,
 		CANCEL,
 		IN_PROGRESS
 	}
-	[CCode (cprefix = "GTK_PRINT_PAGES_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_PAGES_")]
 	public enum PrintPages {
 		ALL,
 		CURRENT,
 		RANGES,
 		SELECTION
 	}
-	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_QUALITY_")]
 	public enum PrintQuality {
 		LOW,
 		NORMAL,
 		HIGH,
 		DRAFT
 	}
-	[CCode (cprefix = "GTK_PRINT_STATUS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_STATUS_")]
 	public enum PrintStatus {
 		INITIAL,
 		PREPARING,
@@ -6963,7 +6963,7 @@ namespace Gtk {
 		FINISHED,
 		FINISHED_ABORTED
 	}
-	[CCode (cprefix = "PRIVATE_GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "PRIVATE_GTK_")]
 	[Flags]
 	public enum PrivateFlags {
 		USER_STYLE,
@@ -6980,19 +6980,19 @@ namespace Gtk {
 		ALLOC_NEEDED,
 		REQUEST_NEEDED
 	}
-	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PROGRESS_")]
 	public enum ProgressBarOrientation {
 		LEFT_TO_RIGHT,
 		RIGHT_TO_LEFT,
 		BOTTOM_TO_TOP,
 		TOP_TO_BOTTOM
 	}
-	[CCode (cprefix = "GTK_PROGRESS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PROGRESS_")]
 	public enum ProgressBarStyle {
 		CONTINUOUS,
 		DISCRETE
 	}
-	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RC_")]
 	[Flags]
 	public enum RcFlags {
 		FG,
@@ -7000,7 +7000,7 @@ namespace Gtk {
 		TEXT,
 		BASE
 	}
-	[CCode (cprefix = "GTK_RC_TOKEN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RC_TOKEN_")]
 	public enum RcTokenType {
 		INVALID,
 		INCLUDE,
@@ -7043,12 +7043,12 @@ namespace Gtk {
 		UNBIND,
 		LAST
 	}
-	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_")]
 	public enum RecentChooserError {
 		NOT_FOUND,
 		INVALID_URI
 	}
-	[CCode (cprefix = "GTK_RECENT_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_FILTER_")]
 	[Flags]
 	public enum RecentFilterFlags {
 		URI,
@@ -7058,7 +7058,7 @@ namespace Gtk {
 		GROUP,
 		AGE
 	}
-	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
 	public enum RecentManagerError {
 		NOT_FOUND,
 		INVALID_URI,
@@ -7068,26 +7068,26 @@ namespace Gtk {
 		WRITE,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GTK_RECENT_SORT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_SORT_")]
 	public enum RecentSortType {
 		NONE,
 		MRU,
 		LRU,
 		CUSTOM
 	}
-	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RELIEF_")]
 	public enum ReliefStyle {
 		NORMAL,
 		HALF,
 		NONE
 	}
-	[CCode (cprefix = "GTK_RESIZE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RESIZE_")]
 	public enum ResizeMode {
 		PARENT,
 		QUEUE,
 		IMMEDIATE
 	}
-	[CCode (cprefix = "GTK_RESPONSE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RESPONSE_")]
 	public enum ResponseType {
 		NONE,
 		REJECT,
@@ -7101,7 +7101,7 @@ namespace Gtk {
 		APPLY,
 		HELP
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SCROLL_")]
 	public enum ScrollStep {
 		STEPS,
 		PAGES,
@@ -7110,7 +7110,7 @@ namespace Gtk {
 		HORIZONTAL_PAGES,
 		HORIZONTAL_ENDS
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SCROLL_")]
 	public enum ScrollType {
 		NONE,
 		JUMP,
@@ -7129,7 +7129,7 @@ namespace Gtk {
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_SELECTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SELECTION_")]
 	public enum SelectionMode {
 		NONE,
 		SINGLE,
@@ -7137,13 +7137,13 @@ namespace Gtk {
 		MULTIPLE,
 		EXTENDED
 	}
-	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SENSITIVITY_")]
 	public enum SensitivityType {
 		AUTO,
 		ON,
 		OFF
 	}
-	[CCode (cprefix = "GTK_SHADOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SHADOW_")]
 	public enum ShadowType {
 		NONE,
 		IN,
@@ -7151,14 +7151,14 @@ namespace Gtk {
 		ETCHED_IN,
 		ETCHED_OUT
 	}
-	[CCode (cprefix = "GTK_SIDE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SIDE_")]
 	public enum SideType {
 		TOP,
 		BOTTOM,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_RUN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RUN_")]
 	[Flags]
 	public enum SignalRunType {
 		FIRST,
@@ -7168,31 +7168,31 @@ namespace Gtk {
 		ACTION,
 		NO_HOOKS
 	}
-	[CCode (cprefix = "GTK_SIZE_GROUP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SIZE_GROUP_")]
 	public enum SizeGroupMode {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_SORT_COLUMN_", cname = "gint", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cname = "gint", cprefix = "GTK_SORT_COLUMN_")]
 	public enum SortColumn {
 		[CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")]
 		DEFAULT,
 		[CCode (cname = "GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID")]
 		UNSORTED
 	}
-	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SORT_")]
 	public enum SortType {
 		ASCENDING,
 		DESCENDING
 	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UPDATE_")]
 	public enum SpinButtonUpdatePolicy {
 		ALWAYS,
 		IF_VALID
 	}
-	[CCode (cprefix = "GTK_SPIN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SPIN_")]
 	public enum SpinType {
 		STEP_FORWARD,
 		STEP_BACKWARD,
@@ -7202,7 +7202,7 @@ namespace Gtk {
 		END,
 		USER_DEFINED
 	}
-	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_STATE_")]
 	public enum StateType {
 		NORMAL,
 		ACTIVE,
@@ -7210,17 +7210,17 @@ namespace Gtk {
 		SELECTED,
 		INSENSITIVE
 	}
-	[CCode (cprefix = "GTK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DIRECTION_")]
 	public enum SubmenuDirection {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	public enum SubmenuPlacement {
 		TOP_BOTTOM,
 		LEFT_RIGHT
 	}
-	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TARGET_")]
 	[Flags]
 	public enum TargetFlags {
 		SAME_APP,
@@ -7228,25 +7228,25 @@ namespace Gtk {
 		OTHER_APP,
 		OTHER_WIDGET
 	}
-	[CCode (cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_")]
 	public enum TextBufferTargetInfo {
 		BUFFER_CONTENTS,
 		RICH_TEXT,
 		TEXT
 	}
-	[CCode (cprefix = "GTK_TEXT_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_DIR_")]
 	public enum TextDirection {
 		NONE,
 		LTR,
 		RTL
 	}
-	[CCode (cprefix = "GTK_TEXT_SEARCH_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_SEARCH_")]
 	[Flags]
 	public enum TextSearchFlags {
 		VISIBLE_ONLY,
 		TEXT_ONLY
 	}
-	[CCode (cprefix = "GTK_TEXT_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_WINDOW_")]
 	public enum TextWindowType {
 		PRIVATE,
 		WIDGET,
@@ -7256,13 +7256,13 @@ namespace Gtk {
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_TOOL_PALETTE_DRAG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOL_PALETTE_DRAG_")]
 	[Flags]
 	public enum ToolPaletteDragTargets {
 		ITEMS,
 		GROUPS
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_CHILD_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOLBAR_CHILD_")]
 	public enum ToolbarChildType {
 		SPACE,
 		BUTTON,
@@ -7270,50 +7270,50 @@ namespace Gtk {
 		RADIOBUTTON,
 		WIDGET
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_SPACE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOLBAR_SPACE_")]
 	public enum ToolbarSpaceStyle {
 		EMPTY,
 		LINE
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOLBAR_")]
 	public enum ToolbarStyle {
 		ICONS,
 		TEXT,
 		BOTH,
 		BOTH_HORIZ
 	}
-	[CCode (cprefix = "GTK_TREE_MODEL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_MODEL_")]
 	[Flags]
 	public enum TreeModelFlags {
 		ITERS_PERSIST,
 		LIST_ONLY
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_COLUMN_")]
 	public enum TreeViewColumnSizing {
 		GROW_ONLY,
 		AUTOSIZE,
 		FIXED
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_DROP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_DROP_")]
 	public enum TreeViewDropPosition {
 		BEFORE,
 		AFTER,
 		INTO_OR_BEFORE,
 		INTO_OR_AFTER
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_GRID_LINES_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_GRID_LINES_")]
 	public enum TreeViewGridLines {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_")]
 	public enum TreeViewMode {
 		LINE,
 		ITEM
 	}
-	[CCode (cprefix = "GTK_UI_MANAGER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UI_MANAGER_")]
 	[Flags]
 	public enum UIManagerItemType {
 		AUTO,
@@ -7328,26 +7328,26 @@ namespace Gtk {
 		ACCELERATOR,
 		POPUP_WITH_ACCELS
 	}
-	[CCode (cprefix = "GTK_UNIT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UNIT_")]
 	public enum Unit {
 		PIXEL,
 		POINTS,
 		INCH,
 		MM
 	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UPDATE_")]
 	public enum UpdateType {
 		CONTINUOUS,
 		DISCONTINUOUS,
 		DELAYED
 	}
-	[CCode (cprefix = "GTK_VISIBILITY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_VISIBILITY_")]
 	public enum Visibility {
 		NONE,
 		PARTIAL,
 		FULL
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	[Flags]
 	public enum WidgetFlags {
 		TOPLEVEL,
@@ -7370,12 +7370,12 @@ namespace Gtk {
 		DOUBLE_BUFFERED,
 		NO_SHOW_ALL
 	}
-	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WIDGET_HELP_")]
 	public enum WidgetHelpType {
 		TOOLTIP,
 		WHATS_THIS
 	}
-	[CCode (cprefix = "GTK_WIN_POS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WIN_POS_")]
 	public enum WindowPosition {
 		NONE,
 		CENTER,
@@ -7383,19 +7383,19 @@ namespace Gtk {
 		CENTER_ALWAYS,
 		CENTER_ON_PARENT
 	}
-	[CCode (cprefix = "GTK_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WINDOW_")]
 	public enum WindowType {
 		TOPLEVEL,
 		POPUP
 	}
-	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WRAP_")]
 	public enum WrapMode {
 		NONE,
 		CHAR,
 		WORD,
 		WORD_CHAR
 	}
-	[CCode (cprefix = "GTK_BUILDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_")]
 	public errordomain BuilderError {
 		INVALID_TYPE_FUNCTION,
 		UNHANDLED_TAG,
@@ -7625,320 +7625,320 @@ namespace Gtk {
 	public const int PRIORITY_REDRAW;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_RESIZE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ABOUT", since = "vala-0.12")]
 	public const string STOCK_ABOUT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ADD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ADD", since = "vala-0.12")]
 	public const string STOCK_ADD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.APPLY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.APPLY", since = "vala-0.12")]
 	public const string STOCK_APPLY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.BOLD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.BOLD", since = "vala-0.12")]
 	public const string STOCK_BOLD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CANCEL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CANCEL", since = "vala-0.12")]
 	public const string STOCK_CANCEL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CAPS_LOCK_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CAPS_LOCK_WARNING", since = "vala-0.12")]
 	public const string STOCK_CAPS_LOCK_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CDROM")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CDROM", since = "vala-0.12")]
 	public const string STOCK_CDROM;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CLEAR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CLEAR", since = "vala-0.12")]
 	public const string STOCK_CLEAR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CLOSE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CLOSE", since = "vala-0.12")]
 	public const string STOCK_CLOSE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.COLOR_PICKER")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.COLOR_PICKER", since = "vala-0.12")]
 	public const string STOCK_COLOR_PICKER;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CONNECT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CONNECT", since = "vala-0.12")]
 	public const string STOCK_CONNECT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CONVERT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CONVERT", since = "vala-0.12")]
 	public const string STOCK_CONVERT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.COPY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.COPY", since = "vala-0.12")]
 	public const string STOCK_COPY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CUT", since = "vala-0.12")]
 	public const string STOCK_CUT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DELETE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DELETE", since = "vala-0.12")]
 	public const string STOCK_DELETE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_AUTHENTICATION")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_AUTHENTICATION", since = "vala-0.12")]
 	public const string STOCK_DIALOG_AUTHENTICATION;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_ERROR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_ERROR", since = "vala-0.12")]
 	public const string STOCK_DIALOG_ERROR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_INFO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_INFO", since = "vala-0.12")]
 	public const string STOCK_DIALOG_INFO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_QUESTION")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_QUESTION", since = "vala-0.12")]
 	public const string STOCK_DIALOG_QUESTION;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_WARNING", since = "vala-0.12")]
 	public const string STOCK_DIALOG_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIRECTORY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIRECTORY", since = "vala-0.12")]
 	public const string STOCK_DIRECTORY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DISCARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DISCARD", since = "vala-0.12")]
 	public const string STOCK_DISCARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DISCONNECT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DISCONNECT", since = "vala-0.12")]
 	public const string STOCK_DISCONNECT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DND", since = "vala-0.12")]
 	public const string STOCK_DND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DND_MULTIPLE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DND_MULTIPLE", since = "vala-0.12")]
 	public const string STOCK_DND_MULTIPLE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.EDIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.EDIT", since = "vala-0.12")]
 	public const string STOCK_EDIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.EXECUTE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.EXECUTE", since = "vala-0.12")]
 	public const string STOCK_EXECUTE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FILE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FILE", since = "vala-0.12")]
 	public const string STOCK_FILE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FIND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FIND", since = "vala-0.12")]
 	public const string STOCK_FIND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FIND_AND_REPLACE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FIND_AND_REPLACE", since = "vala-0.12")]
 	public const string STOCK_FIND_AND_REPLACE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FLOPPY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FLOPPY", since = "vala-0.12")]
 	public const string STOCK_FLOPPY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FULLSCREEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FULLSCREEN", since = "vala-0.12")]
 	public const string STOCK_FULLSCREEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_BOTTOM")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_BOTTOM", since = "vala-0.12")]
 	public const string STOCK_GOTO_BOTTOM;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_FIRST")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_FIRST", since = "vala-0.12")]
 	public const string STOCK_GOTO_FIRST;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_LAST")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_LAST", since = "vala-0.12")]
 	public const string STOCK_GOTO_LAST;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_TOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_TOP", since = "vala-0.12")]
 	public const string STOCK_GOTO_TOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_BACK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_BACK", since = "vala-0.12")]
 	public const string STOCK_GO_BACK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_DOWN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_DOWN", since = "vala-0.12")]
 	public const string STOCK_GO_DOWN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_FORWARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_FORWARD", since = "vala-0.12")]
 	public const string STOCK_GO_FORWARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_UP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_UP", since = "vala-0.12")]
 	public const string STOCK_GO_UP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HARDDISK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HARDDISK", since = "vala-0.12")]
 	public const string STOCK_HARDDISK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HELP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HELP", since = "vala-0.12")]
 	public const string STOCK_HELP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HOME")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HOME", since = "vala-0.12")]
 	public const string STOCK_HOME;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INDENT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INDENT", since = "vala-0.12")]
 	public const string STOCK_INDENT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INDEX")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INDEX", since = "vala-0.12")]
 	public const string STOCK_INDEX;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INFO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INFO", since = "vala-0.12")]
 	public const string STOCK_INFO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ITALIC")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ITALIC", since = "vala-0.12")]
 	public const string STOCK_ITALIC;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUMP_TO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUMP_TO", since = "vala-0.12")]
 	public const string STOCK_JUMP_TO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_CENTER")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_CENTER", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_CENTER;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_FILL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_FILL", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_FILL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_LEFT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_LEFT", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_LEFT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_RIGHT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_RIGHT", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_RIGHT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FULLSCREEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FULLSCREEN", since = "vala-0.12")]
 	public const string STOCK_LEAVE_FULLSCREEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_FORWARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_FORWARD", since = "vala-0.12")]
 	public const string STOCK_MEDIA_FORWARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_NEXT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_NEXT", since = "vala-0.12")]
 	public const string STOCK_MEDIA_NEXT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PAUSE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PAUSE", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PAUSE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PLAY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PLAY", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PLAY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PREVIOUS")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PREVIOUS", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PREVIOUS;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_RECORD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_RECORD", since = "vala-0.12")]
 	public const string STOCK_MEDIA_RECORD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_REWIND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_REWIND", since = "vala-0.12")]
 	public const string STOCK_MEDIA_REWIND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_STOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_STOP", since = "vala-0.12")]
 	public const string STOCK_MEDIA_STOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MISSING_IMAGE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MISSING_IMAGE", since = "vala-0.12")]
 	public const string STOCK_MISSING_IMAGE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NETWORK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NETWORK", since = "vala-0.12")]
 	public const string STOCK_NETWORK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NEW")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NEW", since = "vala-0.12")]
 	public const string STOCK_NEW;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NO", since = "vala-0.12")]
 	public const string STOCK_NO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.OK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.OK", since = "vala-0.12")]
 	public const string STOCK_OK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.OPEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.OPEN", since = "vala-0.12")]
 	public const string STOCK_OPEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_LANDSCAPE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_LANDSCAPE", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_LANDSCAPE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_PORTRAIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_PORTRAIT", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_PORTRAIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_REVERSE_LANDSCAPE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_REVERSE_LANDSCAPE", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_REVERSE_LANDSCAPE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_REVERSE_PORTRAIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_REVERSE_PORTRAIT", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_REVERSE_PORTRAIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PAGE_SETUP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PAGE_SETUP", since = "vala-0.12")]
 	public const string STOCK_PAGE_SETUP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PASTE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PASTE", since = "vala-0.12")]
 	public const string STOCK_PASTE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PREFERENCES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PREFERENCES", since = "vala-0.12")]
 	public const string STOCK_PREFERENCES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT", since = "vala-0.12")]
 	public const string STOCK_PRINT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_ERROR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_ERROR", since = "vala-0.12")]
 	public const string STOCK_PRINT_ERROR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_PAUSED")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_PAUSED", since = "vala-0.12")]
 	public const string STOCK_PRINT_PAUSED;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_PREVIEW")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_PREVIEW", since = "vala-0.12")]
 	public const string STOCK_PRINT_PREVIEW;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_REPORT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_REPORT", since = "vala-0.12")]
 	public const string STOCK_PRINT_REPORT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_WARNING", since = "vala-0.12")]
 	public const string STOCK_PRINT_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PROPERTIES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PROPERTIES", since = "vala-0.12")]
 	public const string STOCK_PROPERTIES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.QUIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.QUIT", since = "vala-0.12")]
 	public const string STOCK_QUIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REDO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REDO", since = "vala-0.12")]
 	public const string STOCK_REDO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REFRESH")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REFRESH", since = "vala-0.12")]
 	public const string STOCK_REFRESH;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REMOVE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REMOVE", since = "vala-0.12")]
 	public const string STOCK_REMOVE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REVERT_TO_SAVED")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REVERT_TO_SAVED", since = "vala-0.12")]
 	public const string STOCK_REVERT_TO_SAVED;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SAVE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SAVE", since = "vala-0.12")]
 	public const string STOCK_SAVE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SAVE_AS")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SAVE_AS", since = "vala-0.12")]
 	public const string STOCK_SAVE_AS;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_ALL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_ALL", since = "vala-0.12")]
 	public const string STOCK_SELECT_ALL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_COLOR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_COLOR", since = "vala-0.12")]
 	public const string STOCK_SELECT_COLOR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_FONT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_FONT", since = "vala-0.12")]
 	public const string STOCK_SELECT_FONT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SORT_ASCENDING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SORT_ASCENDING", since = "vala-0.12")]
 	public const string STOCK_SORT_ASCENDING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SORT_DESCENDING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SORT_DESCENDING", since = "vala-0.12")]
 	public const string STOCK_SORT_DESCENDING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SPELL_CHECK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SPELL_CHECK", since = "vala-0.12")]
 	public const string STOCK_SPELL_CHECK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.STOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.STOP", since = "vala-0.12")]
 	public const string STOCK_STOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.STRIKETHROUGH")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.STRIKETHROUGH", since = "vala-0.12")]
 	public const string STOCK_STRIKETHROUGH;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDELETE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDELETE", since = "vala-0.12")]
 	public const string STOCK_UNDELETE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDERLINE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDERLINE", since = "vala-0.12")]
 	public const string STOCK_UNDERLINE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDO", since = "vala-0.12")]
 	public const string STOCK_UNDO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNINDENT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNINDENT", since = "vala-0.12")]
 	public const string STOCK_UNINDENT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.YES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.YES", since = "vala-0.12")]
 	public const string STOCK_YES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_100")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_100", since = "vala-0.12")]
 	public const string STOCK_ZOOM_100;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_FIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_FIT", since = "vala-0.12")]
 	public const string STOCK_ZOOM_FIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_IN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_IN", since = "vala-0.12")]
 	public const string STOCK_ZOOM_IN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_OUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_OUT", since = "vala-0.12")]
 	public const string STOCK_ZOOM_OUT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int TEXT_VIEW_PRIORITY_VALIDATE;
@@ -8230,14 +8230,14 @@ namespace Gtk {
 	public static void show_about_dialog (Gtk.Window? parent, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool show_uri (Gdk.Screen? screen, string uri, uint32 timestamp) throws GLib.Error;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.add")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.add", since = "vala-0.12")]
 	public static void stock_add (Gtk.StockItem[] items);
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.add_static")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.add_static", since = "vala-0.12")]
 	public static void stock_add_static (Gtk.StockItem[] items);
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.list_ids")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.list_ids", since = "vala-0.12")]
 	public static GLib.SList<string> stock_list_ids ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_set_translate_func (string domain, owned Gtk.TranslateFunc func);
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 396e39c..bedffde 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1,6 +1,6 @@
 /* gtk+-3.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_", gir_namespace = "Gtk", gir_version = "3.0")]
+[CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "3.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
 	[CCode (cprefix = "GtkStock", lower_case_cprefix = "gtk_stock_")]
 	namespace Stock {
@@ -225,7 +225,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AboutDialog ();
 		public unowned string get_artists ();
 		public unowned string get_authors ();
@@ -298,8 +298,8 @@ namespace Gtk {
 		public virtual signal bool accel_activate (GLib.Object p0, uint p1, Gdk.ModifierType p2);
 		public virtual signal void accel_changed (uint keyval, Gdk.ModifierType modifier, GLib.Closure accel_closure);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class AccelGroupEntry {
 		public GLib.Quark accel_path_quark;
 		public weak GLib.Closure closure;
@@ -307,7 +307,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AccelLabel (string str);
 		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
@@ -338,8 +338,8 @@ namespace Gtk {
 		public static void unlock_path (string accel_path);
 		public virtual signal void changed (string p0, uint p1, Gdk.ModifierType p2);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class AccelMapClass {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -480,7 +480,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Alignment (float xalign, float yalign, float xscale, float yscale);
 		public void get_padding (out uint padding_top, out uint padding_bottom, out uint padding_left, out uint padding_right);
 		public void @set (float xalign, float yalign, float xscale, float yscale);
@@ -504,7 +504,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AppChooserButton : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable, Gtk.AppChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AppChooserButton (string content_type);
 		public void append_custom_item (string name, string label, GLib.Icon icon);
 		public void append_separator ();
@@ -519,9 +519,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AppChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.AppChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AppChooserDialog (Gtk.Window parent, Gtk.DialogFlags flags, GLib.File file);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AppChooserDialog.for_content_type (Gtk.Window parent, Gtk.DialogFlags flags, string content_type);
 		public unowned string get_heading ();
 		public unowned Gtk.Widget get_widget ();
@@ -532,7 +532,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AppChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.AppChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AppChooserWidget (string content_type);
 		public unowned string get_default_text ();
 		public bool get_show_all ();
@@ -568,7 +568,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
 		public void @set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
 		[NoAccessorMethod]
@@ -578,7 +578,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child);
 		public void @set (float xalign, float yalign, float ratio, bool obey_child);
 		[NoAccessorMethod]
@@ -592,7 +592,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Assistant ();
 		public void add_action_widget (Gtk.Widget child);
 		public int append_page (Gtk.Widget page);
@@ -629,13 +629,13 @@ namespace Gtk {
 		protected Bin ();
 		public unowned Gtk.Widget get_child ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingArg {
 		public GLib.Type arg_type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingEntry {
 		public weak Gtk.BindingSet binding_set;
 		public uint destroyed;
@@ -652,8 +652,8 @@ namespace Gtk {
 		public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 		public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingSet {
 		public weak Gtk.BindingEntry current;
 		public weak Gtk.BindingEntry entries;
@@ -667,8 +667,8 @@ namespace Gtk {
 		public static unowned Gtk.BindingSet by_class (void* object_class);
 		public static unowned Gtk.BindingSet find (string set_name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class BindingSignal {
 		public weak Gtk.BindingArg args;
 		public uint n_args;
@@ -677,7 +677,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Box (Gtk.Orientation orientation, int spacing);
 		public bool get_homogeneous ();
 		public int get_spacing ();
@@ -713,9 +713,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.from_stock (string stock_id);
 		public void get_alignment (out float xalign, out float yalign);
 		public unowned Gdk.Window get_event_window ();
@@ -734,9 +734,9 @@ namespace Gtk {
 		public void set_relief (Gtk.ReliefStyle newstyle);
 		public void set_use_stock (bool use_stock);
 		public void set_use_underline (bool use_underline);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.with_mnemonic (string label);
 		public bool focus_on_click { get; set; }
 		public Gtk.Widget image { get; set; }
@@ -763,7 +763,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ButtonBox (Gtk.Orientation orientation);
 		public bool get_child_non_homogeneous (Gtk.Widget child);
 		public bool get_child_secondary (Gtk.Widget child);
@@ -776,7 +776,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Calendar ();
 		public void clear_marks ();
 		public void get_date (out uint year, out uint month, out uint day);
@@ -885,7 +885,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkCellArea*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellArea*")]
 		public CellAreaBox ();
 		public int get_spacing ();
 		public void set_spacing (int spacing);
@@ -979,7 +979,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererAccel : Gtk.CellRendererText {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererAccel ();
 		[NoAccessorMethod]
 		public uint accel_key { get; set; }
@@ -994,7 +994,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererCombo : Gtk.CellRendererText {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererCombo ();
 		[NoAccessorMethod]
 		public bool has_entry { get; set; }
@@ -1006,7 +1006,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererPixbuf : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererPixbuf ();
 		[NoAccessorMethod]
 		public bool follow_state { get; set; }
@@ -1029,7 +1029,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererProgress : Gtk.CellRenderer, Gtk.Orientable {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererProgress ();
 		[NoAccessorMethod]
 		public bool inverted { get; set; }
@@ -1046,7 +1046,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererSpin : Gtk.CellRendererText {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererSpin ();
 		[NoAccessorMethod]
 		public Gtk.Adjustment adjustment { owned get; set; }
@@ -1057,7 +1057,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererSpinner : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererSpinner ();
 		[NoAccessorMethod]
 		public bool active { get; set; }
@@ -1068,7 +1068,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererText : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererText ();
 		public void set_fixed_height_from_font (int number_of_rows);
 		[NoAccessorMethod]
@@ -1169,7 +1169,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellRendererToggle : Gtk.CellRenderer {
-		[CCode (type = "GtkCellRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkCellRenderer*")]
 		public CellRendererToggle ();
 		public bool get_activatable ();
 		public bool get_active ();
@@ -1188,7 +1188,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView ();
 		public unowned Gtk.TreePath get_displayed_row ();
 		public bool get_draw_sensitive ();
@@ -1201,13 +1201,13 @@ namespace Gtk {
 		public void set_draw_sensitive (bool draw_sensitive);
 		public void set_fit_model (bool fit_model);
 		public void set_model (Gtk.TreeModel? model);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_context (Gtk.CellArea area, Gtk.CellAreaContext context);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_markup (string markup);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CellView.with_text (string text);
 		[NoAccessorMethod]
 		public string background { set; }
@@ -1227,18 +1227,18 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton ();
 		[NoWrapper]
 		public virtual void draw_indicator (Cairo.Context cr);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton.with_mnemonic (string label);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem ();
 		[NoWrapper]
 		public virtual void draw_indicator (Cairo.Context cr);
@@ -1248,9 +1248,9 @@ namespace Gtk {
 		public void set_active (bool is_active);
 		public void set_draw_as_radio (bool draw_as_radio);
 		public void set_inconsistent (bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckMenuItem.with_mnemonic (string label);
 		public bool active { get; set; }
 		public bool draw_as_radio { get; set; }
@@ -1296,7 +1296,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton ();
 		public uint16 get_alpha ();
 		public void get_color (out Gdk.Color color);
@@ -1308,9 +1308,9 @@ namespace Gtk {
 		public void set_rgba (Gdk.RGBA rgba);
 		public void set_title (string title);
 		public void set_use_alpha (bool use_alpha);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton.with_color (Gdk.Color color);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton.with_rgba (Gdk.RGBA rgba);
 		public uint alpha { get; set; }
 		public Gdk.Color color { get; set; }
@@ -1321,7 +1321,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorSelection : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorSelection ();
 		public uint16 get_current_alpha ();
 		public void get_current_color (out Gdk.Color color);
@@ -1352,7 +1352,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorSelectionDialog (string title);
 		public unowned Gtk.Widget get_color_selection ();
 		[NoAccessorMethod]
@@ -1365,7 +1365,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox ();
 		public int get_active ();
 		public unowned string get_active_id ();
@@ -1400,15 +1400,15 @@ namespace Gtk {
 		public void set_row_span_column (int row_span);
 		public void set_title (string title);
 		public void set_wrap_width (int width);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_area (Gtk.CellArea area);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_area_and_entry (Gtk.CellArea area);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_entry ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_model (Gtk.TreeModel model);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBox.with_model_and_entry (Gtk.TreeModel model);
 		public int active { get; set; }
 		public string active_id { get; set; }
@@ -1440,7 +1440,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBoxText ();
 		public void append (string id, string text);
 		public void append_text (string text);
@@ -1451,7 +1451,7 @@ namespace Gtk {
 		public void prepend_text (string text);
 		public void remove (int position);
 		public void remove_all ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ComboBoxText.with_entry ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1528,7 +1528,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
 		public unowned Gtk.Widget add_button (string button_text, int response_id);
@@ -1543,7 +1543,7 @@ namespace Gtk {
 		public void set_alternative_button_order_from_array (int n_params, int new_order);
 		public void set_default_response (int response_id);
 		public void set_response_sensitive (int response_id, bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog.with_buttons (string? title, Gtk.Window? parent, Gtk.DialogFlags flags, ...);
 		public virtual signal void close ();
 		[HasEmitter]
@@ -1552,12 +1552,12 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
 		public void* dummy;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DrawingArea ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry ();
 		public bool get_activates_default ();
 		public float get_alignment ();
@@ -1624,7 +1624,7 @@ namespace Gtk {
 		public void set_width_chars (int n_chars);
 		public int text_index_to_layout_index (int text_index);
 		public void unset_invisible_char ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry.with_buffer (Gtk.EntryBuffer buffer);
 		public bool activates_default { get; set; }
 		public Gtk.EntryBuffer buffer { get; set construct; }
@@ -1778,7 +1778,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EventBox ();
 		public bool get_above_child ();
 		public bool get_visible_window ();
@@ -1789,7 +1789,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Expander (string label);
 		public bool get_expanded ();
 		public unowned string get_label ();
@@ -1807,7 +1807,7 @@ namespace Gtk {
 		public void set_spacing (int spacing);
 		public void set_use_markup (bool use_markup);
 		public void set_use_underline (bool use_underline);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Expander.with_mnemonic (string label);
 		public bool expanded { get; set construct; }
 		public string label { get; set construct; }
@@ -1821,7 +1821,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserButton : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserButton (string title, Gtk.FileChooserAction action);
 		public bool get_focus_on_click ();
 		public unowned string get_title ();
@@ -1829,7 +1829,7 @@ namespace Gtk {
 		public void set_focus_on_click (bool focus_on_click);
 		public void set_title (string title);
 		public void set_width_chars (int n_chars);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserButton.with_dialog (Gtk.Widget dialog);
 		public Gtk.FileChooser dialog { construct; }
 		public bool focus_on_click { get; set; }
@@ -1839,12 +1839,12 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FileChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FileChooser, Gtk.FileChooserEmbed {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserWidget (Gtk.FileChooserAction action);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -1862,8 +1862,8 @@ namespace Gtk {
 		[CCode (cname = "gtk_file_filter_set_name")]
 		public void set_filter_name (string name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class FileFilterInfo {
 		public Gtk.FileFilterFlags contains;
 		public weak string display_name;
@@ -1873,13 +1873,13 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Fixed ();
 		public void move (Gtk.Widget widget, int x, int y);
 		public void put (Gtk.Widget widget, int x, int y);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class FixedChild {
 		public weak Gtk.Widget widget;
 		public int x;
@@ -1887,7 +1887,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontButton ();
 		public unowned string get_font_name ();
 		public bool get_show_size ();
@@ -1901,7 +1901,7 @@ namespace Gtk {
 		public void set_title (string title);
 		public void set_use_font (bool use_font);
 		public void set_use_size (bool use_size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontButton.with_font (string fontname);
 		public string font_name { get; set; }
 		public bool show_size { get; set; }
@@ -1913,7 +1913,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FontSelection : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontSelection ();
 		public unowned Pango.FontFace get_face ();
 		public unowned Gtk.Widget get_face_list ();
@@ -1932,7 +1932,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontSelectionDialog (string title);
 		public unowned Gtk.Widget get_cancel_button ();
 		public unowned string get_font_name ();
@@ -1944,7 +1944,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Frame (string? label);
 		[NoWrapper]
 		public virtual void compute_child_allocation (Gtk.Allocation allocation);
@@ -1964,8 +1964,8 @@ namespace Gtk {
 		public float label_yalign { get; set; }
 		public Gtk.ShadowType shadow_type { get; set; }
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_gradient_ref", type_id = "GTK_TYPE_GRADIENT", unref_function = "gtk_gradient_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_gradient_ref", unref_function = "gtk_gradient_unref", type_id = "GTK_TYPE_GRADIENT", cheader_filename = "gtk/gtk.h")]
 	public class Gradient {
 		public void add_color_stop (double offset, Gtk.SymbolicColor color);
 		[CCode (has_construct_function = false)]
@@ -1977,7 +1977,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Grid ();
 		public void attach (Gtk.Widget child, int left, int top, int width, int height);
 		public void attach_next_to (Gtk.Widget child, Gtk.Widget sibling, Gtk.PositionType side, int width, int height);
@@ -1996,22 +1996,22 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HSV ();
 		public void get_color (double h, double s, double v);
 		public void get_metrics (int size, int ring_width);
@@ -2024,24 +2024,24 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScale (Gtk.Adjustment? adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HandleBox ();
 		public bool get_child_detached ();
 		public Gtk.PositionType get_handle_position ();
@@ -2082,13 +2082,13 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IMContextSimple : Gtk.IMContext {
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkIMContext*")]
 		public IMContextSimple ();
 		public void add_table (uint16 data, int max_seq_len, int n_seqs);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IMMulticontext : Gtk.IMContext {
-		[CCode (type = "GtkIMContext*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkIMContext*")]
 		public IMMulticontext ();
 		public void append_menuitems (Gtk.MenuShell menushell);
 		public unowned string get_context_id ();
@@ -2104,8 +2104,8 @@ namespace Gtk {
 		public static unowned Gtk.IconSet lookup_default (string stock_id);
 		public void remove_default ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO")]
 	[Compact]
-	[CCode (copy_function = "gtk_icon_info_copy", type_id = "GTK_TYPE_ICON_INFO", cheader_filename = "gtk/gtk.h")]
 	public class IconInfo {
 		public Gtk.IconInfo copy ();
 		[CCode (has_construct_function = false)]
@@ -2122,8 +2122,8 @@ namespace Gtk {
 		public unowned Gdk.Pixbuf load_symbolic_for_style (Gtk.Style style, Gtk.StateType state, bool was_symbolic) throws GLib.Error;
 		public void set_raw_coordinates (bool raw_coordinates);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_icon_set_ref", type_id = "GTK_TYPE_ICON_SET", unref_function = "gtk_icon_set_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_icon_set_ref", unref_function = "gtk_icon_set_unref", type_id = "GTK_TYPE_ICON_SET", cheader_filename = "gtk/gtk.h")]
 	public class IconSet {
 		[CCode (has_construct_function = false)]
 		public IconSet ();
@@ -2135,8 +2135,8 @@ namespace Gtk {
 		public unowned Gdk.Pixbuf render_icon (Gtk.Style style, Gtk.TextDirection direction, Gtk.StateType state, Gtk.IconSize size, Gtk.Widget widget, string detail);
 		public unowned Gdk.Pixbuf render_icon_pixbuf (Gtk.StyleContext context, Gtk.IconSize size);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE")]
 	[Compact]
-	[CCode (copy_function = "gtk_icon_source_copy", type_id = "GTK_TYPE_ICON_SOURCE", cheader_filename = "gtk/gtk.h")]
 	public class IconSource {
 		[CCode (has_construct_function = false)]
 		public IconSource ();
@@ -2188,7 +2188,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconView ();
 		public void convert_widget_to_bin_window_coords (int wx, int wy, int bx, int by);
 		public unowned Cairo.Surface create_drag_icon (Gtk.TreePath path);
@@ -2245,9 +2245,9 @@ namespace Gtk {
 		public void unselect_path (Gtk.TreePath path);
 		public void unset_model_drag_dest ();
 		public void unset_model_drag_source ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconView.with_area (Gtk.CellArea area);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconView.with_model (Gtk.TreeModel model);
 		[NoAccessorMethod]
 		public Gtk.CellArea cell_area { owned get; construct; }
@@ -2278,22 +2278,22 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image ();
 		public void clear ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_animation (Gdk.PixbufAnimation animation);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_file (string filename);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_gicon (GLib.Icon icon, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_icon_name (string icon_name, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_pixbuf (Gdk.Pixbuf pixbuf);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Image.from_stock (string stock_id, Gtk.IconSize size);
 		public unowned Gdk.PixbufAnimation get_animation ();
 		public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size);
@@ -2334,9 +2334,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.from_stock (string stock_id, Gtk.AccelGroup? accel_group);
 		public bool get_always_show_image ();
 		public unowned Gtk.Widget get_image ();
@@ -2345,9 +2345,9 @@ namespace Gtk {
 		public void set_always_show_image (bool always_show);
 		public void set_image (Gtk.Widget image);
 		public void set_use_stock (bool use_stock);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ImageMenuItem.with_mnemonic (string label);
 		public Gtk.AccelGroup accel_group { set; }
 		public bool always_show_image { get; set construct; }
@@ -2356,7 +2356,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class InfoBar : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public InfoBar ();
 		public void add_action_widget (Gtk.Widget child, int response_id);
 		public unowned Gtk.Widget add_button (string button_text, int response_id);
@@ -2367,7 +2367,7 @@ namespace Gtk {
 		public void set_default_response (int response_id);
 		public void set_message_type (Gtk.MessageType message_type);
 		public void set_response_sensitive (int response_id, bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public InfoBar.with_buttons (...);
 		public Gtk.MessageType message_type { get; set construct; }
 		public virtual signal void close ();
@@ -2376,9 +2376,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Invisible ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Invisible.for_screen (Gdk.Screen screen);
 		public unowned Gdk.Screen get_screen ();
 		public void set_screen (Gdk.Screen screen);
@@ -2386,7 +2386,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Label (string? str);
 		public double get_angle ();
 		public unowned Pango.AttrList get_attributes ();
@@ -2430,7 +2430,7 @@ namespace Gtk {
 		public void set_use_markup (bool setting);
 		public void set_use_underline (bool setting);
 		public void set_width_chars (int n_chars);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Label.with_mnemonic (string str);
 		public double angle { get; set; }
 		public Pango.AttrList attributes { get; set; }
@@ -2461,13 +2461,13 @@ namespace Gtk {
 		public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool extend_selection);
 		public virtual signal void populate_popup (Gtk.Menu menu);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class LabelSelectionInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Layout (Gtk.Adjustment? hadjustment = null, Gtk.Adjustment? vadjustment = null);
 		public unowned Gdk.Window get_bin_window ();
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -2485,13 +2485,13 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LinkButton (string uri);
 		public unowned string get_uri ();
 		public bool get_visited ();
 		public void set_uri (string uri);
 		public void set_visited (bool visited);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LinkButton.with_label (string uri, string label);
 		public string uri { get; set; }
 		public bool visited { get; set; }
@@ -2499,7 +2499,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ListStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable, Gtk.Buildable {
-		[CCode (sentinel = "", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "")]
 		public ListStore (int n_columns, ...);
 		public void append (out Gtk.TreeIter iter);
 		public void clear ();
@@ -2527,7 +2527,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class LockButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LockButton (GLib.Permission permission);
 		public unowned GLib.Permission get_permission ();
 		[NoWrapper]
@@ -2561,7 +2561,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Menu ();
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
 		public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc? detacher);
@@ -2602,7 +2602,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuBar ();
 		public Gtk.PackDirection get_child_pack_direction ();
 		public Gtk.PackDirection get_pack_direction ();
@@ -2613,7 +2613,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MenuItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem ();
 		public unowned string get_accel_path ();
 		public virtual unowned string get_label ();
@@ -2627,9 +2627,9 @@ namespace Gtk {
 		public void set_right_justified (bool right_justified);
 		public void set_submenu (Gtk.Widget submenu);
 		public void set_use_underline (bool setting);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public MenuItem.with_mnemonic (string label);
 		public string accel_path { get; set; }
 		public string label { get; set; }
@@ -2676,9 +2676,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public MenuToolButton (Gtk.Widget? icon_widget, string? label);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public MenuToolButton.from_stock (string stock_id);
 		public unowned Gtk.Widget get_menu ();
 		public void set_arrow_tooltip_markup (string markup);
@@ -2689,8 +2689,8 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		[PrintfFormat]
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MessageDialog (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
 		[PrintfFormat]
 		public void format_secondary_markup (string message_format, ...);
@@ -2700,8 +2700,8 @@ namespace Gtk {
 		public unowned Gtk.Widget get_message_area ();
 		public void set_image (Gtk.Widget image);
 		public void set_markup (string str);
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		[PrintfFormat]
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public MessageDialog.with_markup (Gtk.Window? parent, Gtk.DialogFlags flags, Gtk.MessageType type, Gtk.ButtonsType buttons, string message_format, ...);
 		[NoAccessorMethod]
 		public Gtk.ButtonsType buttons { construct; }
@@ -2737,7 +2737,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class MountOperation : GLib.MountOperation {
-		[CCode (type = "GMountOperation*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GMountOperation*")]
 		public MountOperation (Gtk.Window? parent);
 		public unowned Gtk.Window get_parent ();
 		public unowned Gdk.Screen get_screen ();
@@ -2750,7 +2750,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Notebook : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Notebook ();
 		public int append_page (Gtk.Widget child, Gtk.Widget? tab_label);
 		public int append_page_menu (Gtk.Widget child, Gtk.Widget? tab_label, Gtk.Widget? menu_label);
@@ -2818,7 +2818,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class NumerableIcon : GLib.EmblemedIcon, GLib.Icon {
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public NumerableIcon (GLib.Icon base_icon);
 		public unowned GLib.Icon get_background_gicon ();
 		public unowned string get_background_icon_name ();
@@ -2830,7 +2830,7 @@ namespace Gtk {
 		public void set_count (int count);
 		public void set_label (string label);
 		public void set_style_context (Gtk.StyleContext style);
-		[CCode (type = "GIcon*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GIcon*")]
 		public NumerableIcon.with_style_context (GLib.Icon base_icon, Gtk.StyleContext context);
 		[NoAccessorMethod]
 		public GLib.Icon background_icon { owned get; set; }
@@ -2841,20 +2841,20 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public OffscreenWindow ();
 		public unowned Gdk.Pixbuf get_pixbuf ();
 		public unowned Cairo.Surface get_surface ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Overlay : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Overlay ();
 		public void add_overlay (Gtk.Widget widget);
 		public virtual signal bool get_child_position (Gtk.Widget widget, Gdk.Rectangle allocation);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class PageRange {
 		public int end;
 		public int start;
@@ -2892,7 +2892,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Paned (Gtk.Orientation orientation);
 		public void add1 (Gtk.Widget child);
 		public void add2 (Gtk.Widget child);
@@ -2917,8 +2917,8 @@ namespace Gtk {
 		public virtual signal bool move_handle (Gtk.ScrollType scroll);
 		public virtual signal bool toggle_handle_focus ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE")]
 	[Compact]
-	[CCode (copy_function = "gtk_paper_size_copy", type_id = "GTK_TYPE_PAPER_SIZE", cheader_filename = "gtk/gtk.h")]
 	public class PaperSize {
 		[CCode (has_construct_function = false)]
 		public PaperSize (string name);
@@ -2947,11 +2947,11 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtkx.h")]
 	public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Plug (Gtk.Window socket_id);
 		public void @construct (Gtk.Window socket_id);
 		public void construct_for_display (Gdk.Display display, Gtk.Window socket_id);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Plug.for_display (Gdk.Display display, Gtk.Window socket_id);
 		public bool get_embedded ();
 		public unowned Gtk.Window get_id ();
@@ -3130,7 +3130,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ProgressBar ();
 		public Pango.EllipsizeMode get_ellipsize ();
 		public double get_fraction ();
@@ -3170,20 +3170,20 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton (GLib.SList<Gtk.RadioButton>? group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.from_widget (Gtk.RadioButton radio_group_member);
 		public unowned GLib.SList<Gtk.RadioButton> get_group ();
 		public void join_group (Gtk.RadioButton group_source);
 		public void set_group (GLib.SList<Gtk.RadioButton> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_label (GLib.SList<Gtk.RadioButton>? group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_label_from_widget (Gtk.RadioButton radio_group_member, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_mnemonic (GLib.SList<Gtk.RadioButton>? group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioButton.with_mnemonic_from_widget (Gtk.RadioButton radio_group_member, string label);
 		[NoAccessorMethod]
 		public Gtk.RadioButton group { set; }
@@ -3191,34 +3191,34 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.from_widget (Gtk.RadioMenuItem group);
 		public unowned GLib.SList<Gtk.RadioMenuItem> get_group ();
 		public void set_group (GLib.SList<Gtk.RadioMenuItem> group);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_label (GLib.SList<Gtk.RadioMenuItem> group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_label_from_widget (Gtk.RadioMenuItem group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_mnemonic (GLib.SList<Gtk.RadioMenuItem> group, string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RadioMenuItem.with_mnemonic_from_widget (Gtk.RadioMenuItem group, string label);
 		public Gtk.RadioMenuItem group { set; }
 		public virtual signal void group_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton (GLib.SList<Gtk.RadioToolButton>? group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.from_stock (GLib.SList<Gtk.RadioToolButton>? group, string stock_id);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.from_widget (Gtk.RadioToolButton group);
 		public unowned GLib.SList<Gtk.RadioToolButton> get_group ();
 		public void set_group (GLib.SList<Gtk.RadioToolButton> group);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id);
 		public Gtk.RadioToolButton group { set; }
 	}
@@ -3269,12 +3269,12 @@ namespace Gtk {
 		public virtual signal void move_slider (Gtk.ScrollType scroll);
 		public virtual signal void value_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RcContext {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RcProperty {
 		public weak string origin;
 		public GLib.Quark property_name;
@@ -3322,9 +3322,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkAction*")]
 		public RecentAction (string name, string label, string tooltip, string stock_id);
-		[CCode (type = "GtkAction*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkAction*")]
 		public RecentAction.for_manager (string name, string label, string tooltip, string stock_id, Gtk.RecentManager manager);
 		public bool get_show_numbers ();
 		public void set_show_numbers (bool show_numbers);
@@ -3332,16 +3332,16 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserDialog (string title, Gtk.Window parent, ...);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager manager, ...);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserMenu ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserMenu.for_manager (Gtk.RecentManager manager);
 		public bool get_show_numbers ();
 		[NoWrapper]
@@ -3357,9 +3357,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class RecentChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.RecentChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserWidget ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -3376,8 +3376,8 @@ namespace Gtk {
 		public bool filter (Gtk.RecentFilterInfo filter_info);
 		public Gtk.RecentFilterFlags get_needed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RecentFilterInfo {
 		public int age;
 		public weak string applications;
@@ -3387,8 +3387,8 @@ namespace Gtk {
 		public weak string mime_type;
 		public weak string uri;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_recent_info_ref", type_id = "GTK_TYPE_RECENT_INFO", unref_function = "gtk_recent_info_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_recent_info_ref", unref_function = "gtk_recent_info_unref", type_id = "GTK_TYPE_RECENT_INFO", cheader_filename = "gtk/gtk.h")]
 	public class RecentInfo {
 		public unowned GLib.AppInfo create_app_info (string app_name) throws GLib.Error;
 		public bool exists ();
@@ -3436,8 +3436,8 @@ namespace Gtk {
 		public int size { get; }
 		public virtual signal void changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class RequestedSize {
 		public void* data;
 		public int minimum_size;
@@ -3445,7 +3445,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Scale (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
 		public void add_mark (double value, Gtk.PositionType position, string? markup);
 		public void clear_marks ();
@@ -3457,7 +3457,7 @@ namespace Gtk {
 		public void set_digits (int digits);
 		public void set_draw_value (bool draw_value);
 		public void set_value_pos (Gtk.PositionType pos);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Scale.with_range (Gtk.Orientation orientation, double min, double max, double step);
 		public int digits { get; set; }
 		public bool draw_value { get; set; }
@@ -3466,7 +3466,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ScaleButton (Gtk.IconSize size, double min, double max, double step, [CCode (array_length = false)] string[] icons);
 		public unowned Gtk.Adjustment get_adjustment ();
 		public unowned Gtk.Widget get_minus_button ();
@@ -3477,8 +3477,8 @@ namespace Gtk {
 		public void set_icons ([CCode (array_length = false)] string[] icons);
 		public void set_value (double value);
 		public Gtk.Adjustment adjustment { get; set; }
-		[NoAccessorMethod]
 		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
 		public string[] icons { owned get; set; }
 		[NoAccessorMethod]
 		public Gtk.IconSize size { get; set; }
@@ -3489,12 +3489,12 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Scrollbar (Gtk.Orientation orientation, Gtk.Adjustment adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public void add_with_viewport (Gtk.Widget child);
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -3530,8 +3530,8 @@ namespace Gtk {
 		public virtual signal void move_focus_out (Gtk.DirectionType direction);
 		public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA")]
 	[Compact]
-	[CCode (copy_function = "gtk_selection_data_copy", type_id = "GTK_TYPE_SELECTION_DATA", cheader_filename = "gtk/gtk.h")]
 	public class SelectionData {
 		public Gtk.SelectionData copy ();
 		[CCode (array_length = false)]
@@ -3559,17 +3559,17 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Separator (Gtk.Orientation orientation);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SeparatorMenuItem ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public SeparatorToolItem ();
 		public bool get_draw ();
 		public void set_draw (bool draw);
@@ -3726,8 +3726,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string gtk_xft_rgba { owned get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class SettingsValue {
 		public weak string origin;
 		public GLib.Value value;
@@ -3748,7 +3748,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtkx.h")]
 	public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Socket ();
 		public void add_id (Gtk.Window window);
 		public unowned Gtk.Window get_id ();
@@ -3758,7 +3758,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public void configure (Gtk.Adjustment adjustment, double climb_rate, uint digits);
 		public unowned Gtk.Adjustment get_adjustment ();
@@ -3782,7 +3782,7 @@ namespace Gtk {
 		public void set_wrap (bool wrap);
 		public void spin (Gtk.SpinType direction, double increment);
 		public void update ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpinButton.with_range (double min, double max, double step);
 		public Gtk.Adjustment adjustment { get; set; }
 		[NoAccessorMethod]
@@ -3801,7 +3801,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Spinner : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Spinner ();
 		public void start ();
 		public void stop ();
@@ -3883,7 +3883,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Statusbar : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Statusbar ();
 		public uint get_context_id (string context_description);
 		public unowned Gtk.Widget get_message_area ();
@@ -4064,15 +4064,15 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Switch ();
 		public bool get_active ();
 		public void set_active (bool is_active);
 		public bool active { get; set; }
 		public virtual signal void activate ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_symbolic_color_ref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", unref_function = "gtk_symbolic_color_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_symbolic_color_ref", unref_function = "gtk_symbolic_color_unref", type_id = "GTK_TYPE_SYMBOLIC_COLOR", cheader_filename = "gtk/gtk.h")]
 	public class SymbolicColor {
 		[CCode (has_construct_function = false)]
 		public SymbolicColor.alpha (Gtk.SymbolicColor color, double factor);
@@ -4089,7 +4089,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Table (uint rows, uint columns, bool homogeneous);
 		public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach, Gtk.AttachOptions xoptions, Gtk.AttachOptions yoptions, uint xpadding, uint ypadding);
 		public void attach_defaults (Gtk.Widget widget, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach);
@@ -4115,8 +4115,8 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public uint row_spacing { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TableChild {
 		public uint16 bottom_attach;
 		public uint16 left_attach;
@@ -4132,8 +4132,8 @@ namespace Gtk {
 		public uint16 ypadding;
 		public uint yshrink;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TableRowCol {
 		public uint16 allocation;
 		public uint empty;
@@ -4144,8 +4144,8 @@ namespace Gtk {
 		public uint shrink;
 		public uint16 spacing;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_target_list_ref", type_id = "GTK_TYPE_TARGET_LIST", unref_function = "gtk_target_list_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_target_list_ref", unref_function = "gtk_target_list_unref", type_id = "GTK_TYPE_TARGET_LIST", cheader_filename = "gtk/gtk.h")]
 	public class TargetList {
 		[CCode (has_construct_function = false)]
 		public TargetList (Gtk.TargetEntry[] targets);
@@ -4160,11 +4160,11 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TearoffMenuItem ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextAppearance {
 		public Gdk.Color bg_color;
 		public uint draw_bg;
@@ -4177,8 +4177,8 @@ namespace Gtk {
 		public uint strikethrough;
 		public uint underline;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_text_attributes_ref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", unref_function = "gtk_text_attributes_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_text_attributes_ref", unref_function = "gtk_text_attributes_unref", type_id = "GTK_TYPE_TEXT_ATTRIBUTES", cheader_filename = "gtk/gtk.h")]
 	public class TextAttributes {
 		public weak Gtk.TextAppearance appearance;
 		public uint bg_full_height;
@@ -4207,8 +4207,8 @@ namespace Gtk {
 		public Gtk.TextAttributes copy ();
 		public void copy_values (Gtk.TextAttributes dest);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class TextBTree {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4484,7 +4484,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TextView ();
 		public void add_child_at_anchor (Gtk.Widget child, Gtk.TextChildAnchor anchor);
 		public void add_child_in_window (Gtk.Widget child, Gtk.TextWindowType which_window, int xpos, int ypos);
@@ -4546,7 +4546,7 @@ namespace Gtk {
 		public void set_wrap_mode (Gtk.WrapMode wrap_mode);
 		public bool starts_display_line (Gtk.TextIter iter);
 		public void window_to_buffer_coords (Gtk.TextWindowType win, int window_x, int window_y, out int buffer_x, out int buffer_y);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TextView.with_buffer (Gtk.TextBuffer buffer);
 		public bool accepts_tab { get; set; }
 		public Gtk.TextBuffer buffer { get; set; }
@@ -4579,8 +4579,8 @@ namespace Gtk {
 		public virtual signal void toggle_cursor_visible ();
 		public virtual signal void toggle_overwrite ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class ThemeEngine {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -4661,7 +4661,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton ();
 		public bool get_active ();
 		public bool get_inconsistent ();
@@ -4669,9 +4669,9 @@ namespace Gtk {
 		public void set_active (bool is_active);
 		public void set_inconsistent (bool setting);
 		public void set_mode (bool draw_indicator);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton.with_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToggleButton.with_mnemonic (string label);
 		public bool active { get; set; }
 		[NoAccessorMethod]
@@ -4682,9 +4682,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToggleToolButton ();
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToggleToolButton.from_stock (string stock_id);
 		public bool get_active ();
 		public void set_active (bool is_active);
@@ -4693,9 +4693,9 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToolButton (Gtk.Widget? icon_widget, string? label);
-		[CCode (type = "GtkToolItem*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkToolItem*")]
 		public ToolButton.from_stock (string stock_id);
 		public unowned string get_icon_name ();
 		public unowned Gtk.Widget get_icon_widget ();
@@ -4755,7 +4755,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToolItemGroup (string label);
 		public bool get_collapsed ();
 		public unowned Gtk.ToolItem get_drop_item (int x, int y);
@@ -4781,7 +4781,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ToolPalette ();
 		public void add_drag_dest (Gtk.Widget widget, Gtk.DestDefaults flags, Gtk.ToolPaletteDragTargets targets, Gdk.DragAction actions);
 		public unowned Gtk.Widget get_drag_item (Gtk.SelectionData selection);
@@ -4812,7 +4812,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Toolbar ();
 		public int get_drop_index (int x, int y);
 		public int get_item_index (Gtk.ToolItem item);
@@ -4853,7 +4853,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkTreeModel*")]
 		public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
 		public void clear_cache ();
 		public bool convert_child_iter_to_iter (out Gtk.TreeIter filter_iter, Gtk.TreeIter child_iter);
@@ -4886,13 +4886,13 @@ namespace Gtk {
 		public unowned Gtk.TreeModel get_model ();
 		public bool iter_is_valid (Gtk.TreeIter iter);
 		public void reset_default_sort_func ();
-		[CCode (type = "GtkTreeModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkTreeModel*")]
 		public TreeModelSort.with_model (Gtk.TreeModel child_model);
 		public Gtk.TreeModel model { get; construct; }
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", const_cname = "GtkTreePath", copy_function = "gtk_tree_path_copy", type_id = "GTK_TYPE_TREE_PATH")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "gtk_tree_path_copy", const_cname = "GtkTreePath", type_id = "GTK_TYPE_TREE_PATH", cheader_filename = "gtk/gtk.h")]
 	public class TreePath {
 		[CCode (has_construct_function = false)]
 		public TreePath ();
@@ -4902,7 +4902,7 @@ namespace Gtk {
 		public void down ();
 		[CCode (has_construct_function = false)]
 		public TreePath.first ();
-		[CCode (sentinel = "-1", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "-1")]
 		public TreePath.from_indices (...);
 		[CCode (has_construct_function = false)]
 		public TreePath.from_string (string path);
@@ -4917,9 +4917,9 @@ namespace Gtk {
 		public unowned string to_string ();
 		public bool up ();
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "gtk_tree_row_reference_copy", type_id = "GTK_TYPE_TREE_ROW_REFERENCE", cheader_filename = "gtk/gtk.h")]
 	public class TreeRowReference {
 		[CCode (has_construct_function = false)]
 		public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
@@ -4962,7 +4962,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, Gtk.TreeSortable, Gtk.Buildable {
-		[CCode (sentinel = "", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "")]
 		public TreeStore (int n_columns, ...);
 		public void append (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
 		public void clear ();
@@ -4992,7 +4992,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TreeView ();
 		public int append_column (Gtk.TreeViewColumn column);
 		public void collapse_all ();
@@ -5090,7 +5090,7 @@ namespace Gtk {
 		public void set_vadjustment (Gtk.Adjustment adjustment);
 		public void unset_rows_drag_dest ();
 		public void unset_rows_drag_source ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TreeView.with_model (Gtk.TreeModel model);
 		[NoAccessorMethod]
 		public Gtk.TreeViewGridLines enable_grid_lines { get; set; }
@@ -5232,39 +5232,39 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VBox (bool homogeneous, int spacing);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VButtonBox ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VPaned ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScale (Gtk.Adjustment? adjustment);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScale.with_range (double min, double max, double step);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VScrollbar (Gtk.Adjustment? adjustment);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VSeparator ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
 		public unowned Gdk.Window get_bin_window ();
 		public unowned Gtk.Adjustment get_hadjustment ();
@@ -5278,7 +5278,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VolumeButton ();
 		[NoAccessorMethod]
 		public bool use_symbolic { get; set; }
@@ -5286,7 +5286,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Widget : GLib.InitiallyUnowned, Atk.Implementor, Gtk.Buildable {
 		public class uint activate_signal;
-		[CCode (has_new_function = false, construct_function = "gtk_widget_new")]
+		[CCode (construct_function = "gtk_widget_new", has_new_function = false)]
 		public Widget (...);
 		public bool activate ();
 		public void add_accelerator (string accel_signal, Gtk.AccelGroup accel_group, uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags);
@@ -5609,8 +5609,8 @@ namespace Gtk {
 		public virtual signal bool visibility_notify_event (Gdk.EventVisibility event);
 		public virtual signal bool window_state_event (Gdk.EventWindowState event);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class WidgetAuxInfo {
 		public uint halign;
 		public int height;
@@ -5618,8 +5618,8 @@ namespace Gtk {
 		public uint valign;
 		public int width;
 	}
+	[CCode (cheader_filename = "gtk/gtk.h", ref_function = "gtk_widget_path_ref", type_id = "GTK_TYPE_WIDGET_PATH", unref_function = "gtk_widget_path_unref")]
 	[Compact]
-	[CCode (ref_function = "gtk_widget_path_ref", unref_function = "gtk_widget_path_unref", type_id = "GTK_TYPE_WIDGET_PATH", cheader_filename = "gtk/gtk.h")]
 	public class WidgetPath {
 		[CCode (has_construct_function = false)]
 		public WidgetPath ();
@@ -5656,7 +5656,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Window (Gtk.WindowType type = Gtk.WindowType.TOPLEVEL);
 		public bool activate_default ();
 		public bool activate_focus ();
@@ -5806,8 +5806,8 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void set_focus (Gtk.Widget? focus);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Compact]
 	public class WindowGeometryInfo {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
@@ -6132,37 +6132,37 @@ namespace Gtk {
 		[HasEmitter]
 		public signal void sort_column_changed ();
 	}
-	[CCode (type_id = "GTK_TYPE_ACCEL_KEY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACCEL_KEY")]
 	public struct AccelKey {
 		public uint accel_key;
 		public Gdk.ModifierType accel_mods;
 		public uint accel_flags;
 	}
-	[CCode (type_id = "GTK_TYPE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ACTION_ENTRY")]
 	public struct ActionEntry {
 		public weak string name;
 		public weak string stock_id;
 		public weak string label;
 		public weak string accelerator;
 		public weak string tooltip;
-		[CCode (type = "GCallback", delegate_target = false)]
+		[CCode (delegate_target = false, type = "GCallback")]
 		public weak Gtk.ActionCallback callback;
 	}
-	[CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_ALLOCATION")]
 	public struct Allocation {
 		public int x;
 		public int y;
 		public int width;
 		public int height;
 	}
-	[CCode (type_id = "GTK_TYPE_BORDER", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_BORDER")]
 	public struct Border {
 		public int16 left;
 		public int16 right;
 		public int16 top;
 		public int16 bottom;
 	}
-	[CCode (type_id = "GTK_TYPE_IM_CONTEXT_INFO", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_IM_CONTEXT_INFO")]
 	public struct IMContextInfo {
 		public weak string context_id;
 		public weak string context_name;
@@ -6170,7 +6170,7 @@ namespace Gtk {
 		public weak string domain_dirname;
 		public weak string default_locales;
 	}
-	[CCode (type_id = "GTK_TYPE_RADIO_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_RADIO_ACTION_ENTRY")]
 	public struct RadioActionEntry {
 		public weak string name;
 		public weak string stock_id;
@@ -6179,7 +6179,7 @@ namespace Gtk {
 		public weak string tooltip;
 		public int value;
 	}
-	[CCode (type_id = "GTK_TYPE_RECENT_DATA", has_copy_function = false, has_destroy_function = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", has_copy_function = false, has_destroy_function = false, type_id = "GTK_TYPE_RECENT_DATA")]
 	public struct RecentData {
 		public string display_name;
 		public string description;
@@ -6190,14 +6190,14 @@ namespace Gtk {
 		public string[] groups;
 		public bool is_private;
 	}
-	[CCode (type_id = "GTK_TYPE_REQUISITION", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_REQUISITION")]
 	public struct Requisition {
 		public int width;
 		public int height;
 		public Gtk.Requisition copy ();
 		public void free ();
 	}
-	[CCode (type_id = "GTK_TYPE_STOCK_ITEM", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_STOCK_ITEM")]
 	public struct StockItem {
 		public weak string stock_id;
 		public weak string label;
@@ -6207,7 +6207,7 @@ namespace Gtk {
 		public Gtk.StockItem copy ();
 		public void free ();
 	}
-	[CCode (type_id = "GTK_TYPE_TARGET_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TARGET_ENTRY")]
 	public struct TargetEntry {
 		public weak string target;
 		public uint flags;
@@ -6217,7 +6217,7 @@ namespace Gtk {
 		public Gtk.TargetEntry copy ();
 		public void free ();
 	}
-	[CCode (type_id = "GTK_TYPE_TEXT_ITER", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TEXT_ITER")]
 	public struct TextIter {
 		public void* dummy1;
 		public void* dummy2;
@@ -6324,45 +6324,45 @@ namespace Gtk {
 		public bool starts_word ();
 		public bool toggles_tag (Gtk.TextTag tag);
 	}
-	[CCode (type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TOGGLE_ACTION_ENTRY")]
 	public struct ToggleActionEntry {
 		public weak string name;
 		public weak string stock_id;
 		public weak string label;
 		public weak string accelerator;
 		public weak string tooltip;
-		[CCode (type = "GCallback", delegate_target = false)]
+		[CCode (delegate_target = false, type = "GCallback")]
 		public weak Gtk.ActionCallback callback;
 		public bool is_active;
 	}
-	[CCode (type_id = "GTK_TYPE_TREE_ITER", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", type_id = "GTK_TYPE_TREE_ITER")]
 	public struct TreeIter {
 		public int stamp;
 		public void* user_data;
 		public void* user_data2;
 		public void* user_data3;
 	}
-	[CCode (cprefix = "GTK_ACCEL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ACCEL_")]
 	[Flags]
 	public enum AccelFlags {
 		VISIBLE,
 		LOCKED,
 		MASK
 	}
-	[CCode (cprefix = "GTK_ALIGN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ALIGN_")]
 	public enum Align {
 		FILL,
 		START,
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "GTK_ARROWS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARROWS_")]
 	public enum ArrowPlacement {
 		BOTH,
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_ARROW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARROW_")]
 	public enum ArrowType {
 		UP,
 		DOWN,
@@ -6370,7 +6370,7 @@ namespace Gtk {
 		RIGHT,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ASSISTANT_PAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ASSISTANT_PAGE_")]
 	public enum AssistantPageType {
 		CONTENT,
 		INTRO,
@@ -6379,21 +6379,21 @@ namespace Gtk {
 		PROGRESS,
 		CUSTOM
 	}
-	[CCode (cprefix = "GTK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_")]
 	[Flags]
 	public enum AttachOptions {
 		EXPAND,
 		SHRINK,
 		FILL
 	}
-	[CCode (cprefix = "GTK_BORDER_STYLE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BORDER_STYLE_")]
 	public enum BorderStyle {
 		NONE,
 		SOLID,
 		INSET,
 		OUTSET
 	}
-	[CCode (cprefix = "GTK_BUTTONBOX_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTONBOX_")]
 	public enum ButtonBoxStyle {
 		SPREAD,
 		EDGE,
@@ -6401,7 +6401,7 @@ namespace Gtk {
 		END,
 		CENTER
 	}
-	[CCode (cprefix = "GTK_BUTTONS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTONS_")]
 	public enum ButtonsType {
 		NONE,
 		OK,
@@ -6410,7 +6410,7 @@ namespace Gtk {
 		YES_NO,
 		OK_CANCEL
 	}
-	[CCode (cprefix = "GTK_CALENDAR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CALENDAR_")]
 	[Flags]
 	public enum CalendarDisplayOptions {
 		SHOW_HEADING,
@@ -6419,18 +6419,18 @@ namespace Gtk {
 		SHOW_WEEK_NUMBERS,
 		SHOW_DETAILS
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_ACCEL_MODE_")]
 	public enum CellRendererAccelMode {
 		GTK,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_MODE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_MODE_")]
 	public enum CellRendererMode {
 		INERT,
 		ACTIVATABLE,
 		EDITABLE
 	}
-	[CCode (cprefix = "GTK_CELL_RENDERER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CELL_RENDERER_")]
 	[Flags]
 	public enum CellRendererState {
 		SELECTED,
@@ -6439,14 +6439,14 @@ namespace Gtk {
 		SORTED,
 		FOCUSED
 	}
-	[CCode (cprefix = "GTK_CORNER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CORNER_")]
 	public enum CornerType {
 		TOP_LEFT,
 		BOTTOM_LEFT,
 		TOP_RIGHT,
 		BOTTOM_RIGHT
 	}
-	[CCode (cprefix = "GTK_CSS_PROVIDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_")]
 	public enum CssProviderError {
 		FAILED,
 		SYNTAX,
@@ -6455,7 +6455,7 @@ namespace Gtk {
 		DEPRECATED,
 		UNKNOWN_VALUE
 	}
-	[CCode (cprefix = "GTK_DEBUG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DEBUG_")]
 	[Flags]
 	public enum DebugFlag {
 		MISC,
@@ -6472,7 +6472,7 @@ namespace Gtk {
 		BUILDER,
 		SIZE_REQUEST
 	}
-	[CCode (cprefix = "GTK_DELETE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DELETE_")]
 	public enum DeleteType {
 		CHARS,
 		WORD_ENDS,
@@ -6483,7 +6483,7 @@ namespace Gtk {
 		PARAGRAPHS,
 		WHITESPACE
 	}
-	[CCode (cprefix = "GTK_DEST_DEFAULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DEST_DEFAULT_")]
 	[Flags]
 	public enum DestDefaults {
 		MOTION,
@@ -6491,13 +6491,13 @@ namespace Gtk {
 		DROP,
 		ALL
 	}
-	[CCode (cprefix = "GTK_DIALOG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DIALOG_")]
 	[Flags]
 	public enum DialogFlags {
 		MODAL,
 		DESTROY_WITH_PARENT
 	}
-	[CCode (cprefix = "GTK_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DIR_")]
 	public enum DirectionType {
 		TAB_FORWARD,
 		TAB_BACKWARD,
@@ -6506,7 +6506,7 @@ namespace Gtk {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_DRAG_RESULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_DRAG_RESULT_")]
 	public enum DragResult {
 		SUCCESS,
 		NO_TARGET,
@@ -6515,39 +6515,39 @@ namespace Gtk {
 		GRAB_BROKEN,
 		ERROR
 	}
-	[CCode (cprefix = "GTK_ENTRY_ICON_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ENTRY_ICON_")]
 	public enum EntryIconPosition {
 		PRIMARY,
 		SECONDARY
 	}
-	[CCode (cprefix = "GTK_EXPANDER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_EXPANDER_")]
 	public enum ExpanderStyle {
 		COLLAPSED,
 		SEMI_COLLAPSED,
 		SEMI_EXPANDED,
 		EXPANDED
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ACTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ACTION_")]
 	public enum FileChooserAction {
 		OPEN,
 		SAVE,
 		SELECT_FOLDER,
 		CREATE_FOLDER
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_CONFIRMATION_")]
 	public enum FileChooserConfirmation {
 		CONFIRM,
 		ACCEPT_FILENAME,
 		SELECT_AGAIN
 	}
-	[CCode (cprefix = "GTK_FILE_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")]
 	public enum FileChooserError {
 		NONEXISTENT,
 		BAD_FILENAME,
 		ALREADY_EXISTS,
 		INCOMPLETE_HOSTNAME
 	}
-	[CCode (cprefix = "GTK_FILE_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_FILTER_")]
 	[Flags]
 	public enum FileFilterFlags {
 		FILENAME,
@@ -6555,19 +6555,19 @@ namespace Gtk {
 		DISPLAY_NAME,
 		MIME_TYPE
 	}
-	[CCode (cprefix = "GTK_IM_PREEDIT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IM_PREEDIT_")]
 	public enum IMPreeditStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_IM_STATUS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IM_STATUS_")]
 	public enum IMStatusStyle {
 		NOTHING,
 		CALLBACK,
 		NONE
 	}
-	[CCode (cprefix = "GTK_ICON_LOOKUP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_LOOKUP_")]
 	[Flags]
 	public enum IconLookupFlags {
 		NO_SVG,
@@ -6576,7 +6576,7 @@ namespace Gtk {
 		GENERIC_FALLBACK,
 		FORCE_SIZE
 	}
-	[CCode (cprefix = "GTK_ICON_SIZE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_SIZE_")]
 	public enum IconSize {
 		INVALID,
 		MENU,
@@ -6586,12 +6586,12 @@ namespace Gtk {
 		DND,
 		DIALOG
 	}
-	[CCode (cprefix = "GTK_ICON_THEME_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")]
 	public enum IconThemeError {
 		NOT_FOUND,
 		FAILED
 	}
-	[CCode (cprefix = "GTK_ICON_VIEW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_VIEW_")]
 	public enum IconViewDropPosition {
 		NO_DROP,
 		DROP_INTO,
@@ -6600,7 +6600,7 @@ namespace Gtk {
 		DROP_ABOVE,
 		DROP_BELOW
 	}
-	[CCode (cprefix = "GTK_IMAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_IMAGE_")]
 	public enum ImageType {
 		EMPTY,
 		PIXBUF,
@@ -6610,7 +6610,7 @@ namespace Gtk {
 		ICON_NAME,
 		GICON
 	}
-	[CCode (cprefix = "GTK_JUNCTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_JUNCTION_")]
 	[Flags]
 	public enum JunctionSides {
 		NONE,
@@ -6623,14 +6623,14 @@ namespace Gtk {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "GTK_JUSTIFY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_JUSTIFY_")]
 	public enum Justification {
 		LEFT,
 		RIGHT,
 		CENTER,
 		FILL
 	}
-	[CCode (cprefix = "GTK_LICENSE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_LICENSE_")]
 	public enum License {
 		UNKNOWN,
 		CUSTOM,
@@ -6642,14 +6642,14 @@ namespace Gtk {
 		MIT_X11,
 		ARTISTIC
 	}
-	[CCode (cprefix = "GTK_MENU_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MENU_DIR_")]
 	public enum MenuDirectionType {
 		PARENT,
 		CHILD,
 		NEXT,
 		PREV
 	}
-	[CCode (cprefix = "GTK_MESSAGE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MESSAGE_")]
 	public enum MessageType {
 		INFO,
 		WARNING,
@@ -6657,7 +6657,7 @@ namespace Gtk {
 		ERROR,
 		OTHER
 	}
-	[CCode (cprefix = "GTK_MOVEMENT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_MOVEMENT_")]
 	public enum MovementStep {
 		LOGICAL_POSITIONS,
 		VISUAL_POSITIONS,
@@ -6670,12 +6670,12 @@ namespace Gtk {
 		BUFFER_ENDS,
 		HORIZONTAL_PAGES
 	}
-	[CCode (cprefix = "GTK_NOTEBOOK_TAB_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_NOTEBOOK_TAB_")]
 	public enum NotebookTab {
 		FIRST,
 		LAST
 	}
-	[CCode (cprefix = "GTK_NUMBER_UP_LAYOUT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_NUMBER_UP_LAYOUT_")]
 	public enum NumberUpLayout {
 		LEFT_TO_RIGHT_TOP_TO_BOTTOM,
 		LEFT_TO_RIGHT_BOTTOM_TO_TOP,
@@ -6686,37 +6686,37 @@ namespace Gtk {
 		BOTTOM_TO_TOP_LEFT_TO_RIGHT,
 		BOTTOM_TO_TOP_RIGHT_TO_LEFT
 	}
-	[CCode (cprefix = "GTK_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ORIENTATION_")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PACK_DIRECTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PACK_DIRECTION_")]
 	public enum PackDirection {
 		LTR,
 		RTL,
 		TTB,
 		BTT
 	}
-	[CCode (cprefix = "GTK_PACK_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PACK_")]
 	public enum PackType {
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_PAGE_ORIENTATION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PAGE_ORIENTATION_")]
 	public enum PageOrientation {
 		PORTRAIT,
 		LANDSCAPE,
 		REVERSE_PORTRAIT,
 		REVERSE_LANDSCAPE
 	}
-	[CCode (cprefix = "GTK_PAGE_SET_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PAGE_SET_")]
 	public enum PageSet {
 		ALL,
 		EVEN,
 		ODD
 	}
-	[CCode (cprefix = "GTK_PATH_PRIO_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PATH_PRIO_")]
 	public enum PathPriorityType {
 		LOWEST,
 		GTK,
@@ -6725,67 +6725,67 @@ namespace Gtk {
 		RC,
 		HIGHEST
 	}
-	[CCode (cprefix = "GTK_PATH_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PATH_")]
 	public enum PathType {
 		WIDGET,
 		WIDGET_CLASS,
 		CLASS
 	}
-	[CCode (cprefix = "GTK_POLICY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_POLICY_")]
 	public enum PolicyType {
 		ALWAYS,
 		AUTOMATIC,
 		NEVER
 	}
-	[CCode (cprefix = "GTK_POS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_POS_")]
 	public enum PositionType {
 		LEFT,
 		RIGHT,
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_PRINT_DUPLEX_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_DUPLEX_")]
 	public enum PrintDuplex {
 		SIMPLEX,
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "GTK_PRINT_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
 	public enum PrintError {
 		GENERAL,
 		INTERNAL_ERROR,
 		NOMEM,
 		INVALID_FILE
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_ACTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_OPERATION_ACTION_")]
 	public enum PrintOperationAction {
 		PRINT_DIALOG,
 		PRINT,
 		PREVIEW,
 		EXPORT
 	}
-	[CCode (cprefix = "GTK_PRINT_OPERATION_RESULT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_OPERATION_RESULT_")]
 	public enum PrintOperationResult {
 		ERROR,
 		APPLY,
 		CANCEL,
 		IN_PROGRESS
 	}
-	[CCode (cprefix = "GTK_PRINT_PAGES_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_PAGES_")]
 	public enum PrintPages {
 		ALL,
 		CURRENT,
 		RANGES,
 		SELECTION
 	}
-	[CCode (cprefix = "GTK_PRINT_QUALITY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_QUALITY_")]
 	public enum PrintQuality {
 		LOW,
 		NORMAL,
 		HIGH,
 		DRAFT
 	}
-	[CCode (cprefix = "GTK_PRINT_STATUS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_STATUS_")]
 	public enum PrintStatus {
 		INITIAL,
 		PREPARING,
@@ -6797,7 +6797,7 @@ namespace Gtk {
 		FINISHED,
 		FINISHED_ABORTED
 	}
-	[CCode (cprefix = "GTK_RC_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RC_")]
 	[Flags]
 	public enum RcFlags {
 		FG,
@@ -6805,7 +6805,7 @@ namespace Gtk {
 		TEXT,
 		BASE
 	}
-	[CCode (cprefix = "GTK_RC_TOKEN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RC_TOKEN_")]
 	public enum RcTokenType {
 		INVALID,
 		INCLUDE,
@@ -6848,12 +6848,12 @@ namespace Gtk {
 		UNBIND,
 		LAST
 	}
-	[CCode (cprefix = "GTK_RECENT_CHOOSER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_")]
 	public enum RecentChooserError {
 		NOT_FOUND,
 		INVALID_URI
 	}
-	[CCode (cprefix = "GTK_RECENT_FILTER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_FILTER_")]
 	[Flags]
 	public enum RecentFilterFlags {
 		URI,
@@ -6863,7 +6863,7 @@ namespace Gtk {
 		GROUP,
 		AGE
 	}
-	[CCode (cprefix = "GTK_RECENT_MANAGER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
 	public enum RecentManagerError {
 		NOT_FOUND,
 		INVALID_URI,
@@ -6873,14 +6873,14 @@ namespace Gtk {
 		WRITE,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GTK_RECENT_SORT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_SORT_")]
 	public enum RecentSortType {
 		NONE,
 		MRU,
 		LRU,
 		CUSTOM
 	}
-	[CCode (cprefix = "GTK_REGION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_REGION_")]
 	[Flags]
 	public enum RegionFlags {
 		EVEN,
@@ -6889,19 +6889,19 @@ namespace Gtk {
 		LAST,
 		SORTED
 	}
-	[CCode (cprefix = "GTK_RELIEF_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RELIEF_")]
 	public enum ReliefStyle {
 		NORMAL,
 		HALF,
 		NONE
 	}
-	[CCode (cprefix = "GTK_RESIZE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RESIZE_")]
 	public enum ResizeMode {
 		PARENT,
 		QUEUE,
 		IMMEDIATE
 	}
-	[CCode (cprefix = "GTK_RESPONSE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RESPONSE_")]
 	public enum ResponseType {
 		NONE,
 		REJECT,
@@ -6915,7 +6915,7 @@ namespace Gtk {
 		APPLY,
 		HELP
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SCROLL_")]
 	public enum ScrollStep {
 		STEPS,
 		PAGES,
@@ -6924,7 +6924,7 @@ namespace Gtk {
 		HORIZONTAL_PAGES,
 		HORIZONTAL_ENDS
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SCROLL_")]
 	public enum ScrollType {
 		NONE,
 		JUMP,
@@ -6943,25 +6943,25 @@ namespace Gtk {
 		START,
 		END
 	}
-	[CCode (cprefix = "GTK_SCROLL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SCROLL_")]
 	public enum ScrollablePolicy {
 		MINIMUM,
 		NATURAL
 	}
-	[CCode (cprefix = "GTK_SELECTION_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SELECTION_")]
 	public enum SelectionMode {
 		NONE,
 		SINGLE,
 		BROWSE,
 		MULTIPLE
 	}
-	[CCode (cprefix = "GTK_SENSITIVITY_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SENSITIVITY_")]
 	public enum SensitivityType {
 		AUTO,
 		ON,
 		OFF
 	}
-	[CCode (cprefix = "GTK_SHADOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SHADOW_")]
 	public enum ShadowType {
 		NONE,
 		IN,
@@ -6969,37 +6969,37 @@ namespace Gtk {
 		ETCHED_IN,
 		ETCHED_OUT
 	}
-	[CCode (cprefix = "GTK_SIZE_GROUP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SIZE_GROUP_")]
 	public enum SizeGroupMode {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_SIZE_REQUEST_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SIZE_REQUEST_")]
 	public enum SizeRequestMode {
 		HEIGHT_FOR_WIDTH,
 		WIDTH_FOR_HEIGHT,
 		CONSTANT_SIZE
 	}
-	[CCode (cprefix = "GTK_SORT_COLUMN_", cname = "gint", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cname = "gint", cprefix = "GTK_SORT_COLUMN_")]
 	public enum SortColumn {
 		[CCode (cname = "GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID")]
 		DEFAULT,
 		[CCode (cname = "GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID")]
 		UNSORTED
 	}
-	[CCode (cprefix = "GTK_SORT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SORT_")]
 	public enum SortType {
 		ASCENDING,
 		DESCENDING
 	}
-	[CCode (cprefix = "GTK_UPDATE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UPDATE_")]
 	public enum SpinButtonUpdatePolicy {
 		ALWAYS,
 		IF_VALID
 	}
-	[CCode (cprefix = "GTK_SPIN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_SPIN_")]
 	public enum SpinType {
 		STEP_FORWARD,
 		STEP_BACKWARD,
@@ -7009,7 +7009,7 @@ namespace Gtk {
 		END,
 		USER_DEFINED
 	}
-	[CCode (cprefix = "GTK_STATE_FLAG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_STATE_FLAG_")]
 	[Flags]
 	public enum StateFlags {
 		NORMAL,
@@ -7020,7 +7020,7 @@ namespace Gtk {
 		INCONSISTENT,
 		FOCUSED
 	}
-	[CCode (cprefix = "GTK_STATE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_STATE_")]
 	public enum StateType {
 		NORMAL,
 		ACTIVE,
@@ -7030,7 +7030,7 @@ namespace Gtk {
 		INCONSISTENT,
 		FOCUSED
 	}
-	[CCode (cprefix = "GTK_TARGET_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TARGET_")]
 	[Flags]
 	public enum TargetFlags {
 		SAME_APP,
@@ -7038,26 +7038,26 @@ namespace Gtk {
 		OTHER_APP,
 		OTHER_WIDGET
 	}
-	[CCode (cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_BUFFER_TARGET_INFO_")]
 	public enum TextBufferTargetInfo {
 		BUFFER_CONTENTS,
 		RICH_TEXT,
 		TEXT
 	}
-	[CCode (cprefix = "GTK_TEXT_DIR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_DIR_")]
 	public enum TextDirection {
 		NONE,
 		LTR,
 		RTL
 	}
-	[CCode (cprefix = "GTK_TEXT_SEARCH_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_SEARCH_")]
 	[Flags]
 	public enum TextSearchFlags {
 		VISIBLE_ONLY,
 		TEXT_ONLY,
 		CASE_INSENSITIVE
 	}
-	[CCode (cprefix = "GTK_TEXT_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TEXT_WINDOW_")]
 	public enum TextWindowType {
 		PRIVATE,
 		WIDGET,
@@ -7067,51 +7067,51 @@ namespace Gtk {
 		TOP,
 		BOTTOM
 	}
-	[CCode (cprefix = "GTK_TOOL_PALETTE_DRAG_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOL_PALETTE_DRAG_")]
 	[Flags]
 	public enum ToolPaletteDragTargets {
 		ITEMS,
 		GROUPS
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_SPACE_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOLBAR_SPACE_")]
 	public enum ToolbarSpaceStyle {
 		EMPTY,
 		LINE
 	}
-	[CCode (cprefix = "GTK_TOOLBAR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TOOLBAR_")]
 	public enum ToolbarStyle {
 		ICONS,
 		TEXT,
 		BOTH,
 		BOTH_HORIZ
 	}
-	[CCode (cprefix = "GTK_TREE_MODEL_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_MODEL_")]
 	[Flags]
 	public enum TreeModelFlags {
 		ITERS_PERSIST,
 		LIST_ONLY
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_COLUMN_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_COLUMN_")]
 	public enum TreeViewColumnSizing {
 		GROW_ONLY,
 		AUTOSIZE,
 		FIXED
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_DROP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_DROP_")]
 	public enum TreeViewDropPosition {
 		BEFORE,
 		AFTER,
 		INTO_OR_BEFORE,
 		INTO_OR_AFTER
 	}
-	[CCode (cprefix = "GTK_TREE_VIEW_GRID_LINES_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_TREE_VIEW_GRID_LINES_")]
 	public enum TreeViewGridLines {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "GTK_UI_MANAGER_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UI_MANAGER_")]
 	[Flags]
 	public enum UIManagerItemType {
 		AUTO,
@@ -7126,19 +7126,19 @@ namespace Gtk {
 		ACCELERATOR,
 		POPUP_WITH_ACCELS
 	}
-	[CCode (cprefix = "GTK_UNIT_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_UNIT_")]
 	public enum Unit {
 		PIXEL,
 		POINTS,
 		INCH,
 		MM
 	}
-	[CCode (cprefix = "GTK_WIDGET_HELP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WIDGET_HELP_")]
 	public enum WidgetHelpType {
 		TOOLTIP,
 		WHATS_THIS
 	}
-	[CCode (cprefix = "GTK_WIN_POS_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WIN_POS_")]
 	public enum WindowPosition {
 		NONE,
 		CENTER,
@@ -7146,19 +7146,19 @@ namespace Gtk {
 		CENTER_ALWAYS,
 		CENTER_ON_PARENT
 	}
-	[CCode (cprefix = "GTK_WINDOW_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WINDOW_")]
 	public enum WindowType {
 		TOPLEVEL,
 		POPUP
 	}
-	[CCode (cprefix = "GTK_WRAP_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_WRAP_")]
 	public enum WrapMode {
 		NONE,
 		CHAR,
 		WORD,
 		WORD_CHAR
 	}
-	[CCode (cprefix = "GTK_BUILDER_ERROR_", cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_")]
 	public errordomain BuilderError {
 		INVALID_TYPE_FUNCTION,
 		UNHANDLED_TAG,
@@ -7370,320 +7370,320 @@ namespace Gtk {
 	public const string PRINT_SETTINGS_WIN32_DRIVER_VERSION;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const int PRIORITY_RESIZE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ABOUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ABOUT", since = "vala-0.12")]
 	public const string STOCK_ABOUT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ADD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ADD", since = "vala-0.12")]
 	public const string STOCK_ADD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.APPLY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.APPLY", since = "vala-0.12")]
 	public const string STOCK_APPLY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.BOLD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.BOLD", since = "vala-0.12")]
 	public const string STOCK_BOLD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CANCEL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CANCEL", since = "vala-0.12")]
 	public const string STOCK_CANCEL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CAPS_LOCK_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CAPS_LOCK_WARNING", since = "vala-0.12")]
 	public const string STOCK_CAPS_LOCK_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CDROM")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CDROM", since = "vala-0.12")]
 	public const string STOCK_CDROM;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CLEAR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CLEAR", since = "vala-0.12")]
 	public const string STOCK_CLEAR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CLOSE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CLOSE", since = "vala-0.12")]
 	public const string STOCK_CLOSE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.COLOR_PICKER")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.COLOR_PICKER", since = "vala-0.12")]
 	public const string STOCK_COLOR_PICKER;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CONNECT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CONNECT", since = "vala-0.12")]
 	public const string STOCK_CONNECT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CONVERT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CONVERT", since = "vala-0.12")]
 	public const string STOCK_CONVERT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.COPY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.COPY", since = "vala-0.12")]
 	public const string STOCK_COPY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.CUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.CUT", since = "vala-0.12")]
 	public const string STOCK_CUT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DELETE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DELETE", since = "vala-0.12")]
 	public const string STOCK_DELETE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_AUTHENTICATION")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_AUTHENTICATION", since = "vala-0.12")]
 	public const string STOCK_DIALOG_AUTHENTICATION;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_ERROR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_ERROR", since = "vala-0.12")]
 	public const string STOCK_DIALOG_ERROR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_INFO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_INFO", since = "vala-0.12")]
 	public const string STOCK_DIALOG_INFO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_QUESTION")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_QUESTION", since = "vala-0.12")]
 	public const string STOCK_DIALOG_QUESTION;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIALOG_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIALOG_WARNING", since = "vala-0.12")]
 	public const string STOCK_DIALOG_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DIRECTORY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DIRECTORY", since = "vala-0.12")]
 	public const string STOCK_DIRECTORY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DISCARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DISCARD", since = "vala-0.12")]
 	public const string STOCK_DISCARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DISCONNECT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DISCONNECT", since = "vala-0.12")]
 	public const string STOCK_DISCONNECT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DND", since = "vala-0.12")]
 	public const string STOCK_DND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.DND_MULTIPLE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.DND_MULTIPLE", since = "vala-0.12")]
 	public const string STOCK_DND_MULTIPLE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.EDIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.EDIT", since = "vala-0.12")]
 	public const string STOCK_EDIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.EXECUTE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.EXECUTE", since = "vala-0.12")]
 	public const string STOCK_EXECUTE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FILE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FILE", since = "vala-0.12")]
 	public const string STOCK_FILE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FIND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FIND", since = "vala-0.12")]
 	public const string STOCK_FIND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FIND_AND_REPLACE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FIND_AND_REPLACE", since = "vala-0.12")]
 	public const string STOCK_FIND_AND_REPLACE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FLOPPY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FLOPPY", since = "vala-0.12")]
 	public const string STOCK_FLOPPY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FULLSCREEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FULLSCREEN", since = "vala-0.12")]
 	public const string STOCK_FULLSCREEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_BOTTOM")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_BOTTOM", since = "vala-0.12")]
 	public const string STOCK_GOTO_BOTTOM;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_FIRST")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_FIRST", since = "vala-0.12")]
 	public const string STOCK_GOTO_FIRST;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_LAST")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_LAST", since = "vala-0.12")]
 	public const string STOCK_GOTO_LAST;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GOTO_TOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GOTO_TOP", since = "vala-0.12")]
 	public const string STOCK_GOTO_TOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_BACK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_BACK", since = "vala-0.12")]
 	public const string STOCK_GO_BACK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_DOWN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_DOWN", since = "vala-0.12")]
 	public const string STOCK_GO_DOWN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_FORWARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_FORWARD", since = "vala-0.12")]
 	public const string STOCK_GO_FORWARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.GO_UP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.GO_UP", since = "vala-0.12")]
 	public const string STOCK_GO_UP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HARDDISK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HARDDISK", since = "vala-0.12")]
 	public const string STOCK_HARDDISK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HELP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HELP", since = "vala-0.12")]
 	public const string STOCK_HELP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.HOME")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.HOME", since = "vala-0.12")]
 	public const string STOCK_HOME;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INDENT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INDENT", since = "vala-0.12")]
 	public const string STOCK_INDENT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INDEX")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INDEX", since = "vala-0.12")]
 	public const string STOCK_INDEX;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.INFO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.INFO", since = "vala-0.12")]
 	public const string STOCK_INFO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ITALIC")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ITALIC", since = "vala-0.12")]
 	public const string STOCK_ITALIC;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUMP_TO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUMP_TO", since = "vala-0.12")]
 	public const string STOCK_JUMP_TO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_CENTER")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_CENTER", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_CENTER;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_FILL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_FILL", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_FILL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_LEFT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_LEFT", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_LEFT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.JUSTIFY_RIGHT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.JUSTIFY_RIGHT", since = "vala-0.12")]
 	public const string STOCK_JUSTIFY_RIGHT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.FULLSCREEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.FULLSCREEN", since = "vala-0.12")]
 	public const string STOCK_LEAVE_FULLSCREEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_FORWARD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_FORWARD", since = "vala-0.12")]
 	public const string STOCK_MEDIA_FORWARD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_NEXT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_NEXT", since = "vala-0.12")]
 	public const string STOCK_MEDIA_NEXT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PAUSE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PAUSE", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PAUSE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PLAY")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PLAY", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PLAY;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_PREVIOUS")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_PREVIOUS", since = "vala-0.12")]
 	public const string STOCK_MEDIA_PREVIOUS;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_RECORD")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_RECORD", since = "vala-0.12")]
 	public const string STOCK_MEDIA_RECORD;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_REWIND")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_REWIND", since = "vala-0.12")]
 	public const string STOCK_MEDIA_REWIND;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MEDIA_STOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MEDIA_STOP", since = "vala-0.12")]
 	public const string STOCK_MEDIA_STOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.MISSING_IMAGE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.MISSING_IMAGE", since = "vala-0.12")]
 	public const string STOCK_MISSING_IMAGE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NETWORK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NETWORK", since = "vala-0.12")]
 	public const string STOCK_NETWORK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NEW")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NEW", since = "vala-0.12")]
 	public const string STOCK_NEW;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.NO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.NO", since = "vala-0.12")]
 	public const string STOCK_NO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.OK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.OK", since = "vala-0.12")]
 	public const string STOCK_OK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.OPEN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.OPEN", since = "vala-0.12")]
 	public const string STOCK_OPEN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_LANDSCAPE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_LANDSCAPE", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_LANDSCAPE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_PORTRAIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_PORTRAIT", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_PORTRAIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_REVERSE_LANDSCAPE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_REVERSE_LANDSCAPE", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_REVERSE_LANDSCAPE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ORIENTATION_REVERSE_PORTRAIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ORIENTATION_REVERSE_PORTRAIT", since = "vala-0.12")]
 	public const string STOCK_ORIENTATION_REVERSE_PORTRAIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PAGE_SETUP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PAGE_SETUP", since = "vala-0.12")]
 	public const string STOCK_PAGE_SETUP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PASTE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PASTE", since = "vala-0.12")]
 	public const string STOCK_PASTE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PREFERENCES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PREFERENCES", since = "vala-0.12")]
 	public const string STOCK_PREFERENCES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT", since = "vala-0.12")]
 	public const string STOCK_PRINT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_ERROR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_ERROR", since = "vala-0.12")]
 	public const string STOCK_PRINT_ERROR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_PAUSED")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_PAUSED", since = "vala-0.12")]
 	public const string STOCK_PRINT_PAUSED;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_PREVIEW")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_PREVIEW", since = "vala-0.12")]
 	public const string STOCK_PRINT_PREVIEW;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_REPORT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_REPORT", since = "vala-0.12")]
 	public const string STOCK_PRINT_REPORT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PRINT_WARNING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PRINT_WARNING", since = "vala-0.12")]
 	public const string STOCK_PRINT_WARNING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.PROPERTIES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.PROPERTIES", since = "vala-0.12")]
 	public const string STOCK_PROPERTIES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.QUIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.QUIT", since = "vala-0.12")]
 	public const string STOCK_QUIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REDO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REDO", since = "vala-0.12")]
 	public const string STOCK_REDO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REFRESH")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REFRESH", since = "vala-0.12")]
 	public const string STOCK_REFRESH;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REMOVE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REMOVE", since = "vala-0.12")]
 	public const string STOCK_REMOVE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.REVERT_TO_SAVED")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.REVERT_TO_SAVED", since = "vala-0.12")]
 	public const string STOCK_REVERT_TO_SAVED;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SAVE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SAVE", since = "vala-0.12")]
 	public const string STOCK_SAVE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SAVE_AS")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SAVE_AS", since = "vala-0.12")]
 	public const string STOCK_SAVE_AS;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_ALL")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_ALL", since = "vala-0.12")]
 	public const string STOCK_SELECT_ALL;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_COLOR")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_COLOR", since = "vala-0.12")]
 	public const string STOCK_SELECT_COLOR;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SELECT_FONT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SELECT_FONT", since = "vala-0.12")]
 	public const string STOCK_SELECT_FONT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SORT_ASCENDING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SORT_ASCENDING", since = "vala-0.12")]
 	public const string STOCK_SORT_ASCENDING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SORT_DESCENDING")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SORT_DESCENDING", since = "vala-0.12")]
 	public const string STOCK_SORT_DESCENDING;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.SPELL_CHECK")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.SPELL_CHECK", since = "vala-0.12")]
 	public const string STOCK_SPELL_CHECK;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.STOP")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.STOP", since = "vala-0.12")]
 	public const string STOCK_STOP;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.STRIKETHROUGH")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.STRIKETHROUGH", since = "vala-0.12")]
 	public const string STOCK_STRIKETHROUGH;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDELETE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDELETE", since = "vala-0.12")]
 	public const string STOCK_UNDELETE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDERLINE")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDERLINE", since = "vala-0.12")]
 	public const string STOCK_UNDERLINE;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNDO")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNDO", since = "vala-0.12")]
 	public const string STOCK_UNDO;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.UNINDENT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.UNINDENT", since = "vala-0.12")]
 	public const string STOCK_UNINDENT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.YES")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.YES", since = "vala-0.12")]
 	public const string STOCK_YES;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_100")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_100", since = "vala-0.12")]
 	public const string STOCK_ZOOM_100;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_FIT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_FIT", since = "vala-0.12")]
 	public const string STOCK_ZOOM_FIT;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_IN")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_IN", since = "vala-0.12")]
 	public const string STOCK_ZOOM_IN;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.ZOOM_OUT")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.ZOOM_OUT", since = "vala-0.12")]
 	public const string STOCK_ZOOM_OUT;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public const string STYLE_CLASS_ACCELERATOR;
@@ -8143,14 +8143,14 @@ namespace Gtk {
 	public static void show_about_dialog (Gtk.Window? parent, ...);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool show_uri (Gdk.Screen? screen, string uri, uint32 timestamp) throws GLib.Error;
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.add")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.add", since = "vala-0.12")]
 	public static void stock_add (Gtk.StockItem[] items);
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.add_static")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.add_static", since = "vala-0.12")]
 	public static void stock_add_static (Gtk.StockItem[] items);
-	[Deprecated (since = "vala-0.12", replacement = "Gtk.Stock.list_ids")]
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	[Deprecated (replacement = "Gtk.Stock.list_ids", since = "vala-0.12")]
 	public static GLib.SList<string> stock_list_ids ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void stock_set_translate_func (string domain, owned Gtk.TranslateFunc func);
diff --git a/vapi/gtksourceview-2.0.vapi b/vapi/gtksourceview-2.0.vapi
index f5fa8a0..d44f1ee 100644
--- a/vapi/gtksourceview-2.0.vapi
+++ b/vapi/gtksourceview-2.0.vapi
@@ -352,7 +352,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceView : Gtk.TextView, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SourceView ();
 		public bool get_auto_indent ();
 		public unowned Gtk.SourceCompletion get_completion ();
@@ -391,7 +391,7 @@ namespace Gtk {
 		public void set_show_right_margin (bool show);
 		public void set_smart_home_end (Gtk.SourceSmartHomeEndType smart_he);
 		public void set_tab_width (uint width);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SourceView.with_buffer (Gtk.SourceBuffer buffer);
 		public bool auto_indent { get; set; }
 		public Gtk.SourceCompletion completion { get; }
@@ -451,19 +451,19 @@ namespace Gtk {
 		[HasEmitter]
 		public signal void can_undo_changed ();
 	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_", cheader_filename = "gtksourceview/gtksourceview.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h", cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_")]
 	[Flags]
 	public enum SourceCompletionActivation {
 		NONE,
 		INTERACTIVE,
 		USER_REQUESTED
 	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ERROR_", cheader_filename = "gtksourceview/gtksourceview.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h", cprefix = "GTK_SOURCE_COMPLETION_ERROR_")]
 	public enum SourceCompletionError {
 		ALREADY_BOUND,
 		NOT_BOUND
 	}
-	[CCode (cprefix = "GTK_SOURCE_DRAW_SPACES_", cheader_filename = "gtksourceview/gtksourceview.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h", cprefix = "GTK_SOURCE_DRAW_SPACES_")]
 	[Flags]
 	public enum SourceDrawSpacesFlags {
 		SPACE,
@@ -475,21 +475,21 @@ namespace Gtk {
 		TRAILING,
 		ALL
 	}
-	[CCode (cprefix = "GTK_SOURCE_SEARCH_", cheader_filename = "gtksourceview/gtksourceiter.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceiter.h", cprefix = "GTK_SOURCE_SEARCH_")]
 	[Flags]
 	public enum SourceSearchFlags {
 		VISIBLE_ONLY,
 		TEXT_ONLY,
 		CASE_INSENSITIVE
 	}
-	[CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", cheader_filename = "gtksourceview/gtksourceview.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h", cprefix = "GTK_SOURCE_SMART_HOME_END_")]
 	public enum SourceSmartHomeEndType {
 		DISABLED,
 		BEFORE,
 		AFTER,
 		ALWAYS
 	}
-	[CCode (cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", cheader_filename = "gtksourceview/gtksourceview.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksourceview.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_")]
 	public enum SourceViewGutterPosition {
 		LINES,
 		MARKS
diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
index 07c5898..2e10367 100644
--- a/vapi/gtksourceview-3.0.vapi
+++ b/vapi/gtksourceview-3.0.vapi
@@ -1,6 +1,6 @@
-/* gtksourceview-3.0.vapi generated by lt-vapigen, do not modify. */
+/* gtksourceview-3.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_", gir_namespace = "GtkSource", gir_version = "3.0")]
+[CCode (cprefix = "Gtk", gir_namespace = "GtkSource", gir_version = "3.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
 	[CCode (cprefix = "GtkSourceCompletionCapability", lower_case_cprefix = "gtk_source_completion_capability_")]
 	namespace SourceCompletionCapability {
@@ -9,7 +9,7 @@ namespace Gtk {
 		[CCode (cheader_filename = "gtksourceview/gtksource.h")]
 		public const string INTERACTIVE;
 	}
-	[CCode (type_id = "gtk_source_buffer_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_buffer_get_type ()")]
 	public class SourceBuffer : Gtk.TextBuffer {
 		[CCode (has_construct_function = false)]
 		public SourceBuffer (Gtk.TextTagTable? table);
@@ -59,7 +59,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void undo ();
 	}
-	[CCode (type_id = "gtk_source_completion_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_get_type ()")]
 	public class SourceCompletion : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SourceCompletion ();
@@ -100,7 +100,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void show ();
 	}
-	[CCode (type_id = "gtk_source_completion_context_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_context_get_type ()")]
 	public class SourceCompletionContext : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected SourceCompletionContext ();
@@ -115,7 +115,7 @@ namespace Gtk {
 		public Gtk.TextIter iter { get; set; }
 		public virtual signal void cancelled ();
 	}
-	[CCode (type_id = "gtk_source_completion_info_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_info_get_type ()")]
 	public class SourceCompletionInfo : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		public SourceCompletionInfo ();
@@ -124,7 +124,7 @@ namespace Gtk {
 		public void set_widget (Gtk.Widget? widget);
 		public virtual signal void before_show ();
 	}
-	[CCode (type_id = "gtk_source_completion_item_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_item_get_type ()")]
 	public class SourceCompletionItem : GLib.Object, Gtk.SourceCompletionProposal {
 		[CCode (has_construct_function = false)]
 		public SourceCompletionItem (string label, string text, Gdk.Pixbuf? icon, string? info);
@@ -143,7 +143,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string text { owned get; set; }
 	}
-	[CCode (type_id = "gtk_source_completion_words_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_completion_words_get_type ()")]
 	public class SourceCompletionWords : GLib.Object, Gtk.SourceCompletionProvider {
 		[CCode (has_construct_function = false)]
 		public SourceCompletionWords (string? name, Gdk.Pixbuf? icon);
@@ -164,7 +164,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public uint scan_batch_size { get; set construct; }
 	}
-	[CCode (type_id = "gtk_source_gutter_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_get_type ()")]
 	public class SourceGutter : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SourceGutter ();
@@ -184,7 +184,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public int ypad { get; set construct; }
 	}
-	[CCode (type_id = "gtk_source_gutter_renderer_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_get_type ()")]
 	public abstract class SourceGutterRenderer : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
 		protected SourceGutterRenderer ();
@@ -234,9 +234,9 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void queue_draw ();
 	}
-	[CCode (type_id = "gtk_source_gutter_renderer_pixbuf_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_pixbuf_get_type ()")]
 	public class SourceGutterRendererPixbuf : Gtk.SourceGutterRenderer {
-		[CCode (type = "GtkSourceGutterRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkSourceGutterRenderer*")]
 		public SourceGutterRendererPixbuf ();
 		public unowned GLib.Icon get_gicon ();
 		public unowned string get_icon_name ();
@@ -251,9 +251,9 @@ namespace Gtk {
 		public Gdk.Pixbuf pixbuf { get; set; }
 		public string stock_id { get; set; }
 	}
-	[CCode (type_id = "gtk_source_gutter_renderer_text_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_gutter_renderer_text_get_type ()")]
 	public class SourceGutterRendererText : Gtk.SourceGutterRenderer {
-		[CCode (type = "GtkSourceGutterRenderer*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkSourceGutterRenderer*")]
 		public SourceGutterRendererText ();
 		public void measure (string text, int width, int height);
 		public void measure_markup (string markup, int width, int height);
@@ -264,7 +264,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public string text { owned get; set construct; }
 	}
-	[CCode (type_id = "gtk_source_language_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_language_get_type ()")]
 	public class SourceLanguage : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SourceLanguage ();
@@ -285,7 +285,7 @@ namespace Gtk {
 		public string name { get; }
 		public string section { get; }
 	}
-	[CCode (type_id = "gtk_source_language_manager_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_language_manager_get_type ()")]
 	public class SourceLanguageManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public SourceLanguageManager ();
@@ -302,7 +302,7 @@ namespace Gtk {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] search_path { get; set; }
 	}
-	[CCode (type_id = "gtk_source_mark_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_mark_get_type ()")]
 	public class SourceMark : Gtk.TextMark {
 		[CCode (has_construct_function = false)]
 		public SourceMark (string name, string category);
@@ -311,7 +311,7 @@ namespace Gtk {
 		public unowned Gtk.SourceMark prev (string category);
 		public string category { get; construct; }
 	}
-	[CCode (type_id = "gtk_source_mark_attributes_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_mark_attributes_get_type ()")]
 	public class SourceMarkAttributes : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public SourceMarkAttributes ();
@@ -337,7 +337,7 @@ namespace Gtk {
 		public signal string query_tooltip_markup (Gtk.SourceMark mark);
 		public signal string query_tooltip_text (Gtk.SourceMark mark);
 	}
-	[CCode (type_id = "gtk_source_print_compositor_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_print_compositor_get_type ()")]
 	public class SourcePrintCompositor : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public SourcePrintCompositor (Gtk.SourceBuffer buffer);
@@ -391,7 +391,7 @@ namespace Gtk {
 		public uint tab_width { get; set; }
 		public Gtk.WrapMode wrap_mode { get; set; }
 	}
-	[CCode (type_id = "gtk_source_style_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_get_type ()")]
 	public class SourceStyle : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SourceStyle ();
@@ -425,7 +425,7 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool underline_set { get; construct; }
 	}
-	[CCode (type_id = "gtk_source_style_scheme_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_get_type ()")]
 	public class SourceStyleScheme : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SourceStyleScheme ();
@@ -441,7 +441,7 @@ namespace Gtk {
 		public string id { get; construct; }
 		public string name { get; }
 	}
-	[CCode (type_id = "gtk_source_style_scheme_manager_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_style_scheme_manager_get_type ()")]
 	public class SourceStyleSchemeManager : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public SourceStyleSchemeManager ();
@@ -460,9 +460,9 @@ namespace Gtk {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] search_path { get; set; }
 	}
-	[CCode (type_id = "gtk_source_view_get_type ()", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", type_id = "gtk_source_view_get_type ()")]
 	public class SourceView : Gtk.TextView, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SourceView ();
 		public bool get_auto_indent ();
 		public unowned Gtk.SourceCompletion get_completion ();
@@ -493,7 +493,7 @@ namespace Gtk {
 		public void set_show_right_margin (bool show);
 		public void set_smart_home_end (Gtk.SourceSmartHomeEndType smart_he);
 		public void set_tab_width (uint width);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SourceView.with_buffer (Gtk.SourceBuffer buffer);
 		public bool auto_indent { get; set; }
 		public Gtk.SourceCompletion completion { get; }
@@ -554,21 +554,21 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void can_undo_changed ();
 	}
-	[CCode (cprefix = "GTK_SOURCE_BRACKET_MATCH_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_BRACKET_MATCH_")]
 	public enum SourceBracketMatchType {
 		NONE,
 		OUT_OF_RANGE,
 		NOT_FOUND,
 		FOUND
 	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_")]
 	[Flags]
 	public enum SourceCompletionActivation {
 		NONE,
 		INTERACTIVE,
 		USER_REQUESTED
 	}
-	[CCode (cprefix = "GTK_SOURCE_DRAW_SPACES_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_DRAW_SPACES_")]
 	[Flags]
 	public enum SourceDrawSpacesFlags {
 		SPACE,
@@ -580,13 +580,13 @@ namespace Gtk {
 		TRAILING,
 		ALL
 	}
-	[CCode (cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_")]
 	public enum SourceGutterRendererAlignmentMode {
 		CELL,
 		FIRST,
 		LAST
 	}
-	[CCode (cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_")]
 	[Flags]
 	public enum SourceGutterRendererState {
 		NORMAL,
@@ -594,19 +594,19 @@ namespace Gtk {
 		PRELIT,
 		SELECTED
 	}
-	[CCode (cprefix = "GTK_SOURCE_SMART_HOME_END_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SMART_HOME_END_")]
 	public enum SourceSmartHomeEndType {
 		DISABLED,
 		BEFORE,
 		AFTER,
 		ALWAYS
 	}
-	[CCode (cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_")]
 	public enum SourceViewGutterPosition {
 		LINES,
 		MARKS
 	}
-	[CCode (cprefix = "GTK_SOURCE_COMPLETION_ERROR_", cheader_filename = "gtksourceview/gtksource.h")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ERROR_")]
 	public errordomain SourceCompletionError {
 		ALREADY_BOUND,
 		NOT_BOUND;
diff --git a/vapi/gudev-1.0.vapi b/vapi/gudev-1.0.vapi
index 9fa975e..d8a3088 100644
--- a/vapi/gudev-1.0.vapi
+++ b/vapi/gudev-1.0.vapi
@@ -27,8 +27,8 @@ namespace GUdev {
 		public virtual void reserved7 ();
 		[NoWrapper]
 		public virtual void reserved8 ();
-		[NoAccessorMethod]
 		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
 		public string[] subsystems { owned get; construct; }
 		public virtual signal void uevent (string action, GUdev.Device device);
 	}
@@ -86,11 +86,11 @@ namespace GUdev {
 		public virtual void reserved8 ();
 	}
 	[CCode (cheader_filename = "gudev/gudev.h")]
-	[SimpleType]
 	[IntegerType (rank = 9)]
+	[SimpleType]
 	public struct DeviceNumber : Posix.dev_t {
 	}
-	[CCode (cprefix = "G_UDEV_DEVICE_TYPE_", cheader_filename = "gudev/gudev.h")]
+	[CCode (cheader_filename = "gudev/gudev.h", cprefix = "G_UDEV_DEVICE_TYPE_")]
 	public enum DeviceType {
 		NONE,
 		BLOCK,
diff --git a/vapi/hildon-1.vapi b/vapi/hildon-1.vapi
index ae4fc0e..0fa6da9 100644
--- a/vapi/hildon-1.vapi
+++ b/vapi/hildon-1.vapi
@@ -4,7 +4,7 @@
 namespace Hildon {
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class AnimationActor : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AnimationActor ();
 		public void send_message (uint32 message_type, uint32 l0, uint32 l1, uint32 l2, uint32 l3, uint32 l4);
 		public void set_anchor (int x, int y);
@@ -23,7 +23,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class AppMenu : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public AppMenu ();
 		public void add_filter (Gtk.Button filter);
 		public void append (Gtk.Button item);
@@ -59,7 +59,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class BreadCrumbTrail : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public BreadCrumbTrail ();
 		public void clear ();
 		public void pop ();
@@ -71,7 +71,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Button : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
 		public void add_image_size_group (Gtk.SizeGroup size_group);
 		public void add_size_groups (Gtk.SizeGroup title_size_group, Gtk.SizeGroup value_size_group, Gtk.SizeGroup image_size_group);
@@ -91,7 +91,7 @@ namespace Hildon {
 		public void set_title_alignment (float xalign, float yalign);
 		public void set_value (string value);
 		public void set_value_alignment (float xalign, float yalign);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Button.with_text (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, string title, string value);
 		public Hildon.ButtonArrangement arrangement { construct; }
 		public Hildon.SizeType size { construct; }
@@ -120,7 +120,7 @@ namespace Hildon {
 		public int num_marked_dates;
 		public int selected_day;
 		public weak Gdk.GC xor_gc;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Calendar ();
 		public void clear_marks ();
 		public void freeze ();
@@ -164,7 +164,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CalendarPopup : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CalendarPopup (Gtk.Window parent, uint year, uint month, uint day);
 		public void get_date (uint year, uint month, uint day);
 		public void set_date (uint year, uint month, uint day);
@@ -181,7 +181,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Caption : Gtk.EventBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Caption (Gtk.SizeGroup group, string value, Gtk.Widget control, Gtk.Widget icon, Hildon.CaptionStatus flag);
 		public bool get_child_expand ();
 		public unowned Gtk.Widget get_icon_image ();
@@ -214,7 +214,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CheckButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CheckButton (Hildon.SizeType size);
 		public bool get_active ();
 		public void set_active (bool is_active);
@@ -224,7 +224,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CodeDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public CodeDialog ();
 		public void clear_code ();
 		public unowned string get_code ();
@@ -234,13 +234,13 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton ();
 		public void get_color (out Gdk.Color color);
 		public bool get_popup_shown ();
 		public void popdown ();
 		public void set_color (Gdk.Color color);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorButton.with_color (Gdk.Color color);
 		public Gdk.Color color { get; set; }
 		public bool popup_shown { get; }
@@ -248,7 +248,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooser : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorChooser ();
 		public void get_color (out Gdk.Color color);
 		public virtual void set_color (Gdk.Color color);
@@ -257,14 +257,14 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ColorChooserDialog ();
 		public void get_color (out Gdk.Color color);
 		public void set_color (Gdk.Color color);
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Controlbar : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Controlbar ();
 		public int get_max ();
 		public int get_min ();
@@ -280,16 +280,16 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class DateButton : Hildon.PickerButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
 		public void get_date (uint year, uint month, uint day);
 		public void set_date (uint year, uint month, uint day);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateButton.with_year_range (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, int min_year, int max_year);
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class DateEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateEditor ();
 		public void get_date (uint year, uint month, uint day);
 		public uint get_day ();
@@ -310,13 +310,13 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class DateSelector : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateSelector ();
 		public void get_date (uint year, uint month, uint day);
 		public bool select_current_date (uint year, uint month, uint day);
 		public void select_day (uint day);
 		public bool select_month (uint month, uint year);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateSelector.with_year_range (int min_year, int max_year);
 		[NoAccessorMethod]
 		public int max_year { get; construct; }
@@ -325,27 +325,27 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Dialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog ();
 		public unowned Gtk.Widget add_button (string button_text, int response_id);
 		public void add_buttons (...);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Dialog.with_buttons (string title, Gtk.Window parent, Gtk.DialogFlags flags, ...);
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class EditToolbar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditToolbar ();
 		public void set_button_label (string label);
 		public void set_label (string label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public EditToolbar.with_text (string label, string button);
 		public virtual signal void arrow_clicked ();
 		public virtual signal void button_clicked ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Entry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Entry (Hildon.SizeType size);
 		public unowned string get_text ();
 		public void set_placeholder (string text);
@@ -355,7 +355,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class FindToolbar : Gtk.Toolbar, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FindToolbar (string label);
 		public int get_active ();
 		public bool get_active_iter (out Gtk.TreeIter iter);
@@ -363,7 +363,7 @@ namespace Hildon {
 		public void highlight_entry (bool get_focus);
 		public void set_active (int index);
 		public void set_active_iter (Gtk.TreeIter iter);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FindToolbar.with_model (string label, Gtk.ListStore model, int column);
 		[NoAccessorMethod]
 		public int column { get; set; }
@@ -384,7 +384,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FontSelectionDialog (Gtk.Window parent, string title);
 		public unowned string get_preview_text ();
 		public void set_preview_text (string text);
@@ -426,13 +426,13 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class GetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public GetPasswordDialog (Gtk.Window parent, bool get_old);
 		public unowned string get_password ();
 		public void set_caption (string new_caption);
 		public void set_max_characters (int max_characters);
 		public void set_message (string message);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public GetPasswordDialog.with_default (Gtk.Window parent, string password, bool get_old);
 		[NoAccessorMethod]
 		public string caption_label { owned get; set; }
@@ -449,17 +449,17 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class HVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public HVolumebar ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class LoginDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LoginDialog (Gtk.Window parent);
 		public unowned string get_password ();
 		public unowned string get_username ();
 		public void set_message (string msg);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
 		[NoAccessorMethod]
 		public string message { owned get; set; }
@@ -472,17 +472,17 @@ namespace Hildon {
 	public class Note : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false)]
 		protected Note ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.cancel_with_progress_bar (Gtk.Window parent, string description, Gtk.ProgressBar progressbar);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.confirmation (Gtk.Window parent, string description);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.confirmation_add_buttons (Gtk.Window parent, string description);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.confirmation_with_icon_name (Gtk.Window parent, string description, string icon_name);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.information (Gtk.Window parent, string description);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Note.information_with_icon_name (Gtk.Window parent, string description, string icon_name);
 		public void set_button_text (string text);
 		public void set_button_texts (string text_ok, string text_cancel);
@@ -499,7 +499,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class NumberEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public NumberEditor (int min, int max);
 		public int get_value ();
 		public void set_range (int min, int max);
@@ -509,10 +509,10 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class PannableArea : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PannableArea ();
 		public void add_with_viewport (Gtk.Widget child);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PannableArea.full (int mode, bool enabled, double vel_min, double vel_max, double decel, uint sps);
 		public unowned Gtk.Adjustment get_hadjustment ();
 		public Hildon.SizeRequestPolicy get_size_request_policy ();
@@ -576,7 +576,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class PickerButton : Hildon.Button, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PickerButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
 		public int get_active ();
 		public unowned string get_done_button_text ();
@@ -591,7 +591,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class PickerDialog : Hildon.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PickerDialog (Gtk.Window parent);
 		public unowned string get_done_label ();
 		public unowned Hildon.TouchSelector get_selector ();
@@ -626,7 +626,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class RangeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RangeEditor ();
 		public int get_higher ();
 		public int get_lower ();
@@ -641,7 +641,7 @@ namespace Hildon {
 		public void set_min (int value);
 		public void set_range (int start, int end);
 		public void set_separator (string separator);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RangeEditor.with_separator (string separator);
 		public int higher { get; set construct; }
 		public int lower { get; set construct; }
@@ -651,7 +651,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class RemoteTexture : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public RemoteTexture ();
 		public void send_message (uint32 message_type, uint32 l0, uint32 l1, uint32 l2, uint32 l3, uint32 l4);
 		public void set_image (uint32 key, uint width, uint height, uint bpp);
@@ -666,7 +666,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Seekbar : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Seekbar ();
 		public uint get_fraction ();
 		public int get_position ();
@@ -680,12 +680,12 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class SetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SetPasswordDialog (Gtk.Window parent, bool modify_protection);
 		public unowned string get_password ();
 		public bool get_protected ();
 		public void set_message (string message);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
 		[NoAccessorMethod]
 		public string message { owned get; set; }
@@ -696,7 +696,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class SortDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SortDialog (Gtk.Window parent);
 		public int add_sort_key (string sort_key);
 		public int add_sort_key_reversed (string sort_key);
@@ -709,14 +709,14 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class StackableWindow : Hildon.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public StackableWindow ();
 		public unowned Hildon.WindowStack get_stack ();
 		public void set_main_menu (Hildon.AppMenu menu);
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TextView : Gtk.TextView, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TextView ();
 		public unowned Gtk.TextBuffer get_buffer ();
 		public void set_buffer (Gtk.TextBuffer buffer);
@@ -724,16 +724,16 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimeButton : Hildon.PickerButton, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeButton (Hildon.SizeType size, Hildon.ButtonArrangement arrangement);
 		public void get_time (uint hours, uint minutes);
 		public void set_time (uint hours, uint minutes);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeButton.step (Hildon.SizeType size, Hildon.ButtonArrangement arrangement, uint minutes_step);
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeEditor ();
 		public uint get_duration_max ();
 		public uint get_duration_min ();
@@ -762,7 +762,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimePicker : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimePicker (Gtk.Window parent);
 		public void get_time (uint hours, uint minutes);
 		public void set_time (uint hours, uint minutes);
@@ -771,11 +771,11 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimeSelector : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeSelector ();
 		public void get_time (uint hours, uint minutes);
 		public bool set_time (uint hours, uint minutes);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TimeSelector.step (uint minutes_step);
 		[NoAccessorMethod]
 		public uint minutes_step { get; construct; }
@@ -784,7 +784,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TouchSelector : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TouchSelector ();
 		public unowned Hildon.TouchSelectorColumn append_column (Gtk.TreeModel model, Gtk.CellRenderer cell_renderer);
 		public void append_text (string text);
@@ -813,7 +813,7 @@ namespace Hildon {
 		public virtual void set_model (int column, Gtk.TreeModel model);
 		public void set_print_func (Hildon.TouchSelectorPrintFunc func);
 		public void set_print_func_full (owned Hildon.TouchSelectorPrintFunc func);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TouchSelector.text ();
 		public void unselect_all (int column);
 		public void unselect_iter (int column, Gtk.TreeIter iter);
@@ -835,20 +835,20 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TouchSelectorEntry : Hildon.TouchSelector, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TouchSelectorEntry ();
 		public unowned Hildon.Entry get_entry ();
 		public Hildon.GtkInputMode get_input_mode ();
 		public int get_text_column ();
 		public void set_input_mode (Hildon.GtkInputMode input_mode);
 		public void set_text_column (int text_column);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TouchSelectorEntry.text ();
 		public int text_column { get; set; }
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class VVolumebar : Hildon.Volumebar, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VVolumebar ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
@@ -871,7 +871,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class VolumebarRange : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public VolumebarRange (Gtk.Orientation orientation);
 		public double get_level ();
 		public void set_level (double level);
@@ -879,7 +879,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class WeekdayPicker : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public WeekdayPicker ();
 		public bool isset_day (GLib.DateWeekday day);
 		public void set_all ();
@@ -891,7 +891,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Window ();
 		public void add_toolbar (Gtk.Toolbar toolbar);
 		public void add_with_scrollbar (Gtk.Widget child);
@@ -932,7 +932,7 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class WizardDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public WizardDialog (Gtk.Window parent, string wizard_name, Gtk.Notebook notebook);
 		public void set_forward_page_func (owned Hildon.WizardDialogPageFunc page_func);
 		[NoAccessorMethod]
@@ -948,17 +948,17 @@ namespace Hildon {
 		public abstract void get_natural_size (int width, int height);
 		public signal void crumb_activated ();
 	}
-	[CCode (cprefix = "HILDON_BUTTON_ARRANGEMENT_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_BUTTON_ARRANGEMENT_")]
 	public enum ButtonArrangement {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "HILDON_BUTTON_STYLE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_BUTTON_STYLE_")]
 	public enum ButtonStyle {
 		NORMAL,
 		PICKER
 	}
-	[CCode (cprefix = "HILDON_CALENDAR_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CALENDAR_")]
 	[Flags]
 	public enum CalendarDisplayOptions {
 		SHOW_HEADING,
@@ -967,17 +967,17 @@ namespace Hildon {
 		SHOW_WEEK_NUMBERS,
 		WEEK_START_MONDAY
 	}
-	[CCode (cprefix = "HILDON_CAPTION_POSITION_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CAPTION_POSITION_")]
 	public enum CaptionIconPosition {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "HILDON_CAPTION_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_CAPTION_")]
 	public enum CaptionStatus {
 		OPTIONAL,
 		MANDATORY
 	}
-	[CCode (cprefix = "HILDON_DATE_TIME_ERROR_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_DATE_TIME_ERROR_")]
 	public enum DateTimeError {
 		NO_ERROR,
 		MAX_HOURS,
@@ -1004,7 +1004,7 @@ namespace Hildon {
 		INVALID_DATE,
 		INVALID_TIME
 	}
-	[CCode (cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_GTK_INPUT_MODE_", has_type_id = false)]
 	public enum GtkInputMode {
 		ALPHA,
 		NUMERIC,
@@ -1017,26 +1017,26 @@ namespace Hildon {
 		AUTOCAP,
 		DICTIONARY
 	}
-	[CCode (cprefix = "HILDON_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_", has_type_id = false)]
 	public enum Mode {
 		DIABLO,
 		FREMANTLE
 	}
-	[CCode (cprefix = "HILDON_MOVEMENT_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_MOVEMENT_")]
 	public enum MovementDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "HILDON_MOVEMENT_MODE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_MOVEMENT_MODE_")]
 	[Flags]
 	public enum MovementMode {
 		HORIZ,
 		VERT,
 		BOTH
 	}
-	[CCode (cprefix = "HILDON_NOTE_TYPE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_NOTE_TYPE_")]
 	public enum NoteType {
 		CONFIRMATION,
 		CONFIRMATION_BUTTON,
@@ -1044,30 +1044,30 @@ namespace Hildon {
 		INFORMATION_THEME,
 		PROGRESSBAR
 	}
-	[CCode (cprefix = "HILDON_NUMBER_EDITOR_ERROR_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_NUMBER_EDITOR_ERROR_")]
 	public enum NumberEditorErrorType {
 		MAXIMUM_VALUE_EXCEED,
 		MINIMUM_VALUE_EXCEED,
 		ERRONEOUS_VALUE
 	}
-	[CCode (cprefix = "HILDON_PANNABLE_AREA_MODE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_PANNABLE_AREA_MODE_")]
 	public enum PannableAreaMode {
 		PUSH,
 		ACCEL,
 		AUTO
 	}
-	[CCode (cprefix = "HILDON_PORTRAIT_MODE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_PORTRAIT_MODE_")]
 	[Flags]
 	public enum PortraitFlags {
 		REQUEST,
 		SUPPORT
 	}
-	[CCode (cprefix = "HILDON_SIZE_REQUEST_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_SIZE_REQUEST_")]
 	public enum SizeRequestPolicy {
 		MINIMUM,
 		CHILDREN
 	}
-	[CCode (cprefix = "HILDON_SIZE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_SIZE_", has_type_id = false)]
 	public enum SizeType {
 		AUTO_WIDTH,
 		HALFSCREEN_WIDTH,
@@ -1077,29 +1077,29 @@ namespace Hildon {
 		THUMB_HEIGHT,
 		AUTO
 	}
-	[CCode (cprefix = "HILDON_TIME_SELECTOR_FORMAT_POLICY_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_TIME_SELECTOR_FORMAT_POLICY_")]
 	public enum TimeSelectorFormatPolicy {
 		AMPM,
 		@24H,
 		AUTOMATIC
 	}
-	[CCode (cprefix = "HILDON_TOUCH_SELECTOR_SELECTION_MODE_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_TOUCH_SELECTOR_SELECTION_MODE_")]
 	public enum TouchSelectorSelectionMode {
 		SINGLE,
 		MULTIPLE
 	}
-	[CCode (cprefix = "HILDON_UI_MODE_", has_type_id = false, cheader_filename = "gtk/gtk.h")]
+	[CCode (cheader_filename = "gtk/gtk.h", cprefix = "HILDON_UI_MODE_", has_type_id = false)]
 	public enum UIMode {
 		NORMAL,
 		EDIT
 	}
-	[CCode (cprefix = "HILDON_WINDOW_CO_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_WINDOW_CO_")]
 	public enum WindowClipboardOperation {
 		COPY,
 		CUT,
 		PASTE
 	}
-	[CCode (cprefix = "HILDON_WIZARD_DIALOG_", cheader_filename = "hildon/hildon.h")]
+	[CCode (cheader_filename = "hildon/hildon.h", cprefix = "HILDON_WIZARD_DIALOG_")]
 	public enum WizardDialogResponse {
 		CANCEL,
 		PREVIOUS,
diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi
index 7c38116..d36eeb2 100644
--- a/vapi/hildon-fm-2.vapi
+++ b/vapi/hildon-fm-2.vapi
@@ -4,7 +4,7 @@
 namespace Hildon {
 	[CCode (cheader_filename = "hildon/hildon-file-chooser-dialog.h")]
 	public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserDialog (Gtk.Window parent, Gtk.FileChooserAction action);
 		public unowned Gtk.Widget add_extensions_combo (out unowned string extensions, out unowned string ext_names);
 		public void add_extra (Gtk.Widget widget);
@@ -17,7 +17,7 @@ namespace Hildon {
 		public void set_safe_folder (string local_path);
 		public void set_safe_folder_uri (string uri);
 		public void set_show_upnp (bool value);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileChooserDialog.with_properties (Gtk.Window parent, ...);
 		[NoAccessorMethod]
 		public bool autonaming { get; set; }
@@ -42,11 +42,11 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-details-dialog.h")]
 	public class FileDetailsDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileDetailsDialog (Gtk.Window parent, string filename);
 		public bool get_file_iter (out Gtk.TreeIter iter);
 		public void set_file_iter (Gtk.TreeIter iter);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
 		[NoAccessorMethod]
 		public Gtk.Widget additional_tab { owned get; set construct; }
@@ -94,7 +94,7 @@ namespace Hildon {
 		public void undim_all ();
 		public void unselect_all ();
 		public void unselect_uri (string uri);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileSelection.with_model (Hildon.FileSystemModel model);
 		[NoAccessorMethod]
 		public int active_pane { get; set; }
@@ -124,8 +124,8 @@ namespace Hildon {
 		public virtual signal void selection_changed ();
 		public virtual signal void uris_dropped (string destination, void* sources);
 	}
-	[Compact]
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
+	[Compact]
 	public class FileSystemInfo {
 		[CCode (has_construct_function = false)]
 		public FileSystemInfo (string uri) throws GLib.Error;
@@ -135,8 +135,8 @@ namespace Hildon {
 		public unowned Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
 		public unowned Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
 	}
-	[Compact]
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
+	[Compact]
 	public class FileSystemInfoHandle {
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-model.h")]
@@ -144,7 +144,7 @@ namespace Hildon {
 		[CCode (has_construct_function = false)]
 		protected FileSystemModel ();
 		public unowned string autoname_uri (string uri) throws GLib.Error;
-		[CCode (type = "gchar*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "gchar*")]
 		public FileSystemModel.item (Hildon.FileSystemModel model, Gtk.TreeIter parent, string stub_name, string extension);
 		public void iter_available (Gtk.TreeIter iter, bool available);
 		public bool load_local_path (string path, Gtk.TreeIter iter);
@@ -169,35 +169,35 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-system-storage-dialog.h")]
 	public class FileSystemStorageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public FileSystemStorageDialog (Gtk.Window parent, string uri_str);
 		public static void set_uri (Gtk.Widget widget, string uri_str);
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = false)]
 	public enum FileSelectionMode {
 		LIST,
 		THUMBNAILS
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = false)]
 	public enum FileSelectionPane {
 		NAVIGATION,
 		CONTENT
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = false)]
 	public enum FileSelectionSortKey {
 		NAME,
 		TYPE,
 		MODIFIED,
 		SIZE
 	}
-	[CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = false, cheader_filename = "hildon/hildon-file-selection.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-selection.h", cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = false)]
 	public enum FileSelectionVisibleColumns {
 		NAME,
 		MODIFIED,
 		SIZE,
 		ALL
 	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false, cheader_filename = "hildon/hildon-file-system-model.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false)]
 	public enum FileSystemModelColumns {
 		COLUMN_GTK_PATH_INTERNAL,
 		COLUMN_LOCAL_PATH,
@@ -228,7 +228,7 @@ namespace Hildon {
 		COLUMN_IS_DRIVE,
 		NUM_COLUMNS
 	}
-	[CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false, cheader_filename = "hildon/hildon-file-system-model.h")]
+	[CCode (cheader_filename = "hildon/hildon-file-system-model.h", cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = false)]
 	public enum FileSystemModelItemType {
 		UNKNOWN,
 		FILE,
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 716f4cc..873e17d 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -1,9 +1,9 @@
 /* json-glib-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Json", lower_case_cprefix = "json_", gir_namespace = "Json", gir_version = "1.0")]
+[CCode (cprefix = "Json", gir_namespace = "Json", gir_version = "1.0", lower_case_cprefix = "json_")]
 namespace Json {
+	[CCode (cheader_filename = "json-glib/json-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_array_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_array_get_type ()", cheader_filename = "json-glib/json-glib.h")]
 	public class Array {
 		[CCode (has_construct_function = false)]
 		public Array ();
@@ -33,7 +33,7 @@ namespace Json {
 		public Array.sized (uint n_elements);
 		public void unref ();
 	}
-	[CCode (type_id = "json_builder_get_type ()", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", type_id = "json_builder_get_type ()")]
 	public class Builder : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Builder ();
@@ -51,7 +51,7 @@ namespace Json {
 		public void reset ();
 		public unowned Json.Builder set_member_name (string member_name);
 	}
-	[CCode (type_id = "json_generator_get_type ()", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", type_id = "json_generator_get_type ()")]
 	public class Generator : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Generator ();
@@ -68,8 +68,8 @@ namespace Json {
 		[NoAccessorMethod]
 		public Json.Node root { owned get; set; }
 	}
+	[CCode (cheader_filename = "json-glib/json-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_node_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_node_get_type ()", cheader_filename = "json-glib/json-glib.h")]
 	public class Node {
 		[CCode (has_construct_function = false)]
 		public Node (Json.NodeType type);
@@ -101,12 +101,12 @@ namespace Json {
 		public void take_object (owned Json.Object object);
 		public unowned string type_name ();
 	}
+	[CCode (cheader_filename = "json-glib/json-glib.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_object_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "json_object_get_type ()", cheader_filename = "json-glib/json-glib.h")]
 	public class Object {
 		[CCode (has_construct_function = false)]
 		public Object ();
-		[Deprecated (since = "0.8", replacement = "Json.Object.set_member")]
+		[Deprecated (replacement = "Json.Object.set_member", since = "0.8")]
 		public void add_member (string member_name, owned Json.Node node);
 		public Json.Node dup_member (string member_name);
 		public void foreach_member (Json.ObjectForeach func);
@@ -134,7 +134,7 @@ namespace Json {
 		public void set_string_member (string member_name, string value);
 		public void unref ();
 	}
-	[CCode (type_id = "json_parser_get_type ()", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", type_id = "json_parser_get_type ()")]
 	public class Parser : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Parser ();
@@ -157,7 +157,7 @@ namespace Json {
 		public virtual signal void parse_end ();
 		public virtual signal void parse_start ();
 	}
-	[CCode (type_id = "json_reader_get_type ()", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", type_id = "json_reader_get_type ()")]
 	public class Reader : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Reader (Json.Node? node);
@@ -189,14 +189,14 @@ namespace Json {
 		public abstract bool deserialize_property (string property_name, out GLib.Value value, GLib.ParamSpec pspec, Json.Node property_node);
 		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 	}
-	[CCode (cprefix = "JSON_NODE_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_NODE_")]
 	public enum NodeType {
 		OBJECT,
 		ARRAY,
 		VALUE,
 		NULL
 	}
-	[CCode (cprefix = "JSON_PARSER_ERROR_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PARSER_ERROR_")]
 	public enum ParserError {
 		PARSE,
 		TRAILING_COMMA,
@@ -205,7 +205,7 @@ namespace Json {
 		INVALID_BAREWORD,
 		UNKNOWN
 	}
-	[CCode (cprefix = "JSON_READER_ERROR_", cheader_filename = "json-glib/json-glib.h")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_READER_ERROR_")]
 	public enum ReaderError {
 		NO_ARRAY,
 		INVALID_INDEX,
@@ -242,8 +242,8 @@ namespace Json {
 	public static void boxed_register_serialize_func (GLib.Type gboxed_type, Json.NodeType node_type, Json.BoxedSerializeFunc serialize_func);
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public static Json.Node boxed_serialize (GLib.Type gboxed_type, void* boxed);
-	[Deprecated (since = "0.10", replacement = "Json.gobject_from_data")]
 	[CCode (cheader_filename = "json-glib/json-glib.h,json-glib/json-gobject.h")]
+	[Deprecated (replacement = "Json.gobject_from_data", since = "0.10")]
 	public static GLib.Object construct_gobject (GLib.Type gtype, string data, size_t length) throws GLib.Error;
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public static GLib.Object gobject_deserialize (GLib.Type gtype, Json.Node node);
@@ -253,7 +253,7 @@ namespace Json {
 	public static Json.Node gobject_serialize (GLib.Object gobject);
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public static string gobject_to_data (GLib.Object gobject, out size_t length);
-	[Deprecated (since = "0.10", replacement = "Json.gobject_to_data")]
 	[CCode (cheader_filename = "json-glib/json-glib.h,json-glib/json-gobject.h")]
+	[Deprecated (replacement = "Json.gobject_to_data", since = "0.10")]
 	public static string serialize_gobject (GLib.Object gobject, out size_t length);
 }
diff --git a/vapi/libepc-1.0.vapi b/vapi/libepc-1.0.vapi
index a72cf44..243ee12 100644
--- a/vapi/libepc-1.0.vapi
+++ b/vapi/libepc-1.0.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Epc", lower_case_cprefix = "epc_")]
 namespace Epc {
-	[Compact]
 	[CCode (cheader_filename = "libepc/publisher.h")]
+	[Compact]
 	public class AuthContext {
 		public bool check_password (string password);
 		public unowned string get_key ();
@@ -46,8 +46,8 @@ namespace Epc {
 		public virtual signal bool authenticate (string realm);
 		public virtual signal void publisher_resolved (Epc.Protocol protocol, string hostname, uint port);
 	}
+	[CCode (cheader_filename = "libepc/contents.h", ref_function = "epc_contents_ref", unref_function = "epc_contents_unref")]
 	[Compact]
-	[CCode (ref_function = "epc_contents_ref", unref_function = "epc_contents_unref", cheader_filename = "libepc/contents.h")]
 	public class Contents {
 		[CCode (has_construct_function = false)]
 		public Contents (string type, void* data, ssize_t length, GLib.DestroyNotify destroy_data);
@@ -128,8 +128,8 @@ namespace Epc {
 		public string service_domain { owned get; set construct; }
 		public string service_name { get; set construct; }
 	}
+	[CCode (cheader_filename = "libepc/service-info.h", ref_function = "epc_service_info_ref", type_id = "EPC_TYPE_SERVICE_INFO", unref_function = "epc_service_info_unref")]
 	[Compact]
-	[CCode (ref_function = "epc_service_info_ref", unref_function = "epc_service_info_unref", type_id = "EPC_TYPE_SERVICE_INFO", cheader_filename = "libepc/service-info.h")]
 	public class ServiceInfo {
 		public Epc.AddressFamily get_address_family ();
 		public unowned string get_detail (string name);
@@ -152,33 +152,33 @@ namespace Epc {
 		public string application { owned get; construct; }
 		[NoAccessorMethod]
 		public string domain { owned get; construct; }
-		[NoAccessorMethod]
 		[CCode (array_length = false, array_null_terminated = true)]
+		[NoAccessorMethod]
 		public string[] service_types { owned get; construct; }
 		public bool skip_our_own { get; set construct; }
 		public virtual signal void scanning_done (string type);
 		public virtual signal void service_found (string name, Epc.ServiceInfo info);
 		public virtual signal void service_removed (string name, string type);
 	}
-	[CCode (cprefix = "EPC_ADDRESS_", cheader_filename = "libepc/enums.h")]
+	[CCode (cheader_filename = "libepc/enums.h", cprefix = "EPC_ADDRESS_")]
 	public enum AddressFamily {
 		UNSPEC,
 		IPV4,
 		IPV6
 	}
-	[CCode (cprefix = "EPC_AUTH_", cheader_filename = "libepc/enums.h")]
+	[CCode (cheader_filename = "libepc/enums.h", cprefix = "EPC_AUTH_")]
 	[Flags]
 	public enum AuthFlags {
 		DEFAULT,
 		PASSWORD_TEXT_NEEDED
 	}
-	[CCode (cprefix = "EPC_COLLISIONS_", cheader_filename = "libepc/enums.h")]
+	[CCode (cheader_filename = "libepc/enums.h", cprefix = "EPC_COLLISIONS_")]
 	public enum CollisionHandling {
 		IGNORE,
 		CHANGE_NAME,
 		UNIQUE_SERVICE
 	}
-	[CCode (cprefix = "EPC_PROTOCOL_", cheader_filename = "libepc/enums.h")]
+	[CCode (cheader_filename = "libepc/enums.h", cprefix = "EPC_PROTOCOL_")]
 	public enum Protocol {
 		UNKNOWN,
 		HTTP,
diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi
index df4bca2..758a1dd 100644
--- a/vapi/libgda-4.0.vapi
+++ b/vapi/libgda-4.0.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gda", lower_case_cprefix = "gda_")]
 namespace Gda {
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_attributes_manager_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_attributes_manager_copy", cheader_filename = "libgda/libgda.h")]
 	public class AttributesManager {
 		[CCode (has_construct_function = false)]
 		public AttributesManager (bool for_objects, Gda.AttributesManagerSignal signal_func, void* signal_data);
@@ -27,8 +27,8 @@ namespace Gda {
 		public unowned string serialize ();
 		public virtual signal void changed (GLib.Object changed_stmt);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_binary_copy", type_id = "GDA_TYPE_BINARY")]
 	[Compact]
-	[CCode (copy_function = "gda_binary_copy", type_id = "GDA_TYPE_BINARY", cheader_filename = "libgda/libgda.h")]
 	public class Binary {
 		public long binary_length;
 		[CCode (array_length = false)]
@@ -36,8 +36,8 @@ namespace Gda {
 		public static void* copy (void* boxed);
 		public unowned string to_string (uint maxlen);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_blob_copy", type_id = "GDA_TYPE_BLOB")]
 	[Compact]
-	[CCode (copy_function = "gda_blob_copy", type_id = "GDA_TYPE_BLOB", cheader_filename = "libgda/libgda.h")]
 	public class Blob {
 		public weak Gda.Binary data;
 		public weak Gda.BlobOp op;
@@ -214,14 +214,14 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class DataAccessWrapper : GLib.Object, Gda.DataModel {
-		[CCode (type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataModel*")]
 		public DataAccessWrapper (Gda.DataModel model);
 		[NoAccessorMethod]
 		public Gda.DataModel model { owned get; construct; }
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class DataComparator : GLib.Object {
-		[CCode (type = "GObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GObject*")]
 		public DataComparator (Gda.DataModel old_model, Gda.DataModel new_model);
 		public bool compute_diff () throws GLib.Error;
 		public static GLib.Quark error_quark ();
@@ -236,13 +236,13 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class DataModelArray : GLib.Object, Gda.DataModel {
-		[CCode (type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataModel*")]
 		public DataModelArray (int cols);
 		public void clear ();
 		public static unowned Gda.DataModelArray copy_model (Gda.DataModel src) throws GLib.Error;
 		public unowned Gda.Row get_row (int row) throws GLib.Error;
 		public void set_n_columns (int cols);
-		[CCode (sentinel = "", type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, sentinel = "", type = "GdaDataModel*")]
 		public DataModelArray.with_g_types (int cols, ...);
 		[NoAccessorMethod]
 		public uint n_columns { get; set; }
@@ -251,7 +251,7 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class DataModelDir : GLib.Object, Gda.DataModel {
-		[CCode (type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataModel*")]
 		public DataModelDir (string basedir);
 		public void clean_errors ();
 		public unowned GLib.SList<GLib.Error> get_errors ();
@@ -263,15 +263,15 @@ namespace Gda {
 		[CCode (has_construct_function = false)]
 		protected DataModelImport ();
 		public void clean_errors ();
-		[CCode (type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataModel*")]
 		public DataModelImport.file (string filename, bool random_access, Gda.Set options);
 		public static bool from_file (Gda.DataModel model, string file, GLib.HashTable cols_trans, Gda.Set options) throws GLib.Error;
 		public static bool from_model (Gda.DataModel to, Gda.DataModel from, bool overwrite, GLib.HashTable cols_trans) throws GLib.Error;
 		public static bool from_string (Gda.DataModel model, string str, GLib.HashTable cols_trans, Gda.Set options) throws GLib.Error;
-		[CCode (cname = "gda_data_model_import_new_xml_node", type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (cname = "gda_data_model_import_new_xml_node", has_construct_function = false, type = "GdaDataModel*")]
 		public DataModelImport.from_xml_node (Xml.Node node);
 		public unowned GLib.SList<GLib.Error> get_errors ();
-		[CCode (type = "GdaDataModel*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataModel*")]
 		public DataModelImport.mem (string data, bool random_access, Gda.Set options);
 		[NoAccessorMethod]
 		public string data_string { owned get; construct; }
@@ -317,7 +317,7 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class DataProxy : GLib.Object, Gda.DataModel {
-		[CCode (type = "GObject*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GObject*")]
 		public DataProxy (Gda.DataModel model);
 		public void alter_value_attributes (int proxy_row, int col, Gda.ValueAttribute alter_flags);
 		public bool apply_all_changes () throws GLib.Error;
@@ -415,16 +415,16 @@ namespace Gda {
 		[NoAccessorMethod]
 		public Gda.Statement update_stmt { owned get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class Diff {
 		public int new_row;
 		public int old_row;
 		public Gda.DiffType type;
 		public weak GLib.HashTable values;
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free", type_id = "GDA_TYPE_GEOMETRIC_POINT")]
 	[Compact]
-	[CCode (copy_function = "gda_geometricpoint_copy", free_function = "gda_geometricpoint_free", type_id = "GDA_TYPE_GEOMETRIC_POINT", cheader_filename = "libgda/libgda.h")]
 	public class GeometricPoint {
 		public double x;
 		public double y;
@@ -433,63 +433,63 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerBin : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerBin ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerBinPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerBoolean : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerBoolean ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerBooleanPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerNumerical : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerNumerical ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerNumericalPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerString : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerString ();
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerString.with_provider (Gda.ServerProvider prov, Gda.Connection cnc);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerStringPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerTime : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerTime ();
 		public unowned string get_format (GLib.Type type);
 		public unowned string get_no_locale_str_from_value (GLib.Value value);
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerTime.no_locale ();
 		public void set_sql_spec (GLib.DateDMY first, GLib.DateDMY sec, GLib.DateDMY third, char separator, bool twodigits_years);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerTimePriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class HandlerType : GLib.Object, Gda.DataHandler {
-		[CCode (type = "GdaDataHandler*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaDataHandler*")]
 		public HandlerType ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class HandlerTypePriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
@@ -545,16 +545,16 @@ namespace Gda {
 		public virtual signal void source_changed ();
 		public virtual signal unowned GLib.Error validate_change (GLib.Value new_value);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaContext {
 		public weak string column_names;
 		public GLib.Value column_values;
 		public int size;
 		public weak string table_name;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaDbObject {
 		public weak GLib.SList depend_list;
 		public void* extra;
@@ -601,8 +601,8 @@ namespace Gda {
 		public virtual signal void meta_reset ();
 		public virtual signal unowned GLib.Error suggest_update (Gda.MetaContext suggest);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaStoreChange {
 		public Gda.MetaStoreChangeType c_type;
 		public weak GLib.HashTable keys;
@@ -628,8 +628,8 @@ namespace Gda {
 		[NoAccessorMethod]
 		public Gda.MetaStore meta_store { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaTable {
 		public weak GLib.SList columns;
 		public weak GLib.SList fk_list;
@@ -637,8 +637,8 @@ namespace Gda {
 		public int pk_cols_nb;
 		public weak GLib.SList reverse_fk_list;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaTableColumn {
 		public weak string column_name;
 		public weak string column_type;
@@ -650,8 +650,8 @@ namespace Gda {
 		public GLib.Value get_attribute (string attribute);
 		public void set_attribute (string attribute, GLib.Value value, GLib.DestroyNotify destroy);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaTableForeignKey {
 		public int cols_nb;
 		public void* declared;
@@ -665,15 +665,15 @@ namespace Gda {
 		public int ref_pk_cols_array;
 		public weak string ref_pk_names_array;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class MetaView {
 		public bool is_updatable;
 		public weak Gda.MetaTable table;
 		public weak string view_def;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class Mutex {
 		[CCode (has_construct_function = false)]
 		public Mutex ();
@@ -681,8 +681,8 @@ namespace Gda {
 		public bool trylock ();
 		public void unlock ();
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_numeric_copy", type_id = "GDA_TYPE_NUMERIC")]
 	[Compact]
-	[CCode (copy_function = "gda_numeric_copy", type_id = "GDA_TYPE_NUMERIC", cheader_filename = "libgda/libgda.h")]
 	public class Numeric {
 		public weak string number;
 		public long precision;
@@ -704,8 +704,8 @@ namespace Gda {
 		public unowned Gda.Statement get_gda_statement ();
 		public void set_gda_statement (Gda.Statement stmt);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ProviderInfo {
 		public weak Gda.Set auth_params;
 		public weak string description;
@@ -713,8 +713,8 @@ namespace Gda {
 		public weak string id;
 		public weak string location;
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_quark_list_copy", type_id = "GDA_TYPE_QUARK_LIST")]
 	[Compact]
-	[CCode (copy_function = "gda_quark_list_copy", type_id = "GDA_TYPE_QUARK_LIST", cheader_filename = "libgda/libgda.h")]
 	public class QuarkList {
 		[CCode (has_construct_function = false)]
 		public QuarkList ();
@@ -795,8 +795,8 @@ namespace Gda {
 		public virtual signal void sequence_item_added (string p0, int p1);
 		public virtual signal void sequence_item_remove (string p0, int p1);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ServerOperationNode {
 		public weak Gda.Column column;
 		public weak Gda.DataModel model;
@@ -878,19 +878,19 @@ namespace Gda {
 		public virtual unowned string unescape_string (Gda.Connection cnc, string str);
 		public unowned string value_to_sql_string (Gda.Connection cnc, GLib.Value from);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ServerProviderHandlerInfo {
 		public weak Gda.Connection cnc;
 		public weak string dbms_type;
 		public GLib.Type g_type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ServerProviderInfo {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ServerProviderMeta {
 		public weak GLib.Callback character_sets;
 		public weak GLib.Callback check_columns;
@@ -915,8 +915,8 @@ namespace Gda {
 		public weak GLib.Callback udt_cols;
 		public weak GLib.Callback view_cols;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ServerProviderXa {
 		public weak GLib.Callback xa_commit;
 		public weak GLib.Callback xa_end;
@@ -970,27 +970,27 @@ namespace Gda {
 		public virtual signal unowned GLib.Error validate_holder_change (Gda.Holder holder, GLib.Value new_value);
 		public virtual signal unowned GLib.Error validate_set ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SetGroup {
 		public weak GLib.SList nodes;
 		public weak Gda.SetSource nodes_source;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SetNode {
 		public weak Gda.Holder holder;
 		public int source_column;
 		public weak Gda.DataModel source_model;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SetSource {
 		public weak Gda.DataModel data_model;
 		public weak GLib.SList nodes;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlAnyPart {
 		public weak Gda.SqlAnyPart parent;
 		public Gda.SqlAnyPartType type;
@@ -1041,8 +1041,8 @@ namespace Gda {
 		public void set_where (Gda.SqlBuilderId cond_id);
 		public Gda.SqlStatementType stmt_type { construct; }
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_case_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_case_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlCase {
 		public weak Gda.SqlAnyPart any;
 		public weak Gda.SqlExpr base_expr;
@@ -1054,12 +1054,12 @@ namespace Gda {
 		public unowned Gda.SqlCase copy ();
 		public unowned string serialize ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlErrorType {
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_expr_copy", type_id = "GDA_TYPE_SQL_EXPR")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_expr_copy", type_id = "GDA_TYPE_SQL_EXPR", cheader_filename = "libgda/libgda.h")]
 	public class SqlExpr {
 		public weak Gda.SqlAnyPart any;
 		public weak Gda.SqlCase case_s;
@@ -1076,8 +1076,8 @@ namespace Gda {
 		public unowned string serialize ();
 		public void take_select (Gda.SqlStatement stmt);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_field_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_field_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlField {
 		public weak Gda.SqlAnyPart any;
 		public weak string field_name;
@@ -1088,8 +1088,8 @@ namespace Gda {
 		public unowned string serialize ();
 		public void take_name (GLib.Value value);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_function_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_function_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlFunction {
 		public weak Gda.SqlAnyPart any;
 		public weak GLib.SList args_list;
@@ -1102,8 +1102,8 @@ namespace Gda {
 		public void take_args_list (owned GLib.SList args);
 		public void take_name (GLib.Value value);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_operation_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_operation_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlOperation {
 		public weak Gda.SqlAnyPart any;
 		public weak GLib.SList operands;
@@ -1115,8 +1115,8 @@ namespace Gda {
 		public static unowned string operator_to_string (Gda.SqlOperatorType op);
 		public unowned string serialize ();
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_param_spec_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_param_spec_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlParamSpec {
 		public weak string descr;
 		public GLib.Type g_type;
@@ -1168,8 +1168,8 @@ namespace Gda {
 		[NoAccessorMethod]
 		public int tokenizer_flavour { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlRenderingContext {
 		public weak Gda.Connection cnc;
 		public Gda.StatementSqlFlag flags;
@@ -1202,8 +1202,8 @@ namespace Gda {
 		public weak Gda.SqlRenderingFunc render_update;
 		public weak Gda.SqlRenderingValue render_value;
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_select_field_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_select_field_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlSelectField {
 		public weak Gda.SqlAnyPart any;
 		public weak string @as;
@@ -1220,8 +1220,8 @@ namespace Gda {
 		public void take_expr (Gda.SqlExpr expr);
 		public void take_star_value (GLib.Value value);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_select_from_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_select_from_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlSelectFrom {
 		public weak Gda.SqlAnyPart any;
 		public weak GLib.SList joins;
@@ -1233,8 +1233,8 @@ namespace Gda {
 		public void take_new_join (Gda.SqlSelectJoin join);
 		public void take_new_target (Gda.SqlSelectTarget target);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_select_join_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_select_join_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlSelectJoin {
 		public weak Gda.SqlAnyPart any;
 		public weak Gda.SqlExpr expr;
@@ -1247,8 +1247,8 @@ namespace Gda {
 		public unowned string serialize ();
 		public static unowned string type_to_string (Gda.SqlSelectJoinType type);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_select_order_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_select_order_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlSelectOrder {
 		public weak Gda.SqlAnyPart any;
 		public bool asc;
@@ -1259,8 +1259,8 @@ namespace Gda {
 		public unowned Gda.SqlSelectOrder copy ();
 		public unowned string serialize ();
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_select_target_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_select_target_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlSelectTarget {
 		public weak Gda.SqlAnyPart any;
 		public weak string @as;
@@ -1275,8 +1275,8 @@ namespace Gda {
 		public void take_select (Gda.SqlStatement stmt);
 		public void take_table_name (GLib.Value value);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_statement_copy", type_id = "GDA_TYPE_SQL_STATEMENT")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_statement_copy", type_id = "GDA_TYPE_SQL_STATEMENT", cheader_filename = "libgda/libgda.h")]
 	public class SqlStatement {
 		public void* contents;
 		public weak string sql;
@@ -1298,15 +1298,15 @@ namespace Gda {
 		public void trans_take_name (GLib.Value value);
 		public static unowned string type_to_string (Gda.SqlStatementType type);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementCheckValidityData {
 		public weak Gda.Connection cnc;
 		public weak Gda.MetaStruct mstruct;
 		public weak Gda.MetaStore store;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementCompound {
 		public weak Gda.SqlAnyPart any;
 		public Gda.SqlStatementCompoundType compound_type;
@@ -1314,8 +1314,8 @@ namespace Gda {
 		public static void set_type (Gda.SqlStatement stmt, Gda.SqlStatementCompoundType type);
 		public static void take_stmt (Gda.SqlStatement stmt, Gda.SqlStatement s);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementContentsInfo {
 		public weak Gda.SqlForeachFunc check_structure_func;
 		public weak Gda.SqlForeachFunc check_validity_func;
@@ -1326,8 +1326,8 @@ namespace Gda {
 		public weak GLib.Callback serialize;
 		public Gda.SqlStatementType type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementDelete {
 		public weak Gda.SqlAnyPart any;
 		public weak Gda.SqlExpr cond;
@@ -1335,8 +1335,8 @@ namespace Gda {
 		public static void take_condition (Gda.SqlStatement stmt, Gda.SqlExpr cond);
 		public static void take_table_name (Gda.SqlStatement stmt, GLib.Value value);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementInsert {
 		public weak Gda.SqlAnyPart any;
 		public weak GLib.SList fields_list;
@@ -1351,8 +1351,8 @@ namespace Gda {
 		public static void take_select (Gda.SqlStatement stmt, Gda.SqlStatement select);
 		public static void take_table_name (Gda.SqlStatement stmt, GLib.Value value);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementSelect {
 		public weak Gda.SqlAnyPart any;
 		public bool distinct;
@@ -1374,23 +1374,23 @@ namespace Gda {
 		public static void take_order_by (Gda.SqlStatement stmt, owned GLib.SList<Gda.SqlSelectOrder> order_by);
 		public static void take_where_cond (Gda.SqlStatement stmt, owned Gda.SqlExpr expr);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementTransaction {
 		public weak Gda.SqlAnyPart any;
 		public Gda.TransactionIsolation isolation_level;
 		public weak string trans_mode;
 		public weak string trans_name;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementUnknown {
 		public weak Gda.SqlAnyPart any;
 		public weak GLib.SList expressions;
 		public static void take_expressions (Gda.SqlStatement stmt, owned GLib.SList<Gda.SqlExpr> expressions);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class SqlStatementUpdate {
 		public weak Gda.SqlAnyPart any;
 		public weak Gda.SqlExpr cond;
@@ -1403,8 +1403,8 @@ namespace Gda {
 		public static void take_set_value (Gda.SqlStatement stmt, GLib.Value fname, Gda.SqlExpr expr);
 		public static void take_table_name (Gda.SqlStatement stmt, GLib.Value value);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_sql_table_copy")]
 	[Compact]
-	[CCode (copy_function = "gda_sql_table_copy", cheader_filename = "libgda/libgda.h")]
 	public class SqlTable {
 		public weak Gda.SqlAnyPart any;
 		public weak string table_name;
@@ -1456,8 +1456,8 @@ namespace Gda {
 		public void iterate (bool may_block);
 		public void steal_signal (ulong id);
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_time_copy", type_id = "GDA_TYPE_TIME")]
 	[Compact]
-	[CCode (copy_function = "gda_time_copy", type_id = "GDA_TYPE_TIME", cheader_filename = "libgda/libgda.h")]
 	public class Time {
 		public ulong fraction;
 		public ushort hour;
@@ -1467,8 +1467,8 @@ namespace Gda {
 		public static void* copy (void* boxed);
 		public bool valid ();
 	}
+	[CCode (cheader_filename = "libgda/libgda.h", copy_function = "gda_timestamp_copy", type_id = "GDA_TYPE_TIMESTAMP")]
 	[Compact]
-	[CCode (copy_function = "gda_timestamp_copy", type_id = "GDA_TYPE_TIMESTAMP", cheader_filename = "libgda/libgda.h")]
 	public class Timestamp {
 		public ushort day;
 		public ulong fraction;
@@ -1490,8 +1490,8 @@ namespace Gda {
 		[CCode (has_construct_function = false)]
 		public TransactionStatus (string name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TransactionStatusEvent {
 		public weak Gda.ConnectionEvent conn_event;
 		public void* pl;
@@ -1542,7 +1542,7 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class TreeMgrColumns : Gda.TreeManager {
-		[CCode (type = "GdaTreeManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaTreeManager*")]
 		public TreeMgrColumns (Gda.Connection cnc, string schema, string table_name);
 		[NoAccessorMethod]
 		public Gda.Connection connection { owned get; construct; }
@@ -1551,36 +1551,36 @@ namespace Gda {
 		public string schema { construct; }
 		public string table_name { construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TreeMgrColumnsPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class TreeMgrLabel : Gda.TreeManager {
-		[CCode (type = "GdaTreeManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaTreeManager*")]
 		public TreeMgrLabel (string label);
 		public string label { construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TreeMgrLabelPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class TreeMgrSchemas : Gda.TreeManager {
-		[CCode (type = "GdaTreeManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaTreeManager*")]
 		public TreeMgrSchemas (Gda.Connection cnc);
 		[NoAccessorMethod]
 		public Gda.Connection connection { owned get; construct; }
 		[NoAccessorMethod]
 		public Gda.MetaStore meta_store { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TreeMgrSchemasPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class TreeMgrSelect : Gda.TreeManager {
-		[CCode (type = "GdaTreeManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaTreeManager*")]
 		public TreeMgrSelect (Gda.Connection cnc, Gda.Statement stmt, Gda.Set @params);
 		[NoAccessorMethod]
 		public Gda.Connection connection { owned get; construct; }
@@ -1589,13 +1589,13 @@ namespace Gda {
 		[NoAccessorMethod]
 		public Gda.Statement statement { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TreeMgrSelectPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class TreeMgrTables : Gda.TreeManager {
-		[CCode (type = "GdaTreeManager*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaTreeManager*")]
 		public TreeMgrTables (Gda.Connection cnc, string schema);
 		[NoAccessorMethod]
 		public Gda.Connection connection { owned get; construct; }
@@ -1603,8 +1603,8 @@ namespace Gda {
 		public Gda.MetaStore meta_store { owned get; construct; }
 		public string schema { construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class TreeMgrTablesPriv {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
@@ -1630,8 +1630,8 @@ namespace Gda {
 		public virtual signal void node_has_child_toggled (Gda.TreeNode node);
 		public virtual signal void node_inserted (Gda.TreeNode node);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class ValueList {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
@@ -1645,8 +1645,8 @@ namespace Gda {
 		public unowned string get_table_name (Gda.DataModel model);
 		public bool remove (string table_name) throws GLib.Error;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class VconnectionDataModelFilter {
 		public void* aConstraint;
 		public void* aConstraintUsage;
@@ -1658,8 +1658,8 @@ namespace Gda {
 		public int nOrderBy;
 		public bool orderByConsumed;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class VconnectionDataModelSpec {
 		public weak Gda.VconnectionDataModelCreateColumnsFunc create_columns_func;
 		public weak Gda.VconnectionDataModelParseFilterFunc create_filter_func;
@@ -1692,12 +1692,12 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class VproviderDataModel : Gda.VirtualProvider {
-		[CCode (type = "GdaVirtualProvider*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaVirtualProvider*")]
 		public VproviderDataModel ();
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
 	public class VproviderHub : Gda.VproviderDataModel {
-		[CCode (type = "GdaVirtualProvider*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaVirtualProvider*")]
 		public VproviderHub ();
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
@@ -1717,8 +1717,8 @@ namespace Gda {
 		[NoAccessorMethod]
 		public string transaction_id { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgda/libgda.h")]
+	[Compact]
 	public class XaTransactionId {
 		public ushort bqual_length;
 		[CCode (array_length = false)]
@@ -1794,7 +1794,7 @@ namespace Gda {
 		[CCode (vfunc_name = "i_unlock")]
 		public virtual void unlock ();
 	}
-	[CCode (type_id = "GDA_TYPE_DSN_INFO", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", type_id = "GDA_TYPE_DSN_INFO")]
 	public struct DsnInfo {
 		public weak string name;
 		public weak string provider;
@@ -1804,27 +1804,27 @@ namespace Gda {
 		public bool is_system;
 	}
 	[CCode (cheader_filename = "libgda/libgda.h")]
-	[SimpleType]
 	[IntegerType (rank = 7)]
+	[SimpleType]
 	public struct SqlBuilderId : uint {
 	}
-	[CCode (type_id = "GDA_TYPE_SQL_PARSER_IFACE", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", type_id = "GDA_TYPE_SQL_PARSER_IFACE")]
 	protected struct SqlParserIface {
 		public Gda.SqlParser parser;
 		public Gda.SqlStatement parsed_statement;
 	}
-	[CCode (cprefix = "GDA_BATCH_CONFLICTING_PARAMETER_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_BATCH_CONFLICTING_PARAMETER_")]
 	public enum BatchError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_CONFIG_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONFIG_")]
 	public enum ConfigError {
 		DSN_NOT_FOUND_ERROR,
 		PERMISSION_ERROR,
 		PROVIDER_NOT_FOUND_ERROR,
 		PROVIDER_CREATION_ERROR
 	}
-	[CCode (cprefix = "GDA_CONNECTION_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_")]
 	public enum ConnectionError {
 		DSN_NOT_FOUND_ERROR,
 		PROVIDER_NOT_FOUND_ERROR,
@@ -1838,7 +1838,7 @@ namespace Gda {
 		UNSUPPORTED_THREADS_ERROR,
 		CLOSED_ERROR
 	}
-	[CCode (cprefix = "GDA_CONNECTION_EVENT_CODE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_CODE_")]
 	public enum ConnectionEventCode {
 		CONSTRAINT_VIOLATION,
 		RESTRICT_VIOLATION,
@@ -1860,14 +1860,14 @@ namespace Gda {
 		SYNTAX_ERROR,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDA_CONNECTION_EVENT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_EVENT_")]
 	public enum ConnectionEventType {
 		NOTICE,
 		WARNING,
 		ERROR,
 		COMMAND
 	}
-	[CCode (cprefix = "GDA_CONNECTION_FEATURE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_FEATURE_")]
 	public enum ConnectionFeature {
 		AGGREGATES,
 		BLOBS,
@@ -1888,7 +1888,7 @@ namespace Gda {
 		MULTI_THREADING,
 		LAST
 	}
-	[CCode (cprefix = "GDA_CONNECTION_META_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_META_")]
 	public enum ConnectionMetaType {
 		NAMESPACES,
 		TYPES,
@@ -1897,7 +1897,7 @@ namespace Gda {
 		FIELDS,
 		INDEXES
 	}
-	[CCode (cprefix = "GDA_CONNECTION_OPTIONS_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_OPTIONS_")]
 	[Flags]
 	public enum ConnectionOptions {
 		NONE,
@@ -1907,7 +1907,7 @@ namespace Gda {
 		THREAD_ISOLATED,
 		AUTO_META_DATA
 	}
-	[CCode (cprefix = "GDA_CONNECTION_SCHEMA_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_CONNECTION_SCHEMA_")]
 	public enum ConnectionSchema {
 		AGGREGATES,
 		DATABASES,
@@ -1926,14 +1926,14 @@ namespace Gda {
 		CONSTRAINTS,
 		TABLE_CONTENTS
 	}
-	[CCode (cprefix = "GDA_DATA_COMPARATOR_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_COMPARATOR_")]
 	public enum DataComparatorError {
 		MISSING_DATA_MODEL_ERROR,
 		COLUMN_TYPES_MISMATCH_ERROR,
 		MODEL_ACCESS_ERROR,
 		USER_CANCELLED_ERROR
 	}
-	[CCode (cprefix = "GDA_DATA_MODEL_ACCESS_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ACCESS_")]
 	[Flags]
 	public enum DataModelAccessFlags {
 		RANDOM,
@@ -1945,7 +1945,7 @@ namespace Gda {
 		DELETE,
 		WRITE
 	}
-	[CCode (cprefix = "GDA_DATA_MODEL_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_")]
 	public enum DataModelError {
 		ROW_OUT_OF_RANGE_ERROR,
 		COLUMN_OUT_OF_RANGE_ERROR,
@@ -1957,22 +1957,22 @@ namespace Gda {
 		FILE_EXIST_ERROR,
 		XML_FORMAT_ERROR
 	}
-	[CCode (cprefix = "GDA_DATA_MODEL_HINT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_HINT_")]
 	public enum DataModelHint {
 		START_BATCH_UPDATE,
 		END_BATCH_UPDATE,
 		REFRESH
 	}
-	[CCode (cprefix = "GDA_DATA_MODEL_IO_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_IO_")]
 	public enum DataModelIOFormat {
 		DATA_ARRAY_XML,
 		TEXT_SEPARATED
 	}
-	[CCode (cprefix = "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_MODEL_ITER_COLUMN_OUT_OF_RANGE_")]
 	public enum DataModelIterError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_DATA_PROXY_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_PROXY_")]
 	public enum DataProxyError {
 		COMMIT_ERROR,
 		COMMIT_CANCELLED,
@@ -1980,7 +1980,7 @@ namespace Gda {
 		READ_ONLY_ROW,
 		FILTER_ERROR
 	}
-	[CCode (cprefix = "GDA_DATA_SELECT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DATA_SELECT_")]
 	public enum DataSelectError {
 		MODIFICATION_STATEMENT_ERROR,
 		MISSING_MODIFICATION_STATEMENT_ERROR,
@@ -1989,13 +1989,13 @@ namespace Gda {
 		SQL_ERROR,
 		SAFETY_LOCKED_ERROR
 	}
-	[CCode (cprefix = "GDA_DIFF_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_DIFF_")]
 	public enum DiffType {
 		ADD_ROW,
 		REMOVE_ROW,
 		MODIFY_ROW
 	}
-	[CCode (cprefix = "GDA_EASY_CREATE_TABLE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_EASY_CREATE_TABLE_")]
 	public enum EasyCreateTableFlag {
 		NOTHING_FLAG,
 		PKEY_FLAG,
@@ -2005,25 +2005,25 @@ namespace Gda {
 		FKEY_FLAG,
 		PKEY_AUTOINC_FLAG
 	}
-	[CCode (cprefix = "GDA_EASY_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_EASY_")]
 	public enum EasyError {
 		OBJECT_NAME_ERROR,
 		INCORRECT_VALUE_ERROR,
 		OPERATION_ERROR
 	}
-	[CCode (cprefix = "GDA_HOLDER_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_HOLDER_")]
 	public enum HolderError {
 		STRING_CONVERSION_ERROR,
 		VALUE_TYPE_ERROR,
 		VALUE_NULL_ERROR
 	}
-	[CCode (cprefix = "GDA_META_DB_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_DB_")]
 	public enum MetaDbObjectType {
 		UNKNOWN,
 		TABLE,
 		VIEW
 	}
-	[CCode (cprefix = "GDA_META_FOREIGN_KEY_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_FOREIGN_KEY_")]
 	public enum MetaForeignKeyPolicy {
 		UNKNOWN,
 		NONE,
@@ -2033,23 +2033,23 @@ namespace Gda {
 		SET_NULL,
 		SET_DEFAULT
 	}
-	[CCode (cprefix = "GDA_META_GRAPH_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_GRAPH_")]
 	[Flags]
 	public enum MetaGraphInfo {
 		COLUMNS
 	}
-	[CCode (cprefix = "GDA_META_SORT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_SORT_")]
 	public enum MetaSortType {
 		ALHAPETICAL,
 		DEPENDENCIES
 	}
-	[CCode (cprefix = "GDA_META_STORE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_")]
 	public enum MetaStoreChangeType {
 		ADD,
 		REMOVE,
 		MODIFY
 	}
-	[CCode (cprefix = "GDA_META_STORE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STORE_")]
 	public enum MetaStoreError {
 		INCORRECT_SCHEMA_ERROR,
 		UNSUPPORTED_PROVIDER_ERROR,
@@ -2064,13 +2064,13 @@ namespace Gda {
 		SCHEMA_OBJECT_DESCR_ERROR,
 		TRANSACTION_ALREADY_STARTED_ERROR
 	}
-	[CCode (cprefix = "GDA_META_STRUCT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_")]
 	public enum MetaStructError {
 		UNKNOWN_OBJECT_ERROR,
 		DUPLICATE_OBJECT_ERROR,
 		INCOHERENCE_ERROR
 	}
-	[CCode (cprefix = "GDA_META_STRUCT_FEATURE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_META_STRUCT_FEATURE_")]
 	[Flags]
 	public enum MetaStructFeature {
 		NONE,
@@ -2078,7 +2078,7 @@ namespace Gda {
 		VIEW_DEPENDENCIES,
 		ALL
 	}
-	[CCode (cprefix = "GDA_", has_type_id = false, cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_", has_type_id = false)]
 	public enum PrefixDir {
 		NO_DIR,
 		BIN_DIR,
@@ -2089,7 +2089,7 @@ namespace Gda {
 		LIBEXEC_DIR,
 		ETC_DIR
 	}
-	[CCode (cprefix = "GDA_SERVER_OPERATION_CREATE_TABLE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_CREATE_TABLE_")]
 	[Flags]
 	public enum ServerOperationCreateTableFlag {
 		NOTHING_FLAG,
@@ -2100,18 +2100,18 @@ namespace Gda {
 		FKEY_FLAG,
 		PKEY_AUTOINC_FLAG
 	}
-	[CCode (cprefix = "GDA_SERVER_OPERATION_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_")]
 	public enum ServerOperationError {
 		OBJECT_NAME_ERROR,
 		INCORRECT_VALUE_ERROR
 	}
-	[CCode (cprefix = "GDA_SERVER_OPERATION_STATUS_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_STATUS_")]
 	public enum ServerOperationNodeStatus {
 		OPTIONAL,
 		REQUIRED,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDA_SERVER_OPERATION_NODE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_NODE_")]
 	public enum ServerOperationNodeType {
 		PARAMLIST,
 		DATA_MODEL,
@@ -2121,7 +2121,7 @@ namespace Gda {
 		DATA_MODEL_COLUMN,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GDA_SERVER_OPERATION_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_OPERATION_")]
 	public enum ServerOperationType {
 		CREATE_DB,
 		DROP_DB,
@@ -2141,7 +2141,7 @@ namespace Gda {
 		DROP_USER,
 		LAST
 	}
-	[CCode (cprefix = "GDA_SERVER_PROVIDER_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SERVER_PROVIDER_")]
 	public enum ServerProviderError {
 		METHOD_NON_IMPLEMENTED_ERROR,
 		PREPARE_STMT_ERROR,
@@ -2156,14 +2156,14 @@ namespace Gda {
 		DATA_ERROR,
 		DEFAULT_VALUE_HANDLING_ERROR
 	}
-	[CCode (cprefix = "GDA_SET_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SET_")]
 	public enum SetError {
 		XML_SPEC_ERROR,
 		HOLDER_NOT_FOUND_ERROR,
 		INVALID_ERROR,
 		READ_ONLY_ERROR
 	}
-	[CCode (cprefix = "GDA_SQL_ANY_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_ANY_")]
 	public enum SqlAnyPartType {
 		STMT_SELECT,
 		STMT_INSERT,
@@ -2189,18 +2189,18 @@ namespace Gda {
 		SQL_SELECT_FROM,
 		SQL_SELECT_ORDER
 	}
-	[CCode (cprefix = "GDA_SQL_BUILDER_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_BUILDER_")]
 	public enum SqlBuilderError {
 		WRONG_TYPE_ERROR,
 		MISUSE_ERROR
 	}
-	[CCode (cprefix = "GDA_SQL_IDENTIFIERS_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_IDENTIFIERS_")]
 	[Flags]
 	public enum SqlIdentifierStyle {
 		LOWER_CASE,
 		UPPER_CASE
 	}
-	[CCode (cprefix = "GDA_SQL_OPERATOR_TYPE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_OPERATOR_TYPE_")]
 	public enum SqlOperatorType {
 		AND,
 		OR,
@@ -2233,13 +2233,13 @@ namespace Gda {
 		BITOR,
 		BITNOT
 	}
-	[CCode (cprefix = "GDA_SQL_PARSER_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_")]
 	public enum SqlParserError {
 		SYNTAX_ERROR,
 		OVERFLOW_ERROR,
 		EMPTY_SQL_ERROR
 	}
-	[CCode (cprefix = "GDA_SQL_PARSER_FLAVOUR_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_FLAVOUR_")]
 	public enum SqlParserFlavour {
 		STANDARD,
 		SQLITE,
@@ -2247,12 +2247,12 @@ namespace Gda {
 		ORACLE,
 		POSTGRESQL
 	}
-	[CCode (cprefix = "GDA_SQL_PARSER_MODE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_PARSER_MODE_")]
 	public enum SqlParserMode {
 		PARSE,
 		DELIMIT
 	}
-	[CCode (cprefix = "GDA_SQL_SELECT_JOIN_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_SELECT_JOIN_")]
 	public enum SqlSelectJoinType {
 		CROSS,
 		NATURAL,
@@ -2261,7 +2261,7 @@ namespace Gda {
 		RIGHT,
 		FULL
 	}
-	[CCode (cprefix = "GDA_SQL_STATEMENT_COMPOUND_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_COMPOUND_")]
 	public enum SqlStatementCompoundType {
 		UNION,
 		UNION_ALL,
@@ -2270,7 +2270,7 @@ namespace Gda {
 		EXCEPT,
 		EXCEPT_ALL
 	}
-	[CCode (cprefix = "GDA_SQL_STATEMENT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_STATEMENT_")]
 	public enum SqlStatementType {
 		SELECT,
 		INSERT,
@@ -2286,7 +2286,7 @@ namespace Gda {
 		UNKNOWN,
 		NONE
 	}
-	[CCode (cprefix = "GDA_STATEMENT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_")]
 	public enum StatementError {
 		PARSE_ERROR,
 		SYNTAX_ERROR,
@@ -2296,7 +2296,7 @@ namespace Gda {
 		PARAM_TYPE_ERROR,
 		PARAM_ERROR
 	}
-	[CCode (cprefix = "GDA_STATEMENT_MODEL_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_MODEL_")]
 	[Flags]
 	public enum StatementModelUsage {
 		RANDOM_ACCESS,
@@ -2305,7 +2305,7 @@ namespace Gda {
 		CURSOR,
 		ALLOW_NOPARAM
 	}
-	[CCode (cprefix = "GDA_STATEMENT_SQL_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_STATEMENT_SQL_")]
 	[Flags]
 	public enum StatementSqlFlag {
 		PARAMS_AS_VALUES,
@@ -2317,11 +2317,11 @@ namespace Gda {
 		PARAMS_AS_QMARK,
 		PARAMS_AS_UQMARK
 	}
-	[CCode (cprefix = "GDA_THREAD_WRAPPER_UNKNOWN_", has_type_id = false, cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_THREAD_WRAPPER_UNKNOWN_", has_type_id = false)]
 	public enum ThreadWrapperError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_TRANSACTION_ISOLATION_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_ISOLATION_")]
 	public enum TransactionIsolation {
 		UNKNOWN,
 		READ_COMMITTED,
@@ -2329,30 +2329,30 @@ namespace Gda {
 		REPEATABLE_READ,
 		SERIALIZABLE
 	}
-	[CCode (cprefix = "GDA_TRANSACTION_STATUS_EVENT_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_EVENT_")]
 	public enum TransactionStatusEventType {
 		SAVEPOINT,
 		SQL,
 		SUB_TRANSACTION
 	}
-	[CCode (cprefix = "GDA_TRANSACTION_STATUS_STATE_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TRANSACTION_STATUS_STATE_")]
 	public enum TransactionStatusState {
 		OK,
 		FAILED
 	}
-	[CCode (cprefix = "GDA_TREE_UNKNOWN_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_UNKNOWN_")]
 	public enum TreeError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_TREE_MANAGER_UNKNOWN_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_MANAGER_UNKNOWN_")]
 	public enum TreeManagerError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_TREE_NODE_UNKNOWN_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_TREE_NODE_UNKNOWN_")]
 	public enum TreeNodeError {
 		ERROR
 	}
-	[CCode (cprefix = "GDA_VALUE_ATTR_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_VALUE_ATTR_")]
 	[Flags]
 	public enum ValueAttribute {
 		NONE,
@@ -2367,13 +2367,13 @@ namespace Gda {
 		NO_MODIF,
 		UNUSED
 	}
-	[CCode (cprefix = "GDA_XA_TRANSACTION_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_XA_TRANSACTION_")]
 	public enum XaTransactionError {
 		ALREADY_REGISTERED_ERROR,
 		DTP_NOT_SUPPORTED_ERROR,
 		CONNECTION_BRANCH_LENGTH_ERROR
 	}
-	[CCode (cprefix = "GDA_SQL_ERROR_", cheader_filename = "libgda/libgda.h")]
+	[CCode (cheader_filename = "libgda/libgda.h", cprefix = "GDA_SQL_ERROR_")]
 	public errordomain SqlError {
 		STRUCTURE_CONTENTS_ERROR,
 		MALFORMED_IDENTIFIER_ERROR,
diff --git a/vapi/libgda-report-4.0.vapi b/vapi/libgda-report-4.0.vapi
index 165d433..f93d553 100644
--- a/vapi/libgda-report-4.0.vapi
+++ b/vapi/libgda-report-4.0.vapi
@@ -4,7 +4,7 @@
 namespace Gda {
 	[CCode (cheader_filename = "libgda-report/libgda-report.h")]
 	public class ReportDocbookDocument : Gda.ReportDocument {
-		[CCode (type = "GdaReportDocument*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaReportDocument*")]
 		public ReportDocbookDocument (Gda.ReportEngine engine);
 		[NoAccessorMethod]
 		public string fo_stylesheet { owned get; set; }
@@ -47,7 +47,7 @@ namespace Gda {
 	}
 	[CCode (cheader_filename = "libgda-report/libgda-report.h")]
 	public class ReportRmlDocument : Gda.ReportDocument {
-		[CCode (type = "GdaReportDocument*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GdaReportDocument*")]
 		public ReportRmlDocument (Gda.ReportEngine engine);
 	}
 }
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index 6dded06..08cd860 100644
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -175,8 +175,8 @@ namespace GData {
 		public string scheme { get; set; }
 		public string term { get; set; }
 	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "GDATA_TYPE_COLOR")]
 	[Compact]
-	[CCode (type_id = "GDATA_TYPE_COLOR", cheader_filename = "gdata/gdata.h")]
 	public class Color {
 		public uint16 blue;
 		public uint16 green;
@@ -374,7 +374,7 @@ namespace GData {
 	}
 	[CCode (cheader_filename = "gdata/gdata.h")]
 	public class DownloadStream : GLib.InputStream, GLib.Seekable {
-		[CCode (type = "GInputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public DownloadStream (GData.Service service, string download_uri);
 		public ssize_t get_content_length ();
 		public unowned string get_content_type ();
@@ -549,8 +549,8 @@ namespace GData {
 		public string label { get; set; }
 		public string relation_type { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdata/gdata.h")]
+	[Compact]
 	public class GDFeedLink {
 		public uint count_hint;
 		public weak string href;
@@ -725,8 +725,8 @@ namespace GData {
 		public string subregion { get; set; }
 		public string usage { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdata/gdata.h")]
+	[Compact]
 	public class GDRating {
 		public double average;
 		public uint max;
@@ -803,8 +803,8 @@ namespace GData {
 		public string relation_type { get; set; }
 		public string value_string { get; set; }
 	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "GDATA_TYPE_GTIME_VAL")]
 	[Compact]
-	[CCode (type_id = "GDATA_TYPE_GTIME_VAL", cheader_filename = "gdata/gdata.h")]
 	public class GTimeVal {
 	}
 	[CCode (cheader_filename = "gdata/gdata.h")]
@@ -892,16 +892,16 @@ namespace GData {
 		public string role { get; }
 		public string scheme { get; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdata/gdata.h")]
+	[Compact]
 	public class MediaRating {
 		public weak string country;
 		public weak string scheme;
 		[CCode (has_construct_function = false)]
 		public MediaRating (string scheme, string country);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gdata/gdata.h")]
+	[Compact]
 	public class MediaRestriction {
 		public weak string countries;
 		public bool relationship;
@@ -942,7 +942,7 @@ namespace GData {
 		[NoWrapper]
 		public virtual bool pre_parse_xml (Xml.Doc doc, Xml.Node root_node) throws GLib.Error;
 	}
-	[CCode (type_check_function = "GDATA_IS_PICASAWEB_ALBUM",cprefix="gdata_picasaweb_album_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_PICASAWEB_ALBUM",cprefix="gdata_picasaweb_album_")]
 	public class PicasaWebAlbum : GData.Entry {
 		[CCode (cname = "gdata_picasaweb_album_new", has_construct_function = false)]
 		public PicasaWebAlbum (string id);
@@ -1014,7 +1014,7 @@ namespace GData {
 		[CCode (has_construct_function = false)]
 		protected PicasaWebFeed ();
 	}
-	[CCode (type_check_function = "GDATA_IS_PICASAWEB_FILE",cprefix="gdata_picasaweb_file_",type_id="GDATA_TYPE_PICASAWEB_FILE", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_PICASAWEB_FILE",cprefix="gdata_picasaweb_file_",type_id="GDATA_TYPE_PICASAWEB_FILE")]
 	public class PicasaWebFile : GData.Entry {
 		[CCode (cname = "gdata_picasaweb_file_new", has_construct_function = false)]
 		public PicasaWebFile (string id);
@@ -1131,7 +1131,7 @@ namespace GData {
 		public string video_status { get; }
 		public uint width { get; }
 	}
-	[CCode (type_check_function = "GDATA_IS_PICASAWEB_QUERY", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_PICASAWEB_QUERY")]
 	public class PicasaWebQuery : GData.Query {
 		[CCode (cname = "gdata_picasaweb_query_new", has_construct_function = false)]
 		public PicasaWebQuery (string q);
@@ -1167,7 +1167,7 @@ namespace GData {
 		public string thumbnail_size { get; set; }
 		public int visibility { get; set; }
 	}
-	[CCode (type_check_function = "GDATA_IS_PICASAWEB_SERVICE", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_PICASAWEB_SERVICE")]
 	public class PicasaWebService : GData.Service {
 		[CCode (cname = "gdata_picasaweb_service_new", has_construct_function = false)]
 		public PicasaWebService (string client_id);
@@ -1291,7 +1291,7 @@ namespace GData {
 	}
 	[CCode (cheader_filename = "gdata/gdata.h")]
 	public class UploadStream : GLib.OutputStream {
-		[CCode (type = "GOutputStream*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public UploadStream (GData.Service service, string method, string upload_uri, GData.Entry entry, string slug, string content_type);
 		public unowned string get_content_type ();
 		public unowned GData.Entry get_entry ();
@@ -1305,7 +1305,7 @@ namespace GData {
 		public string slug { get; construct; }
 		public string upload_uri { get; construct; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_CONTENT", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_CONTENT")]
 	public class YouTubeContent : GData.MediaContent {
 		[CCode (has_construct_function = false)]
 		protected YouTubeContent ();
@@ -1313,7 +1313,7 @@ namespace GData {
 		public GData.YouTubeFormat get_format ();
 		public GData.YouTubeFormat format { get; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_CREDIT", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_CREDIT")]
 	public class YouTubeCredit : GData.MediaCredit {
 		[CCode (has_construct_function = false)]
 		protected YouTubeCredit ();
@@ -1321,7 +1321,7 @@ namespace GData {
 		public unowned string get_entity_type ();
 		public string entity_type { get; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_QUERY", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_QUERY")]
 	public class YouTubeQuery : GData.Query {
 		[CCode (cname = "gdata_youtube_query_new", has_construct_function = false)]
 		public YouTubeQuery (string q);
@@ -1378,7 +1378,7 @@ namespace GData {
 		public GData.YouTubeSortOrder sort_order { get; set; }
 		public GData.YouTubeUploader uploader { get; set; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_SERVICE", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_SERVICE")]
 	public class YouTubeService : GData.Service {
 		[CCode (cname = "gdata_youtube_service_new", has_construct_function = false)]
 		public YouTubeService (string developer_key, string client_id);
@@ -1405,7 +1405,7 @@ namespace GData {
 		public string developer_key { get; construct; }
 		public string youtube_user { get; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_STATE", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_STATE")]
 	public class YouTubeState : GData.Parsable {
 		[CCode (cname = "gdata_youtube_state_new", has_construct_function = false)]
 		public YouTubeState (string name, string message, string reason_code, string help_uri);
@@ -1422,7 +1422,7 @@ namespace GData {
 		public string name { get; }
 		public string reason_code { get; }
 	}
-	[CCode (type_check_function = "GDATA_IS_YOUTUBE_VIDEO", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", type_check_function = "GDATA_IS_YOUTUBE_VIDEO")]
 	public class YouTubeVideo : GData.Entry {
 		[CCode (cname = "gdata_youtube_video_new", has_construct_function = false)]
 		public YouTubeVideo (string id);
@@ -1521,7 +1521,7 @@ namespace GData {
 		public abstract bool is_owner_rule (GData.AccessRule rule);
 		public unowned GData.AccessRule update_rule (GData.Service service, GData.AccessRule rule, GLib.Cancellable cancellable) throws GLib.Error;
 	}
-	[CCode (cprefix = "GDATA_AUTHENTICATION_ERROR_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_AUTHENTICATION_ERROR_")]
 	public enum AuthenticationError {
 		BAD_AUTHENTICATION,
 		NOT_VERIFIED,
@@ -1531,7 +1531,7 @@ namespace GData {
 		ACCOUNT_DISABLED,
 		SERVICE_DISABLED
 	}
-	[CCode (cprefix = "GDATA_DOCUMENTS_PRESENTATION_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_DOCUMENTS_PRESENTATION_")]
 	public enum DocumentsPresentationFormat {
 		PDF,
 		PNG,
@@ -1539,11 +1539,11 @@ namespace GData {
 		SWF,
 		TXT
 	}
-	[CCode (cprefix = "GDATA_DOCUMENTS_SERVICE_ERROR_INVALID_CONTENT_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_DOCUMENTS_SERVICE_ERROR_INVALID_CONTENT_")]
 	public enum DocumentsServiceError {
 		TYPE
 	}
-	[CCode (cprefix = "GDATA_DOCUMENTS_SPREADSHEET_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_DOCUMENTS_SPREADSHEET_")]
 	public enum DocumentsSpreadsheetFormat {
 		XLS,
 		CSV,
@@ -1552,7 +1552,7 @@ namespace GData {
 		TSV,
 		HTML
 	}
-	[CCode (cprefix = "GDATA_DOCUMENTS_TEXT_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_DOCUMENTS_TEXT_")]
 	public enum DocumentsTextFormat {
 		DOC,
 		HTML,
@@ -1563,13 +1563,13 @@ namespace GData {
 		TXT,
 		ZIP
 	}
-	[CCode (cprefix = "GDATA_MEDIA_EXPRESSION_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_EXPRESSION_")]
 	public enum MediaExpression {
 		SAMPLE,
 		FULL,
 		NONSTOP
 	}
-	[CCode (cprefix = "GDATA_MEDIA_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_")]
 	public enum MediaMedium {
 		UNKNOWN,
 		IMAGE,
@@ -1578,7 +1578,7 @@ namespace GData {
 		DOCUMENT,
 		EXECUTABLE
 	}
-	[CCode (cprefix = "GDATA_OPERATION_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_OPERATION_")]
 	public enum OperationType {
 		QUERY,
 		INSERTION,
@@ -1588,17 +1588,17 @@ namespace GData {
 		UPLOAD,
 		AUTHENTICATION
 	}
-	[CCode (cprefix = "GDATA_PARSER_ERROR_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PARSER_ERROR_")]
 	public enum ParserError {
 		PARSING_STRING,
 		EMPTY_DOCUMENT
 	}
-	[CCode (cprefix = "GDATA_PICASAWEB_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PICASAWEB_")]
 	public enum PicasaWebVisibility {
 		PUBLIC,
 		PRIVATE
 	}
-	[CCode (cprefix = "GDATA_SERVICE_ERROR_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_SERVICE_ERROR_")]
 	public enum ServiceError {
 		UNAVAILABLE,
 		PROTOCOL_ERROR,
@@ -1611,44 +1611,44 @@ namespace GData {
 		NETWORK_ERROR,
 		PROXY_ERROR
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_AGE_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_AGE_")]
 	public enum YouTubeAge {
 		ALL_TIME,
 		TODAY,
 		THIS_WEEK,
 		THIS_MONTH
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_FORMAT_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_FORMAT_")]
 	public enum YouTubeFormat {
 		UNKNOWN,
 		RTSP_H263_AMR,
 		HTTP_SWF,
 		RTSP_MPEG4_AAC
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_PERMISSION_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_PERMISSION_")]
 	public enum YouTubePermission {
 		ALLOWED,
 		DENIED,
 		MODERATED
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_SAFE_SEARCH_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SAFE_SEARCH_")]
 	public enum YouTubeSafeSearch {
 		NONE,
 		MODERATE,
 		STRICT
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_SERVICE_ERROR_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SERVICE_ERROR_")]
 	public enum YouTubeServiceError {
 		API_QUOTA_EXCEEDED,
 		ENTRY_QUOTA_EXCEEDED
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_SORT_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SORT_")]
 	public enum YouTubeSortOrder {
 		NONE,
 		ASCENDING,
 		DESCENDING
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_")]
 	public enum YouTubeStandardFeedType {
 		TOP_RATED_FEED,
 		TOP_FAVORITES_FEED,
@@ -1661,7 +1661,7 @@ namespace GData {
 		RECENTLY_FEATURED_FEED,
 		WATCH_ON_MOBILE_FEED
 	}
-	[CCode (cprefix = "GDATA_YOUTUBE_UPLOADER_", cheader_filename = "gdata/gdata.h")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_UPLOADER_")]
 	public enum YouTubeUploader {
 		ALL,
 		PARTNER
diff --git a/vapi/libglade-2.0.vapi b/vapi/libglade-2.0.vapi
index 8c6b81e..49ad9f4 100644
--- a/vapi/libglade-2.0.vapi
+++ b/vapi/libglade-2.0.vapi
@@ -2,35 +2,35 @@
 
 [CCode (cprefix = "Glade", lower_case_cprefix = "glade_")]
 namespace Glade {
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class AccelInfo {
 		public uint key;
 		public Gdk.ModifierType modifiers;
 		public weak string @signal;
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class AtkActionInfo {
 		public weak string action_name;
 		public weak string description;
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class AtkRelationInfo {
 		public weak string target;
 		public weak string type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class ChildInfo {
 		public weak Glade.WidgetInfo child;
 		public weak string internal_child;
 		public uint n_properties;
 		public weak Glade.Property properties;
 	}
+	[CCode (cheader_filename = "glade/glade.h", free_function = "glade_interface_destroy")]
 	[Compact]
-	[CCode (free_function = "glade_interface_destroy", cheader_filename = "glade/glade.h")]
 	public class Interface {
 		public uint n_requires;
 		public uint n_toplevels;
@@ -40,22 +40,22 @@ namespace Glade {
 		public weak Glade.WidgetInfo toplevels;
 		public void dump (string filename);
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class Property {
 		public weak string name;
 		public weak string value;
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class SignalInfo {
 		public uint after;
 		public weak string handler;
 		public weak string name;
 		public weak string object;
 	}
-	[Compact]
 	[CCode (cheader_filename = "glade/glade.h")]
+	[Compact]
 	public class WidgetInfo {
 		public weak Glade.AccelInfo accels;
 		public weak Glade.AtkActionInfo atk_actions;
diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi
index 43e9b16..490c3bd 100644
--- a/vapi/libgnome-2.0.vapi
+++ b/vapi/libgnome-2.0.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
+	[CCode (cheader_filename = "libgnome/libgnome.h", type_id = "GNOME_TYPE_MODULE_INFO")]
 	[Compact]
-	[CCode (type_id = "GNOME_TYPE_MODULE_INFO", cheader_filename = "libgnome/libgnome.h")]
 	public class ModuleInfo {
 		public weak Gnome.ModuleClassInitHook class_init;
 		public weak string description;
@@ -17,8 +17,8 @@ namespace Gnome {
 		public weak Gnome.ModuleRequirement requirements;
 		public weak string version;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
+	[Compact]
 	public class ModuleRequirement {
 		public weak Gnome.ModuleInfo module_info;
 		public weak string required_version;
@@ -73,14 +73,14 @@ namespace Gnome {
 		public int popt_flags { construct; }
 		public void* popt_table { construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
+	[Compact]
 	public class Trigger {
 		public weak string level;
 		public Gnome.TriggerType type;
 		public void* u;
 	}
-	[CCode (cprefix = "GNOME_FILE_DOMAIN_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cprefix = "GNOME_FILE_DOMAIN_", has_type_id = false)]
 	public enum FileDomain {
 		UNKNOWN,
 		LIBDIR,
@@ -96,19 +96,19 @@ namespace Gnome {
 		APP_CONFIG,
 		APP_HELP
 	}
-	[CCode (cprefix = "GNOME_HELP_ERROR_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cprefix = "GNOME_HELP_ERROR_", has_type_id = false)]
 	public enum HelpError {
 		INTERNAL,
 		NOT_FOUND
 	}
-	[CCode (cprefix = "GTRIG_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cprefix = "GTRIG_", has_type_id = false)]
 	public enum TriggerType {
 		NONE,
 		FUNCTION,
 		COMMAND,
 		MEDIAPLAY
 	}
-	[CCode (cprefix = "GNOME_URL_ERROR_", has_type_id = false, cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cprefix = "GNOME_URL_ERROR_", has_type_id = false)]
 	public enum URLError {
 		PARSE,
 		LAUNCH,
@@ -190,7 +190,7 @@ namespace Gnome {
 	public static int execute_terminal_shell (string dir, string commandline);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static int execute_terminal_shell_fds (string dir, string commandline, bool close_fds);
-	[CCode (cname = "g_extension_pointer", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cname = "g_extension_pointer")]
 	public static unowned string g_extension_pointer (string path);
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static unowned string gconf_get_app_settings_relative (Gnome.Program program, string subkey);
@@ -212,7 +212,7 @@ namespace Gnome {
 	public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out unowned string envp) throws GLib.Error;
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static GLib.Quark help_error_quark ();
-	[CCode (cname = "libgnome_module_info_get", cheader_filename = "libgnome/libgnome.h")]
+	[CCode (cheader_filename = "libgnome/libgnome.h", cname = "libgnome_module_info_get")]
 	public static unowned Gnome.ModuleInfo libgnome_module_info_get ();
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public static void prepend_terminal_to_vector (int argc, out unowned string argv);
diff --git a/vapi/libgnome-menu.vapi b/vapi/libgnome-menu.vapi
index 844fa5a..5946da8 100644
--- a/vapi/libgnome-menu.vapi
+++ b/vapi/libgnome-menu.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "GMenu", lower_case_cprefix = "gmenu_")]
 namespace GMenu {
+	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h", ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref")]
 	[Compact]
-	[CCode (ref_function = "gmenu_tree_ref", unref_function = "gmenu_tree_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class Tree {
 		public void add_monitor (GMenu.TreeChangedFunc callback);
 		public unowned GMenu.TreeDirectory get_directory_from_path (string path);
@@ -16,14 +16,14 @@ namespace GMenu {
 		public void set_sort_key (GMenu.TreeSortKey sort_key);
 		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[Compact]
 	public class TreeAlias : GMenu.TreeItem {
 		public unowned GMenu.TreeDirectory get_directory ();
 		public unowned GMenu.TreeItem get_item ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[Compact]
 	public class TreeDirectory : GMenu.TreeItem {
 		public unowned string get_comment ();
 		public unowned GLib.SList<GMenu.TreeItem> get_contents ();
@@ -35,8 +35,8 @@ namespace GMenu {
 		public unowned GMenu.Tree get_tree ();
 		public unowned string make_path (GMenu.TreeEntry entry);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[Compact]
 	public class TreeEntry : GMenu.TreeItem {
 		public unowned string get_comment ();
 		public unowned string get_desktop_file_id ();
@@ -50,24 +50,24 @@ namespace GMenu {
 		public bool get_launch_in_terminal ();
 		public unowned string get_name ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[Compact]
 	public class TreeHeader : GMenu.TreeItem {
 		public unowned GMenu.TreeDirectory get_directory ();
 	}
+	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h", ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref")]
 	[Compact]
-	[CCode (ref_function = "gmenu_tree_item_ref", unref_function = "gmenu_tree_item_unref", cheader_filename = "gnome-menus/gmenu-tree.h")]
 	public class TreeItem {
 		public unowned GMenu.TreeDirectory get_parent ();
 		public GMenu.TreeItemType get_type ();
 		public void* get_user_data ();
 		public void set_user_data (void* user_data, GLib.DestroyNotify dnotify);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[Compact]
 	public class TreeSeparator : GMenu.TreeItem {
 	}
-	[CCode (cprefix = "GMENU_TREE_FLAGS_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h", cprefix = "GMENU_TREE_FLAGS_", has_type_id = false)]
 	public enum TreeFlags {
 		NONE,
 		INCLUDE_EXCLUDED,
@@ -76,7 +76,7 @@ namespace GMenu {
 		SHOW_ALL_SEPARATORS,
 		MASK
 	}
-	[CCode (cprefix = "GMENU_TREE_ITEM_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h", cprefix = "GMENU_TREE_ITEM_", has_type_id = false)]
 	public enum TreeItemType {
 		INVALID,
 		DIRECTORY,
@@ -85,7 +85,7 @@ namespace GMenu {
 		HEADER,
 		ALIAS
 	}
-	[CCode (cprefix = "GMENU_TREE_SORT_", has_type_id = false, cheader_filename = "gnome-menus/gmenu-tree.h")]
+	[CCode (cheader_filename = "gnome-menus/gmenu-tree.h", cprefix = "GMENU_TREE_SORT_", has_type_id = false)]
 	public enum TreeSortKey {
 		NAME,
 		DISPLAY_NAME
diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi
index b524c0a..74c4290 100644
--- a/vapi/libgnomeui-2.0.vapi
+++ b/vapi/libgnomeui-2.0.vapi
@@ -12,7 +12,7 @@ namespace Gnome {
 		public weak string prefix;
 		public weak Gtk.Widget statusbar;
 		public weak Gtk.Widget vbox;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public App (string appname, string title);
 		public void @construct (string appname, string title);
 		public void create_menus (Gnome.UIInfo uiinfo);
@@ -52,7 +52,7 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class AppBar : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
-		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
+		[CCode (cname = "gnome_appbar_new", has_construct_function = false, type = "GtkWidget*")]
 		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_clear_stack")]
 		public void clear_stack ();
@@ -86,8 +86,8 @@ namespace Gnome {
 		public virtual signal void clear_prompt ();
 		public virtual signal void user_response ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Compact]
 	public class AppBarMsg {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -164,10 +164,10 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class DateEdit : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateEdit (ulong the_time, bool show_time, bool use_24_format);
 		public void @construct (ulong the_time, Gnome.DateEditFlags flags);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public DateEdit.flags (ulong the_time, Gnome.DateEditFlags flags);
 		public int get_flags ();
 		public ulong get_initial_time ();
@@ -187,13 +187,13 @@ namespace Gnome {
 		public virtual signal void date_changed ();
 		public virtual signal void time_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Compact]
 	public class GdkPixbufAsyncHandle {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconEntry : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconEntry (string history_id, string browse_dialog_title);
 		public void @construct (string history_id, string browse_dialog_title);
 		public unowned string get_filename ();
@@ -222,7 +222,7 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconSelection : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconSelection ();
 		public void add_defaults ();
 		public void add_directory (string dir);
@@ -237,7 +237,7 @@ namespace Gnome {
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class PasswordDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
 		public weak Gnome.PasswordDialogDetails details;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
 		public bool anon_selected ();
 		public unowned string get_domain ();
@@ -292,8 +292,8 @@ namespace Gnome {
 		public bool show_userpass_buttons { get; set; }
 		public string username { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Compact]
 	public class PasswordDialogDetails {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
@@ -307,8 +307,8 @@ namespace Gnome {
 		public unowned string lookup (string uri, ulong mtime);
 		public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Compact]
 	public class UIBuilderData {
 		public weak Gnome.UISignalConnectFunc connect_func;
 		public void* data;
@@ -316,8 +316,8 @@ namespace Gnome {
 		public bool is_interp;
 		public weak Gtk.CallbackMarshal relay_func;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
+	[Compact]
 	public class UIInfo {
 		public Gdk.ModifierType ac_mods;
 		public uint accelerator_key;
@@ -331,14 +331,14 @@ namespace Gnome {
 		public void* user_data;
 		public weak Gtk.Widget widget;
 	}
-	[CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_CLIENT_")]
 	[Flags]
 	public enum ClientFlags {
 		IS_CONNECTED,
 		RESTARTED,
 		RESTORED
 	}
-	[CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_CLIENT_")]
 	public enum ClientState {
 		IDLE,
 		SAVING_PHASE_1,
@@ -348,7 +348,7 @@ namespace Gnome {
 		DISCONNECTED,
 		REGISTERING
 	}
-	[CCode (cprefix = "GNOME_DATE_EDIT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_DATE_EDIT_")]
 	[Flags]
 	public enum DateEditFlags {
 		SHOW_TIME,
@@ -356,32 +356,32 @@ namespace Gnome {
 		WEEK_STARTS_ON_MONDAY,
 		DISPLAY_SECONDS
 	}
-	[CCode (cprefix = "GNOME_DIALOG_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_DIALOG_")]
 	public enum DialogType {
 		ERROR,
 		NORMAL
 	}
-	[CCode (cprefix = "GNOME_EDGE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_EDGE_")]
 	public enum EdgePosition {
 		START,
 		FINISH,
 		OTHER,
 		LAST
 	}
-	[CCode (cprefix = "GNOME_FONT_PICKER_MODE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_FONT_PICKER_MODE_")]
 	public enum FontPickerMode {
 		PIXMAP,
 		FONT_INFO,
 		USER_WIDGET,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GNOME_ICON_LIST_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_ICON_LIST_")]
 	public enum IconListMode {
 		ICONS,
 		TEXT_BELOW,
 		TEXT_RIGHT
 	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_ICON_LOOKUP_FLAGS_")]
 	[Flags]
 	public enum IconLookupFlags {
 		NONE,
@@ -389,56 +389,56 @@ namespace Gnome {
 		SHOW_SMALL_IMAGES_AS_THEMSELVES,
 		ALLOW_SVG_AS_THEMSELVES
 	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_")]
 	[Flags]
 	public enum IconLookupResultFlags {
 		NONE,
 		THUMBNAIL
 	}
-	[CCode (cprefix = "GNOME_INTERACT_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_INTERACT_")]
 	public enum InteractStyle {
 		NONE,
 		ERRORS,
 		ANY
 	}
-	[CCode (cprefix = "GNOME_MDI_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_MDI_")]
 	public enum MDIMode {
 		NOTEBOOK,
 		TOPLEVEL,
 		MODAL,
 		DEFAULT_MODE
 	}
-	[CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_")]
 	public enum PasswordDialogRemember {
 		NOTHING,
 		SESSION,
 		FOREVER
 	}
-	[CCode (cprefix = "GNOME_PREFERENCES_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_PREFERENCES_")]
 	public enum PreferencesType {
 		NEVER,
 		USER,
 		ALWAYS
 	}
-	[CCode (cprefix = "GNOME_RESTART_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_RESTART_")]
 	public enum RestartStyle {
 		IF_RUNNING,
 		ANYWAY,
 		IMMEDIATELY,
 		NEVER
 	}
-	[CCode (cprefix = "GNOME_SAVE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_SAVE_")]
 	public enum SaveStyle {
 		GLOBAL,
 		LOCAL,
 		BOTH
 	}
-	[CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_THUMBNAIL_SIZE_")]
 	public enum ThumbnailSize {
 		NORMAL,
 		LARGE
 	}
-	[CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_APP_CONFIGURABLE_ITEM_")]
 	public enum UIInfoConfigurableTypes {
 		NEW,
 		OPEN,
@@ -473,7 +473,7 @@ namespace Gnome {
 		SCORES,
 		END_GAME
 	}
-	[CCode (cprefix = "GNOME_APP_UI_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_APP_UI_")]
 	public enum UIInfoType {
 		ENDOFINFO,
 		ITEM,
@@ -487,7 +487,7 @@ namespace Gnome {
 		SUBTREE_STOCK,
 		INCLUDE
 	}
-	[CCode (cprefix = "GNOME_APP_PIXMAP_", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cprefix = "GNOME_APP_PIXMAP_")]
 	public enum UIPixmapType {
 		NONE,
 		STOCK,
@@ -508,7 +508,7 @@ namespace Gnome {
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", has_target = false)]
 	public delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
-	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cname = "LIBGNOMEUI_MODULE")]
 	public static Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_MENUBAR_NAME;
@@ -672,7 +672,7 @@ namespace Gnome {
 	public static unowned string icon_lookup_sync (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.IconLookupFlags flags, Gnome.IconLookupResultFlags _result);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static void interaction_key_return (int key, bool cancel_shutdown);
-	[CCode (cname = "libgnomeui_module_info_get", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", cname = "libgnomeui_module_info_get")]
 	public static unowned Gnome.ModuleInfo libgnomeui_module_info_get ();
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public static unowned Gnome.Client master_client ();
diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi
index 9bce1af..33367c1 100644
--- a/vapi/libgsf-1.vapi
+++ b/vapi/libgsf-1.vapi
@@ -30,8 +30,8 @@ namespace Gsf {
 		public unowned Gsf.DocProp? steal (string name);
 		public void store (Gsf.DocProp prop);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-doc-meta-data.h")]
+	[Compact]
 	public class DocProp {
 		[CCode (has_construct_function = false)]
 		public DocProp (owned string name);
@@ -66,33 +66,33 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msole.h")]
 	public class InfileMSOle : Gsf.Infile {
-		[CCode (cname = "gsf_infile_msole_new", type = "GsfInfile*", has_construct_function = false)]
+		[CCode (cname = "gsf_infile_msole_new", has_construct_function = false, type = "GsfInfile*")]
 		public InfileMSOle (Gsf.Input source) throws GLib.Error;
 		[CCode (cname = "gsf_infile_msole_get_class_id")]
 		public bool get_class_id (uchar res);
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
 	public class InfileMSVBA : Gsf.Infile {
-		[CCode (type = "GsfInfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileMSVBA (Gsf.Infile source) throws GLib.Error;
 		public unowned GLib.HashTable get_modules ();
 		public unowned GLib.HashTable steal_modules ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-stdio.h")]
 	public class InfileStdio : Gsf.Infile {
-		[CCode (type = "GsfInfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileStdio (string root) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf.h")]
 	public class InfileTar : Gsf.Infile {
-		[CCode (type = "GsfInfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileTar (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public Gsf.Input source { owned get; construct; }
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-zip.h")]
 	public class InfileZip : Gsf.Infile {
-		[CCode (type = "GsfInfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInfile*")]
 		public InfileZip (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public int compression_level { get; }
@@ -109,8 +109,8 @@ namespace Gsf {
 		public virtual Gsf.Input Dup () throws GLib.Error;
 		[NoWrapper]
 		public virtual Gsf.Input OpenSibling (string path) throws GLib.Error;
-		[NoWrapper]
 		[CCode (array_length = false)]
+		[NoWrapper]
 		public virtual unowned uchar[]? Read (size_t num_bytes, [CCode (array_length = false)] uchar[]? optional_buffer);
 		[NoWrapper]
 		public virtual bool Seek (Gsf.off_t offset, GLib.SeekType whence);
@@ -142,7 +142,7 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-gzip.h")]
 	public class InputGZip : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputGZip (Gsf.Input source) throws GLib.Error;
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
@@ -153,16 +153,16 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf.h")]
 	public class InputGio : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputGio (GLib.File file) throws GLib.Error;
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputGio.for_path (string path) throws GLib.Error;
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputGio.for_uri (string uri) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-http.h")]
 	public class InputHTTP : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputHTTP (string url) throws GLib.Error;
 		public unowned string get_content_type ();
 		public unowned string get_url ();
@@ -171,44 +171,44 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-memory.h")]
 	public class InputMemory : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputMemory (uchar buf, Gsf.off_t length, bool needs_free);
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputMemory.clone (uchar buf, Gsf.off_t length);
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputMemory.from_bzip (Gsf.Input source) throws GLib.Error;
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputMemory.from_iochannel (GLib.IOChannel channel) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-proxy.h")]
 	public class InputProxy : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputProxy (Gsf.Input source);
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputProxy.section (Gsf.Input source, Gsf.off_t offset, Gsf.off_t size);
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-stdio.h")]
 	public class InputStdio : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputStdio (string filename) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-input-textline.h")]
 	public class InputTextline : Gsf.Input {
-		[CCode (type = "GsfInput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfInput*")]
 		public InputTextline (Gsf.Input source);
 		[CCode (array_length = false)]
 		public unowned uint[]? ascii_gets ();
 		[CCode (array_length = false)]
 		public unowned uchar[]? utf8_gets ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+	[Compact]
 	public class OpenPkgRel {
 		public unowned string get_target ();
 		public bool is_extern ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
+	[Compact]
 	public class OpenPkgRels {
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-impl.h")]
@@ -220,16 +220,16 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-msole.h")]
 	public class OutfileMSOle : Gsf.Outfile {
-		[CCode (cname = "gsf_outfile_msole_new", type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (cname = "gsf_outfile_msole_new", has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileMSOle (Gsf.Output sink);
-		[CCode (cname = "gsf_outfile_msole_new_full", type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (cname = "gsf_outfile_msole_new_full", has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileMSOle.full (Gsf.Output sink, uint bb_size, uint sb_size);
 		[CCode (cname = "gsf_outfile_msole_set_class_id")]
 		public bool set_class_id (uchar clsid);
 	}
 	[CCode (cheader_filename = "gsf/gsf-open-pkg-utils.h")]
 	public class OutfileOpenPkg : Gsf.Outfile {
-		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileOpenPkg (Gsf.Outfile sink);
 		public unowned string add_extern_rel (string target, string content_type);
 		public static Gsf.Output add_rel (Gsf.Outfile dir, string name, string content_type, Gsf.Outfile parent, string type);
@@ -245,14 +245,14 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-stdio.h")]
 	public class OutfileStdio : Gsf.Outfile {
-		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileStdio (string root) throws GLib.Error;
-		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileStdio.full (string root, ...) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-outfile-zip.h")]
 	public class OutfileZip : Gsf.Outfile {
-		[CCode (type = "GsfOutfile*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutfile*")]
 		public OutfileZip (Gsf.Output sink) throws GLib.Error;
 		public bool set_compression_method (Gsf.ZipCompressionMethod method);
 		[NoAccessorMethod]
@@ -301,7 +301,7 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-bzip.h")]
 	public class OutputBzip : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputBzip (Gsf.Output sink) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-csv.h")]
@@ -332,7 +332,7 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-gzip.h")]
 	public class OutputGZip : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGZip (Gsf.Output sink) throws GLib.Error;
 		[NoAccessorMethod]
 		public bool raw { get; construct; }
@@ -341,21 +341,21 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-gio.h")]
 	public class OutputGio : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGio (GLib.File file);
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGio.for_path (string path) throws GLib.Error;
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputGio.for_uri (string uri) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-iochannel.h")]
 	public class OutputIOChannel : Gsf.Output {
-		[CCode (cname = "gsf_output_iochannel_new", type = "GsfOutput*", has_construct_function = false)]
+		[CCode (cname = "gsf_output_iochannel_new", has_construct_function = false, type = "GsfOutput*")]
 		public OutputIOChannel (GLib.IOChannel channel);
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-iconv.h")]
 	public class OutputIconv : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputIconv (Gsf.Output sink, string dst, string src);
 		[NoAccessorMethod]
 		public string fallback { owned get; set; }
@@ -368,16 +368,16 @@ namespace Gsf {
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-memory.h")]
 	public class OutputMemory : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputMemory ();
 		[CCode (array_length = false)]
 		public unowned uchar[] get_bytes ();
 	}
 	[CCode (cheader_filename = "gsf/gsf-output-stdio.h")]
 	public class OutputStdio : Gsf.Output {
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputStdio (string filename) throws GLib.Error;
-		[CCode (type = "GsfOutput*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GsfOutput*")]
 		public OutputStdio.full (string filename, ...) throws GLib.Error;
 	}
 	[CCode (cheader_filename = "gsf/gsf-infile-msvba.h")]
@@ -397,8 +397,8 @@ namespace Gsf {
 		public static Gsf.StructuredBlob read (Gsf.Input input);
 		public bool write (Gsf.Outfile container);
 	}
+	[CCode (cheader_filename = "gsf/gsf-timestamp.h", copy_function = "gsf_timestamp_copy", type_id = "GSF_TYPE_TIMESTAMP")]
 	[Compact]
-	[CCode (copy_function = "gsf_timestamp_copy", type_id = "GSF_TYPE_TIMESTAMP", cheader_filename = "gsf/gsf-timestamp.h")]
 	public class Timestamp {
 		public GLib.Date date;
 		public long seconds;
@@ -414,12 +414,12 @@ namespace Gsf {
 		public static int parse (string spec, Gsf.Timestamp stamp);
 		public void set_time (uint64 t);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[Compact]
 	public class XMLBlob {
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[Compact]
 	public class XMLIn {
 		public weak GLib.StringBuilder content;
 		public weak Gsf.XMLInDoc doc;
@@ -431,8 +431,8 @@ namespace Gsf {
 		public bool namecmp (string str, uint ns_id, string name);
 		public void push_state (Gsf.XMLInDoc doc, void* new_state, Gsf.XMLInExtDtor dtor, [CCode (array_length = false)] string[] attrs);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[Compact]
 	public class XMLInDoc {
 		[CCode (has_construct_function = false)]
 		public XMLInDoc ([CCode (array_length = false)] Gsf.XMLInNode[] nodes, Gsf.XMLInNS ns);
@@ -440,14 +440,14 @@ namespace Gsf {
 		public bool parse (Gsf.Input input, void* user_state);
 		public void set_unknown_handler (Gsf.XMLInUnknownFunc handler);
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[Compact]
 	public class XMLInNS {
 		public uint ns_id;
 		public weak string uri;
 	}
-	[Compact]
 	[CCode (cheader_filename = "gsf/gsf-libxml.h")]
+	[Compact]
 	public class XMLInNode {
 		public uint check_children_for_ns;
 		public weak GLib.Callback end;
@@ -484,12 +484,12 @@ namespace Gsf {
 		[NoAccessorMethod]
 		public bool pretty_print { get; set; }
 	}
-	[CCode (cname = "gint64", cheader_filename = "glib.h")]
-	[SimpleType]
+	[CCode (cheader_filename = "glib.h", cname = "gint64")]
 	[IntegerType (rank = 10)]
+	[SimpleType]
 	public struct off_t : int64 {
 	}
-	[CCode (cprefix = "GSF_CLIP_FORMAT_", has_type_id = false, cheader_filename = "gsf/gsf-clip-data.h")]
+	[CCode (cheader_filename = "gsf/gsf-clip-data.h", cprefix = "GSF_CLIP_FORMAT_", has_type_id = false)]
 	public enum ClipFormat {
 		WINDOWS_CLIPBOARD,
 		MACINTOSH_CLIPBOARD,
@@ -498,7 +498,7 @@ namespace Gsf {
 		CLIPBOARD_FORMAT_NAME,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = false, cheader_filename = "gsf/gsf-clip-data.h")]
+	[CCode (cheader_filename = "gsf/gsf-clip-data.h", cprefix = "GSF_CLIP_FORMAT_WINDOWS_", has_type_id = false)]
 	public enum ClipFormatWindows {
 		ERROR,
 		UNKNOWN,
@@ -506,19 +506,19 @@ namespace Gsf {
 		DIB,
 		ENHANCED_METAFILE
 	}
-	[CCode (cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_", cheader_filename = "gsf/gsf-output-csv.h")]
+	[CCode (cheader_filename = "gsf/gsf-output-csv.h", cprefix = "GSF_OUTPUT_CSV_QUOTING_MODE_")]
 	public enum OutputCsvQuotingMode {
 		NEVER,
 		AUTO,
 		ALWAYS
 	}
-	[CCode (cprefix = "GSF_XML_", has_type_id = false, cheader_filename = "gsf/gsf-libxml.h")]
+	[CCode (cheader_filename = "gsf/gsf-libxml.h", cprefix = "GSF_XML_", has_type_id = false)]
 	public enum XMLContent {
 		NO_CONTENT,
 		CONTENT,
 		SHARED_CONTENT
 	}
-	[CCode (cprefix = "GSF_ZIP_", has_type_id = false, cheader_filename = "gsf/gsf-outfile-zip.h")]
+	[CCode (cheader_filename = "gsf/gsf-outfile-zip.h", cprefix = "GSF_ZIP_", has_type_id = false)]
 	public enum ZipCompressionMethod {
 		STORED,
 		SHRUNK,
@@ -532,7 +532,7 @@ namespace Gsf {
 		DEFLATED_BETTER,
 		IMPLODED_BETTER
 	}
-	[CCode (cprefix = "GSF_ERROR_", cheader_filename = "gsf/gsf-utils.h")]
+	[CCode (cheader_filename = "gsf/gsf-utils.h", cprefix = "GSF_ERROR_")]
 	public errordomain Error {
 		OUT_OF_MEMORY,
 		INVALID_DATA
@@ -663,7 +663,7 @@ namespace Gsf {
 	public static size_t base64_decode_step ([CCode (array_length = false)] uchar[] @in, size_t len, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static size_t base64_encode_close ([CCode (array_length = false)] uchar[] @in, size_t inlen, bool break_lines, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
-	[CCode (cheader_filename = "gsf/gsf-utils.h", array_length = false)]
+	[CCode (array_length = false, cheader_filename = "gsf/gsf-utils.h")]
 	public static unowned uchar[] base64_encode_simple ([CCode (array_length = false)] uchar[] data, size_t len);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static size_t base64_encode_step ([CCode (array_length = false)] uchar[] @in, size_t len, bool break_lines, [CCode (array_length = false)] uchar[] @out, out int state, out uint save);
@@ -675,11 +675,11 @@ namespace Gsf {
 	public static unowned string extension_pointer (string path);
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static string filename_to_utf8 (string filename, bool quoted);
-	[CCode (cname = "get_gsf_odf_version", cheader_filename = "gsf/gsf.h")]
+	[CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_odf_version")]
 	public static short get_gsf_odf_version ();
-	[CCode (cname = "get_gsf_odf_version_string", cheader_filename = "gsf/gsf.h")]
+	[CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_odf_version_string")]
 	public static unowned string get_gsf_odf_version_string ();
-	[CCode (cname = "get_gsf_ooo_ns", cheader_filename = "gsf/gsf.h")]
+	[CCode (cheader_filename = "gsf/gsf.h", cname = "get_gsf_ooo_ns")]
 	public static unowned Gsf.XMLInNS get_gsf_ooo_ns ();
 	[CCode (cheader_filename = "gsf/gsf-utils.h")]
 	public static void iconv_close (GLib.IConv handle);
diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi
index d919e36..044de5b 100644
--- a/vapi/libnotify.vapi
+++ b/vapi/libnotify.vapi
@@ -36,7 +36,7 @@ namespace Notify {
 		public string summary { owned get; set construct; }
 		public virtual signal void closed ();
 	}
-	[CCode (cprefix = "NOTIFY_URGENCY_", cheader_filename = "libnotify/notify.h")]
+	[CCode (cheader_filename = "libnotify/notify.h", cprefix = "NOTIFY_URGENCY_")]
 	public enum Urgency {
 		LOW,
 		NORMAL,
diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi
index 95027e4..0730c84 100644
--- a/vapi/liboobs-1.vapi
+++ b/vapi/liboobs-1.vapi
@@ -204,8 +204,8 @@ namespace Oobs {
 		public void @set (Oobs.ListIter iter, void* data);
 		public void* contained_type { construct; }
 	}
+	[CCode (cheader_filename = "oobs/oobs.h", copy_function = "oobs_list_iter_copy", type_id = "OOBS_TYPE_LIST_ITER")]
 	[Compact]
-	[CCode (copy_function = "oobs_list_iter_copy", type_id = "OOBS_TYPE_LIST_ITER", cheader_filename = "oobs/oobs.h")]
 	public class ListIter {
 		public void* data;
 		public uint stamp;
@@ -257,8 +257,8 @@ namespace Oobs {
 		public virtual signal void committed ();
 		public virtual signal void updated ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "oobs/oobs.h")]
+	[Compact]
 	public class Platform {
 		public weak string codename;
 		public weak string id;
@@ -313,8 +313,8 @@ namespace Oobs {
 		public unowned GLib.List get_runlevels ();
 		public unowned Oobs.List get_services ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "oobs/oobs.h")]
+	[Compact]
 	public class ServicesRunlevel {
 		public weak string name;
 		public uint role;
@@ -341,15 +341,15 @@ namespace Oobs {
 		public void set_path (string path);
 		public string path { get; set; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "oobs/oobs.h")]
+	[Compact]
 	public class ShareAclElement {
 		public weak string element;
 		public bool read_only;
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareNFS : Oobs.Share {
-		[CCode (type = "OobsShare*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "OobsShare*")]
 		public ShareNFS (string path);
 		public void add_acl_element (string element, bool read_only);
 		public unowned GLib.SList get_acl ();
@@ -357,7 +357,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareSMB : Oobs.Share {
-		[CCode (type = "OobsShare*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "OobsShare*")]
 		public ShareSMB (string path, string name, string comment, Oobs.ShareSMBFlags flags);
 		public unowned string get_comment ();
 		public Oobs.ShareSMBFlags get_flags ();
@@ -489,17 +489,17 @@ namespace Oobs {
 		[NoAccessorMethod]
 		public uint minimum_uid { get; set; }
 	}
-	[CCode (cprefix = "OOBS_DIAL_TYPE_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_DIAL_TYPE_")]
 	public enum DialType {
 		TONES,
 		PULSES
 	}
-	[CCode (cprefix = "OOBS_ERROR_AUTHENTICATION_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_ERROR_AUTHENTICATION_")]
 	public enum Error {
 		FAILED,
 		CANCELLED
 	}
-	[CCode (cprefix = "OOBS_IFACE_TYPE_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_IFACE_TYPE_")]
 	public enum IfaceType {
 		ETHERNET,
 		WIRELESS,
@@ -507,14 +507,14 @@ namespace Oobs {
 		PLIP,
 		PPP
 	}
-	[CCode (cprefix = "OOBS_MODEM_VOLUME_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_MODEM_VOLUME_")]
 	public enum ModemVolume {
 		SILENT,
 		LOW,
 		MEDIUM,
 		LOUD
 	}
-	[CCode (cprefix = "OOBS_RESULT_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_RESULT_")]
 	public enum Result {
 		OK,
 		ACCESS_DENIED,
@@ -522,20 +522,20 @@ namespace Oobs {
 		MALFORMED_DATA,
 		ERROR
 	}
-	[CCode (cprefix = "OOBS_RUNLEVEL_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_RUNLEVEL_")]
 	public enum RunlevelRole {
 		HALT,
 		REBOOT,
 		MONOUSER,
 		MULTIUSER
 	}
-	[CCode (cprefix = "OOBS_SERVICE_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_SERVICE_")]
 	public enum ServiceStatus {
 		START,
 		STOP,
 		IGNORE
 	}
-	[CCode (cprefix = "OOBS_SHARE_SMB_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_SHARE_SMB_")]
 	[Flags]
 	public enum ShareSMBFlags {
 		ENABLED,
@@ -543,7 +543,7 @@ namespace Oobs {
 		PUBLIC,
 		WRITABLE
 	}
-	[CCode (cprefix = "OOBS_USER_", cheader_filename = "oobs/oobs.h")]
+	[CCode (cheader_filename = "oobs/oobs.h", cprefix = "OOBS_USER_")]
 	[Flags]
 	public enum UserHomeFlags {
 		REMOVE_HOME,
diff --git a/vapi/libpeas-1.0.vapi b/vapi/libpeas-1.0.vapi
index 4a75f6f..2b09f2a 100644
--- a/vapi/libpeas-1.0.vapi
+++ b/vapi/libpeas-1.0.vapi
@@ -1,14 +1,14 @@
 /* libpeas-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Peas", lower_case_cprefix = "peas_", gir_namespace = "Peas", gir_version = "1.0")]
+[CCode (cprefix = "Peas", gir_namespace = "Peas", gir_version = "1.0", lower_case_cprefix = "peas_")]
 namespace Peas {
-	[CCode (type_id = "peas_engine_get_type ()", cheader_filename = "libpeas/peas.h")]
+	[CCode (cheader_filename = "libpeas/peas.h", type_id = "peas_engine_get_type ()")]
 	public class Engine : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Engine ();
 		public void add_search_path (string module_dir, string? data_dir);
 		public Peas.Extension create_extension (Peas.PluginInfo info, GLib.Type extension_type, ...);
-		public Peas.Extension create_extensionv (Peas.PluginInfo info, GLib.Type extension_type, [CCode (array_length_type = "guint", array_length_cname = "n_parameters", array_length_pos = 2.5)] GLib.Parameter[]? parameters);
+		public Peas.Extension create_extensionv (Peas.PluginInfo info, GLib.Type extension_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 2.5, array_length_type = "guint")] GLib.Parameter[]? parameters);
 		public void enable_loader (string loader_id);
 		public void garbage_collect ();
 		public static unowned Peas.Engine get_default ();
@@ -27,14 +27,14 @@ namespace Peas {
 		[HasEmitter]
 		public virtual signal void unload_plugin (Peas.PluginInfo info);
 	}
-	[CCode (type_id = "peas_extension_get_type ()", cheader_filename = "libpeas/peas.h")]
-	public abstract class Extension : GLib.Object {
+	[CCode (cheader_filename = "libpeas/peas.h")]
+	public class Extension : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Extension ();
-		public GLib.Type get_extension_type ();
-		public GLib.Type extension_type { get; construct; }
+		public static GLib.Type get_extension_type (Peas.Extension exten);
+		public static GLib.Type get_type ();
 	}
-	[CCode (type_id = "peas_extension_base_get_type ()", cheader_filename = "libpeas/peas.h")]
+	[CCode (cheader_filename = "libpeas/peas.h", type_id = "peas_extension_base_get_type ()")]
 	public abstract class ExtensionBase : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected ExtensionBase ();
@@ -43,22 +43,22 @@ namespace Peas {
 		public string data_dir { owned get; }
 		public Peas.PluginInfo plugin_info { get; construct; }
 	}
-	[CCode (type_id = "peas_extension_set_get_type ()", cheader_filename = "libpeas/peas.h")]
+	[CCode (cheader_filename = "libpeas/peas.h", type_id = "peas_extension_set_get_type ()")]
 	public class ExtensionSet : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected ExtensionSet ();
 		public void @foreach (Peas.ExtensionSetForeachFunc func);
 		public unowned Peas.Extension get_extension (Peas.PluginInfo info);
-		public static Peas.ExtensionSet newv (Peas.Engine? engine, GLib.Type exten_type, [CCode (array_length_type = "guint", array_length_cname = "n_parameters", array_length_pos = 2.5)] GLib.Parameter[] parameters);
+		public static Peas.ExtensionSet newv (Peas.Engine? engine, GLib.Type exten_type, [CCode (array_length_cname = "n_parameters", array_length_pos = 2.5, array_length_type = "guint")] GLib.Parameter[] parameters);
 		public void* construct_properties { construct; }
 		[NoAccessorMethod]
 		public Peas.Engine engine { owned get; construct; }
 		[NoAccessorMethod]
 		public GLib.Type extension_type { get; construct; }
-		public virtual signal void extension_added (Peas.PluginInfo info, Peas.Extension exten);
-		public virtual signal void extension_removed (Peas.PluginInfo info, Peas.Extension exten);
+		public virtual signal void extension_added (Peas.PluginInfo info, GLib.Object exten);
+		public virtual signal void extension_removed (Peas.PluginInfo info, GLib.Object exten);
 	}
-	[CCode (type_id = "peas_object_module_get_type ()", cheader_filename = "libpeas/peas.h")]
+	[CCode (cheader_filename = "libpeas/peas.h", type_id = "peas_object_module_get_type ()")]
 	public class ObjectModule : GLib.TypeModule, GLib.TypePlugin {
 		[CCode (has_construct_function = false)]
 		protected ObjectModule ();
@@ -71,8 +71,8 @@ namespace Peas {
 		[NoAccessorMethod]
 		public bool resident { get; construct; }
 	}
+	[CCode (cheader_filename = "libpeas/peas.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "peas_plugin_info_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "peas_plugin_info_get_type ()", cheader_filename = "libpeas/peas.h")]
 	public class PluginInfo {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public unowned string[] get_authors ();
@@ -102,7 +102,7 @@ namespace Peas {
 		[NoAccessorMethod]
 		public GLib.Object object { owned get; construct; }
 	}
-	[CCode (cprefix = "PEAS_PLUGIN_INFO_ERROR_", cheader_filename = "libpeas/peas.h")]
+	[CCode (cheader_filename = "libpeas/peas.h", cprefix = "PEAS_PLUGIN_INFO_ERROR_")]
 	public errordomain PluginInfoError {
 		LOADING_FAILED,
 		LOADER_NOT_FOUND,
@@ -113,5 +113,5 @@ namespace Peas {
 	[CCode (cheader_filename = "libpeas/peas.h", has_target = false)]
 	public delegate void ExtensionSetForeachFunc (Peas.ExtensionSet @set, Peas.PluginInfo info, Peas.Extension exten, void* data);
 	[CCode (cheader_filename = "libpeas/peas.h", instance_pos = 1.9)]
-	public delegate GLib.Object FactoryFunc ([CCode (array_length_type = "guint", array_length_cname = "n_parameters", array_length_pos = 0.5)] GLib.Parameter[] parameters);
+	public delegate GLib.Object FactoryFunc ([CCode (array_length_cname = "n_parameters", array_length_pos = 0.5, array_length_type = "guint")] GLib.Parameter[] parameters);
 }
diff --git a/vapi/librsvg-2.0.vapi b/vapi/librsvg-2.0.vapi
index 0c436ca..e55abca 100644
--- a/vapi/librsvg-2.0.vapi
+++ b/vapi/librsvg-2.0.vapi
@@ -48,19 +48,19 @@ namespace Rsvg {
 		[NoAccessorMethod]
 		public int width { get; }
 	}
-	[CCode (has_type_id = false, cheader_filename = "librsvg/rsvg.h")]
+	[CCode (cheader_filename = "librsvg/rsvg.h", has_type_id = false)]
 	public struct DimensionData {
 		public int width;
 		public int height;
 		public double em;
 		public double ex;
 	}
-	[CCode (has_type_id = false, cheader_filename = "librsvg/rsvg.h")]
+	[CCode (cheader_filename = "librsvg/rsvg.h", has_type_id = false)]
 	public struct PositionData {
 		public int x;
 		public int y;
 	}
-	[CCode (cprefix = "RSVG_ERROR_", cheader_filename = "librsvg/rsvg.h")]
+	[CCode (cheader_filename = "librsvg/rsvg.h", cprefix = "RSVG_ERROR_")]
 	public enum Error {
 		FAILED
 	}
@@ -84,9 +84,9 @@ namespace Rsvg {
 	public static GLib.Quark error_quark ();
 	[CCode (cheader_filename = "librsvg/rsvg.h")]
 	public static void init ();
-	[CCode (cname = "librsvg_postinit", cheader_filename = "librsvg/rsvg.h")]
+	[CCode (cheader_filename = "librsvg/rsvg.h", cname = "librsvg_postinit")]
 	public static void librsvg_postinit (void* app, void* modinfo);
-	[CCode (cname = "librsvg_preinit", cheader_filename = "librsvg/rsvg.h")]
+	[CCode (cheader_filename = "librsvg/rsvg.h", cname = "librsvg_preinit")]
 	public static void librsvg_preinit (void* app, void* modinfo);
 	[CCode (cheader_filename = "librsvg/rsvg.h")]
 	public static unowned Gdk.Pixbuf pixbuf_from_file (string file_name) throws GLib.Error;
diff --git a/vapi/libsexy.vapi b/vapi/libsexy.vapi
index 83a1ec2..cdc1937 100644
--- a/vapi/libsexy.vapi
+++ b/vapi/libsexy.vapi
@@ -4,7 +4,7 @@
 namespace Sexy {
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class IconEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public IconEntry ();
 		public void add_clear_button ();
 		public unowned Gtk.Image get_icon (Sexy.IconEntryPosition position);
@@ -16,7 +16,7 @@ namespace Sexy {
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class SpellEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public SpellEntry ();
 		public void activate_default_languages ();
 		public bool activate_language (string lang) throws GLib.Error;
@@ -32,33 +32,33 @@ namespace Sexy {
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class Tooltip : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Tooltip ();
 		public void position_to_rect (Gdk.Rectangle rect, Gdk.Screen screen);
 		public void position_to_widget (Gtk.Widget widget);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Tooltip.with_label (string text);
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class TreeView : Gtk.TreeView, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public TreeView ();
 		public void set_tooltip_label_column (uint column);
 		public virtual signal unowned Gtk.Widget get_tooltip (Gtk.TreePath path, Gtk.TreeViewColumn column);
 	}
 	[CCode (cheader_filename = "libsexy/sexy.h")]
 	public class UrlLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public UrlLabel ();
 		public void set_markup (string markup);
 		public virtual signal void url_activated (string url);
 	}
-	[CCode (cprefix = "SEXY_ICON_ENTRY_", cheader_filename = "libsexy/sexy.h")]
+	[CCode (cheader_filename = "libsexy/sexy.h", cprefix = "SEXY_ICON_ENTRY_")]
 	public enum IconEntryPosition {
 		PRIMARY,
 		SECONDARY
 	}
-	[CCode (cprefix = "SEXY_SPELL_ERROR_", cheader_filename = "libsexy/sexy.h")]
+	[CCode (cheader_filename = "libsexy/sexy.h", cprefix = "SEXY_SPELL_ERROR_")]
 	public enum SpellError {
 		BACKEND
 	}
diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi
index fce8f34..b2212c8 100644
--- a/vapi/libsoup-2.2.vapi
+++ b/vapi/libsoup-2.2.vapi
@@ -114,8 +114,8 @@ namespace Soup {
 		[HasEmitter]
 		public virtual signal void wrote_informational ();
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", free_function = "soup_message_queue_destroy")]
 	[Compact]
-	[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
 	public class MessageQueue {
 		[CCode (has_construct_function = false)]
 		public MessageQueue ();
@@ -126,14 +126,14 @@ namespace Soup {
 		public unowned Soup.Message remove (Soup.MessageQueueIter iter);
 		public void remove_message (Soup.Message msg);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class MessageQueueIter {
 		public weak GLib.List cur;
 		public weak GLib.List next;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class Protocol {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -160,8 +160,8 @@ namespace Soup {
 		[NoAccessorMethod]
 		public string ssl_key_file { owned get; construct; }
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerAuth {
 		public weak Soup.ServerAuthBasic basic;
 		public weak Soup.ServerAuthDigest digest;
@@ -171,15 +171,15 @@ namespace Soup {
 		public bool check_passwd (string passwd);
 		public unowned string get_user ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerAuthBasic {
 		public weak string passwd;
 		public Soup.AuthType type;
 		public weak string user;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerAuthContext {
 		public void* basic_info;
 		public weak Soup.ServerAuthCallbackFn callback;
@@ -188,8 +188,8 @@ namespace Soup {
 		public void* user_data;
 		public void challenge (Soup.Message msg, string header_name);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerAuthDigest {
 		public Soup.DigestAlgorithm algorithm;
 		public weak string cnonce;
@@ -203,8 +203,8 @@ namespace Soup {
 		public Soup.AuthType type;
 		public weak string user;
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerContext {
 		public weak Soup.ServerAuth auth;
 		public weak Soup.ServerHandler handler;
@@ -216,8 +216,8 @@ namespace Soup {
 		public unowned Soup.Address get_client_address ();
 		public unowned string get_client_host ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class ServerHandler {
 		public weak Soup.ServerAuthContext auth_ctx;
 		public weak Soup.ServerCallbackFn callback;
@@ -270,20 +270,20 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionAsync : Soup.Session, Soup.MessageFilter {
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionAsync ();
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionAsync.with_options (string optname1);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class SessionSync : Soup.Session, Soup.MessageFilter {
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionSync ();
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionSync.with_options (string optname1);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class SoapParameter {
 		public unowned Soup.SoapParameter get_first_child ();
 		public unowned Soup.SoapParameter get_first_child_by_name (string name);
@@ -334,8 +334,8 @@ namespace Soup {
 		public virtual signal void readable ();
 		public virtual signal void writable ();
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "soup_uri_copy")]
 	[Compact]
-	[CCode (copy_function = "soup_uri_copy", cheader_filename = "libsoup/soup.h")]
 	public class Uri {
 		public bool broken_encoding;
 		public weak string fragment;
@@ -358,8 +358,8 @@ namespace Soup {
 		[CCode (has_construct_function = false)]
 		public Uri.with_base (Soup.Uri @base, string uri_string);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class XmlrpcValue {
 		public bool array_get_iterator (out unowned Soup.XmlrpcValueArrayIterator iter);
 		public void dump ();
@@ -371,8 +371,8 @@ namespace Soup {
 		public bool get_string (out unowned string str);
 		public bool get_struct (GLib.HashTable table);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class XmlrpcValueArrayIterator {
 		public bool get_value (out unowned Soup.XmlrpcValue value);
 		public unowned Soup.XmlrpcValueArrayIterator next ();
@@ -382,40 +382,40 @@ namespace Soup {
 	public interface MessageFilter {
 		public abstract void setup_message (Soup.Message msg);
 	}
-	[CCode (type_id = "SOUP_TYPE_DATA_BUFFER", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_DATA_BUFFER")]
 	public struct DataBuffer {
 		public Soup.Ownership owner;
 		public string body;
 		public uint length;
 	}
-	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ADDRESS_FAMILY_", has_type_id = false)]
 	public enum AddressFamily {
 		IPV4,
 		IPV6
 	}
-	[CCode (cprefix = "SOUP_AUTH_TYPE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_AUTH_TYPE_", has_type_id = false)]
 	public enum AuthType {
 		BASIC,
 		DIGEST
 	}
-	[CCode (cprefix = "SOUP_ALGORITHM_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ALGORITHM_", has_type_id = false)]
 	public enum DigestAlgorithm {
 		MD5,
 		MD5_SESS
 	}
-	[CCode (cprefix = "SOUP_HANDLER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HANDLER_", has_type_id = false)]
 	public enum HandlerPhase {
 		POST_REQUEST,
 		PRE_BODY,
 		BODY_CHUNK,
 		POST_BODY
 	}
-	[CCode (cprefix = "SOUP_HTTP_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HTTP_", has_type_id = false)]
 	public enum HttpVersion {
 		@1_0,
 		@1_1
 	}
-	[CCode (cprefix = "SOUP_STATUS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_", has_type_id = false)]
 	public enum KnownStatusCode {
 		NONE,
 		CANCELLED,
@@ -479,13 +479,13 @@ namespace Soup {
 		INSUFFICIENT_STORAGE,
 		NOT_EXTENDED
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_", has_type_id = false)]
 	public enum MessageFlags {
 		NO_REDIRECT,
 		OVERWRITE_CHUNKS,
 		EXPECT_CONTINUE
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_STATUS_", has_type_id = false)]
 	public enum MessageStatus {
 		IDLE,
 		QUEUED,
@@ -493,7 +493,7 @@ namespace Soup {
 		RUNNING,
 		FINISHED
 	}
-	[CCode (cprefix = "SOUP_METHOD_ID_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_METHOD_ID_", has_type_id = false)]
 	public enum MethodId {
 		UNKNOWN,
 		POST,
@@ -513,20 +513,20 @@ namespace Soup {
 		LOCK,
 		UNLOCK
 	}
-	[CCode (cprefix = "SOUP_BUFFER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_BUFFER_", has_type_id = false)]
 	public enum Ownership {
 		SYSTEM_OWNED,
 		USER_OWNED,
 		STATIC
 	}
-	[CCode (cprefix = "SOUP_SOCKET_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SOCKET_", has_type_id = false)]
 	public enum SocketIOStatus {
 		OK,
 		WOULD_BLOCK,
 		EOF,
 		ERROR
 	}
-	[CCode (cprefix = "SOUP_STATUS_CLASS_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_CLASS_", has_type_id = false)]
 	public enum StatusClass {
 		TRANSPORT_ERROR,
 		INFORMATIONAL,
@@ -535,7 +535,7 @@ namespace Soup {
 		CLIENT_ERROR,
 		SERVER_ERROR
 	}
-	[CCode (cprefix = "SOUP_TRANSFER_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TRANSFER_", has_type_id = false)]
 	public enum TransferEncoding {
 		UNKNOWN,
 		CHUNKED,
@@ -544,7 +544,7 @@ namespace Soup {
 		NONE,
 		EOF
 	}
-	[CCode (cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = false, cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_VALUE_TYPE_", has_type_id = false)]
 	public enum XmlrpcValueType {
 		BAD,
 		INT,
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 010a711..db3f9bf 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -1,6 +1,6 @@
 /* libsoup-2.4.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Soup", lower_case_cprefix = "soup_", gir_namespace = "Soup", gir_version = "2.4")]
+[CCode (cprefix = "Soup", gir_namespace = "Soup", gir_version = "2.4", lower_case_cprefix = "soup_")]
 namespace Soup {
 	[CCode (cprefix = "SoupForm", lower_case_cprefix = "soup_form_")]
 	namespace Form {
@@ -27,12 +27,12 @@ namespace Soup {
 	}
 	[CCode (cprefix = "SoupXMLRPC", lower_case_cprefix = "soup_xmlrpc_")]
 	namespace XMLRPC {
-		[CCode (cprefix = "SOUP_XMLRPC_ERROR_", cheader_filename = "libsoup/soup.h")]
+		[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_ERROR_")]
 		public errordomain Error {
 			ARGUMENTS,
 			RETVAL
 		}
-		[CCode (cprefix = "SOUP_XMLRPC_FAULT_", cheader_filename = "libsoup/soup.h")]
+		[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_FAULT_")]
 		public errordomain Fault {
 			PARSE_ERROR_NOT_WELL_FORMED,
 			PARSE_ERROR_UNSUPPORTED_ENCODING,
@@ -45,11 +45,11 @@ namespace Soup {
 			SYSTEM_ERROR,
 			TRANSPORT_ERROR
 		}
-		[PrintfFormat]
 		[CCode (cheader_filename = "libsoup/soup.h")]
+		[PrintfFormat]
 		public static string build_fault (int fault_code, string fault_format, ...);
 		[CCode (cheader_filename = "libsoup/soup.h")]
-		public static string build_method_call (string method_name, [CCode (type = "GValue*", array_length_cname = "n_params", array_length_pos = 2.1)] GLib.Value[] @params);
+		public static string build_method_call (string method_name, [CCode (array_length_cname = "n_params", array_length_pos = 2.1, type = "GValue*")] GLib.Value[] @params);
 		[CCode (cheader_filename = "libsoup/soup.h")]
 		public static string build_method_response (GLib.Value value);
 		[CCode (cheader_filename = "libsoup/soup.h")]
@@ -66,13 +66,13 @@ namespace Soup {
 		public static bool parse_method_response (string method_response, int length, out GLib.Value value) throws Soup.XMLRPC.Fault;
 		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
 		public static Soup.Message request_new (string uri, string method_name, ...);
-		[PrintfFormat]
 		[CCode (cheader_filename = "libsoup/soup.h")]
+		[PrintfFormat]
 		public static void set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
 		[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
 		public static void set_response (Soup.Message msg, ...);
 	}
-	[CCode (type_id = "soup_address_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_address_get_type ()")]
 	public class Address : GLib.Object, GLib.SocketConnectable {
 		[CCode (has_construct_function = false)]
 		public Address (string name, uint port);
@@ -100,7 +100,7 @@ namespace Soup {
 		[NoAccessorMethod]
 		public void* sockaddr { get; construct; }
 	}
-	[CCode (type_id = "soup_auth_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_get_type ()")]
 	public abstract class Auth : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
@@ -121,7 +121,7 @@ namespace Soup {
 		public string scheme_name { get; }
 		public signal void save_password (string object, string p0);
 	}
-	[CCode (type_id = "soup_auth_domain_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_get_type ()")]
 	public abstract class AuthDomain : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected AuthDomain ();
@@ -148,9 +148,9 @@ namespace Soup {
 		public bool proxy { get; construct; }
 		public string realm { get; construct; }
 	}
-	[CCode (type_id = "soup_auth_domain_basic_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_basic_get_type ()")]
 	public class AuthDomainBasic : Soup.AuthDomain {
-		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
 		public AuthDomainBasic (string optname1, ...);
 		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback);
 		[NoAccessorMethod]
@@ -158,9 +158,9 @@ namespace Soup {
 		[NoAccessorMethod]
 		public void* auth_data { get; set; }
 	}
-	[CCode (type_id = "soup_auth_domain_digest_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_auth_domain_digest_get_type ()")]
 	public class AuthDomainDigest : Soup.AuthDomain {
-		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
 		public AuthDomainDigest (string optname1, ...);
 		public static string encode_password (string username, string realm, string password);
 		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback);
@@ -169,31 +169,31 @@ namespace Soup {
 		[NoAccessorMethod]
 		public void* auth_data { get; set; }
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_buffer_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_buffer_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class Buffer {
 		[CCode (array_length_cname = "length", array_length_type = "gsize")]
 		public uint8[] data;
 		public size_t length;
 		[CCode (has_construct_function = false)]
-		public Buffer (Soup.MemoryUse use, [CCode (type = "gconstpointer", array_length_type = "gsize", array_length_cname = "length", array_length_pos = 2.1)] uint8[] data);
+		public Buffer (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize", type = "gconstpointer")] uint8[] data);
 		public Soup.Buffer copy ();
 		public void free ();
-		public void get_data ([CCode (array_length_type = "gsize", array_length_cname = "length")] out unowned uint8[] data);
+		public void get_data ([CCode (array_length_cname = "length", array_length_type = "gsize")] out unowned uint8[] data);
 		public void* get_owner ();
 		[CCode (has_construct_function = false)]
 		public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length);
 		[CCode (has_construct_function = false)]
-		public Buffer.take ([CCode (array_length_type = "gsize", array_length_cname = "length")] owned uint8[] data);
+		public Buffer.take ([CCode (array_length_cname = "length", array_length_type = "gsize")] owned uint8[] data);
 		[CCode (has_construct_function = false)]
-		public Buffer.with_owner ([CCode (type = "gconstpointer", array_length_type = "gsize", array_length_cname = "length", array_length_pos = 1.5)] uint8[] data, void* owner, GLib.DestroyNotify? owner_dnotify);
+		public Buffer.with_owner ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] data, void* owner, GLib.DestroyNotify? owner_dnotify);
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_byte_array_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_byte_array_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class ByteArray {
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_client_context_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_client_context_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class ClientContext {
 		public unowned Soup.Address get_address ();
 		public unowned Soup.AuthDomain get_auth_domain ();
@@ -201,16 +201,16 @@ namespace Soup {
 		public unowned string get_host ();
 		public unowned Soup.Socket get_socket ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class Connection {
 	}
-	[CCode (type_id = "soup_content_decoder_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_content_decoder_get_type ()")]
 	public class ContentDecoder : GLib.Object, Soup.SessionFeature {
 		[CCode (has_construct_function = false)]
 		protected ContentDecoder ();
 	}
-	[CCode (type_id = "soup_content_sniffer_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_content_sniffer_get_type ()")]
 	public class ContentSniffer : GLib.Object, Soup.SessionFeature {
 		[CCode (has_construct_function = false)]
 		public ContentSniffer ();
@@ -218,8 +218,8 @@ namespace Soup {
 		public virtual size_t get_buffer_size ();
 		public virtual string sniff (Soup.Message msg, Soup.Buffer buffer, out GLib.HashTable<string,string>? @params);
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_cookie_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_cookie_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class Cookie {
 		public weak string domain;
 		public weak Soup.Date expires;
@@ -254,7 +254,7 @@ namespace Soup {
 		public string to_cookie_header ();
 		public string to_set_cookie_header ();
 	}
-	[CCode (type_id = "soup_cookie_jar_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_cookie_jar_get_type ()")]
 	public class CookieJar : GLib.Object, Soup.SessionFeature {
 		[CCode (has_construct_function = false)]
 		public CookieJar ();
@@ -272,15 +272,15 @@ namespace Soup {
 		public bool read_only { get; construct; }
 		public virtual signal void changed (Soup.Cookie old_cookie, Soup.Cookie new_cookie);
 	}
-	[CCode (type_id = "soup_cookie_jar_text_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_cookie_jar_text_get_type ()")]
 	public class CookieJarText : Soup.CookieJar, Soup.SessionFeature {
-		[CCode (type = "SoupCookieJar*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupCookieJar*")]
 		public CookieJarText (string filename, bool read_only);
 		[NoAccessorMethod]
 		public string filename { owned get; construct; }
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_date_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_date_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class Date {
 		public int day;
 		public int hour;
@@ -313,7 +313,7 @@ namespace Soup {
 		public time_t to_time_t ();
 		public GLib.TimeVal to_timeval ();
 	}
-	[CCode (type_id = "soup_logger_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_logger_get_type ()")]
 	public class Logger : GLib.Object, Soup.SessionFeature {
 		[CCode (has_construct_function = false)]
 		public Logger (Soup.LoggerLogLevel level, int max_body_size);
@@ -321,7 +321,7 @@ namespace Soup {
 		public void set_request_filter (owned Soup.LoggerFilter request_filter);
 		public void set_response_filter (owned Soup.LoggerFilter response_filter);
 	}
-	[CCode (type_id = "soup_message_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_message_get_type ()")]
 	public class Message : GLib.Object {
 		public weak Soup.MessageBody request_body;
 		public weak Soup.MessageHeaders request_headers;
@@ -344,8 +344,8 @@ namespace Soup {
 		public void set_first_party (Soup.URI first_party);
 		public void set_flags (Soup.MessageFlags flags);
 		public void set_http_version (Soup.HTTPVersion version);
-		public void set_request (string content_type, Soup.MemoryUse req_use, [CCode (type = "char*", array_length_type = "gsize", array_length_cname = "req_length", array_length_pos = 3.1)] uint8[] req_body);
-		public void set_response (string? content_type, Soup.MemoryUse resp_use, [CCode (array_length_type = "gsize", array_length_cname = "resp_length", array_length_pos = 3.1)] uint8[] resp_body);
+		public void set_request (string content_type, Soup.MemoryUse req_use, [CCode (array_length_cname = "req_length", array_length_pos = 3.1, array_length_type = "gsize", type = "char*")] uint8[] req_body);
+		public void set_response (string? content_type, Soup.MemoryUse resp_use, [CCode (array_length_cname = "resp_length", array_length_pos = 3.1, array_length_type = "gsize")] uint8[] resp_body);
 		public void set_status (uint status_code);
 		public void set_status_full (uint status_code, string reason_phrase);
 		public void set_uri (Soup.URI uri);
@@ -386,17 +386,17 @@ namespace Soup {
 		[HasEmitter]
 		public virtual signal void wrote_informational ();
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_body_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_body_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class MessageBody {
 		[CCode (array_length_cname = "length", array_length_type = "gint64")]
 		public uint8[] data;
 		public int64 length;
 		[CCode (has_construct_function = false)]
 		public MessageBody ();
-		public void append (Soup.MemoryUse use, [CCode (array_length_type = "gsize", array_length_cname = "length", array_length_pos = 2.1)] uint8[] data);
+		public void append (Soup.MemoryUse use, [CCode (array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] data);
 		public void append_buffer (Soup.Buffer buffer);
-		public void append_take ([CCode (array_length_type = "gsize", array_length_cname = "length")] owned uint8[] data);
+		public void append_take ([CCode (array_length_cname = "length", array_length_type = "gsize")] owned uint8[] data);
 		public void complete ();
 		public Soup.Buffer flatten ();
 		public void free ();
@@ -407,8 +407,8 @@ namespace Soup {
 		public void truncate ();
 		public void wrote_chunk (Soup.Buffer chunk);
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_headers_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_message_headers_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class MessageHeaders {
 		[CCode (has_construct_function = false)]
 		public MessageHeaders (Soup.MessageHeadersType type);
@@ -438,16 +438,16 @@ namespace Soup {
 		public void set_range (int64 start, int64 end);
 		public void set_ranges (Soup.Range ranges, int length);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class MessageQueue {
 	}
-	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Compact]
 	public class MessageQueueItem {
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_multipart_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_multipart_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class Multipart {
 		[CCode (has_construct_function = false)]
 		public Multipart (string mime_type);
@@ -461,7 +461,7 @@ namespace Soup {
 		public bool get_part (int part, out unowned Soup.MessageHeaders headers, out unowned Soup.Buffer body);
 		public void to_message (Soup.MessageHeaders dest_headers, Soup.MessageBody dest_body);
 	}
-	[CCode (type_id = "soup_server_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_server_get_type ()")]
 	public class Server : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Server (string optname1, ...);
@@ -495,7 +495,7 @@ namespace Soup {
 		public virtual signal void request_read (Soup.Message msg, Soup.ClientContext client);
 		public virtual signal void request_started (Soup.Message msg, Soup.ClientContext client);
 	}
-	[CCode (type_id = "soup_session_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_get_type ()")]
 	public abstract class Session : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Session ();
@@ -550,21 +550,21 @@ namespace Soup {
 		public signal void request_unqueued (Soup.Message object);
 		public signal void tunneling (GLib.Object object);
 	}
-	[CCode (type_id = "soup_session_async_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_async_get_type ()")]
 	public class SessionAsync : Soup.Session {
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionAsync ();
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionAsync.with_options (string optname1, ...);
 	}
-	[CCode (type_id = "soup_session_sync_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_session_sync_get_type ()")]
 	public class SessionSync : Soup.Session {
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionSync ();
-		[CCode (type = "SoupSession*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "SoupSession*")]
 		public SessionSync.with_options (string optname1, ...);
 	}
-	[CCode (type_id = "soup_socket_get_type ()", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "soup_socket_get_type ()")]
 	public class Socket : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Socket (string optname1, ...);
@@ -577,11 +577,11 @@ namespace Soup {
 		public bool is_connected ();
 		public bool is_ssl ();
 		public bool listen ();
-		public Soup.SocketIOStatus read ([CCode (type = "gpointer", array_length_type = "gsize", array_length_cname = "len", array_length_pos = 1.5)] uint8[] buffer, out size_t nread, GLib.Cancellable? cancellable) throws GLib.Error;
-		public Soup.SocketIOStatus read_until ([CCode (type = "gpointer", array_length_type = "gsize", array_length_cname = "len", array_length_pos = 1.5)] uint8[] buffer, void* boundary, size_t boundary_len, out size_t nread, bool got_boundary, GLib.Cancellable? cancellable) throws GLib.Error;
+		public Soup.SocketIOStatus read ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gpointer")] uint8[] buffer, out size_t nread, GLib.Cancellable? cancellable) throws GLib.Error;
+		public Soup.SocketIOStatus read_until ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gpointer")] uint8[] buffer, void* boundary, size_t boundary_len, out size_t nread, bool got_boundary, GLib.Cancellable? cancellable) throws GLib.Error;
 		public bool start_proxy_ssl (string ssl_host, GLib.Cancellable? cancellable);
 		public bool start_ssl (GLib.Cancellable? cancellable);
-		public Soup.SocketIOStatus write ([CCode (type = "gconstpointer", array_length_type = "gsize", array_length_cname = "len", array_length_pos = 1.5)] uint8[] buffer, out size_t nwrote, GLib.Cancellable? cancellable) throws GLib.Error;
+		public Soup.SocketIOStatus write ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gsize", type = "gconstpointer")] uint8[] buffer, out size_t nwrote, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoAccessorMethod]
 		public GLib.MainContext async_context { owned get; owned construct; }
 		public bool clean_dispose { construct; }
@@ -604,8 +604,8 @@ namespace Soup {
 		public virtual signal void readable ();
 		public virtual signal void writable ();
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_uri_get_type ()")]
 	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_uri_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class URI {
 		public weak string fragment;
 		public weak string host;
@@ -670,25 +670,25 @@ namespace Soup {
 		[NoWrapper]
 		public abstract void request_unqueued (Soup.Session session, Soup.Message msg);
 	}
-	[CCode (type_id = "SOUP_TYPE_MESSAGE_HEADERS_ITER", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_MESSAGE_HEADERS_ITER")]
 	public struct MessageHeadersIter {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public weak void*[] dummy;
 		public void init (Soup.MessageHeaders hdrs);
 		public bool next (out unowned string name, out unowned string value);
 	}
-	[CCode (type_id = "SOUP_TYPE_RANGE", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", type_id = "SOUP_TYPE_RANGE")]
 	public struct Range {
 		public int64 start;
 		public int64 end;
 	}
-	[CCode (cprefix = "SOUP_ADDRESS_FAMILY_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ADDRESS_FAMILY_")]
 	public enum AddressFamily {
 		INVALID,
 		IPV4,
 		IPV6
 	}
-	[CCode (cprefix = "SOUP_CONNECTION_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CONNECTION_")]
 	public enum ConnectionState {
 		NEW,
 		CONNECTING,
@@ -697,13 +697,13 @@ namespace Soup {
 		REMOTE_DISCONNECTED,
 		DISCONNECTED
 	}
-	[CCode (cprefix = "SOUP_COOKIE_JAR_ACCEPT_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_COOKIE_JAR_ACCEPT_")]
 	public enum CookieJarAcceptPolicy {
 		ALWAYS,
 		NEVER,
 		NO_THIRD_PARTY
 	}
-	[CCode (cprefix = "SOUP_DATE_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_DATE_")]
 	public enum DateFormat {
 		HTTP,
 		COOKIE,
@@ -713,7 +713,7 @@ namespace Soup {
 		ISO8601,
 		ISO8601_XMLRPC
 	}
-	[CCode (cprefix = "SOUP_ENCODING_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ENCODING_")]
 	public enum Encoding {
 		UNRECOGNIZED,
 		NONE,
@@ -722,18 +722,18 @@ namespace Soup {
 		CHUNKED,
 		BYTERANGES
 	}
-	[CCode (cprefix = "SOUP_EXPECTATION_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_EXPECTATION_")]
 	[Flags]
 	public enum Expectation {
 		UNRECOGNIZED,
 		CONTINUE
 	}
-	[CCode (cprefix = "SOUP_HTTP_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HTTP_")]
 	public enum HTTPVersion {
 		@1_0,
 		@1_1
 	}
-	[CCode (cprefix = "SOUP_STATUS_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_")]
 	public enum KnownStatusCode {
 		NONE,
 		CANCELLED,
@@ -798,21 +798,21 @@ namespace Soup {
 		INSUFFICIENT_STORAGE,
 		NOT_EXTENDED
 	}
-	[CCode (cprefix = "SOUP_LOGGER_LOG_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_LOGGER_LOG_")]
 	public enum LoggerLogLevel {
 		NONE,
 		MINIMAL,
 		HEADERS,
 		BODY
 	}
-	[CCode (cprefix = "SOUP_MEMORY_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MEMORY_")]
 	public enum MemoryUse {
 		STATIC,
 		TAKE,
 		COPY,
 		TEMPORARY
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_")]
 	[Flags]
 	public enum MessageFlags {
 		NO_REDIRECT,
@@ -820,20 +820,20 @@ namespace Soup {
 		CONTENT_DECODED,
 		CERTIFICATE_TRUSTED
 	}
-	[CCode (cprefix = "SOUP_MESSAGE_HEADERS_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_HEADERS_")]
 	public enum MessageHeadersType {
 		REQUEST,
 		RESPONSE,
 		MULTIPART
 	}
-	[CCode (cprefix = "SOUP_SOCKET_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SOCKET_")]
 	public enum SocketIOStatus {
 		OK,
 		WOULD_BLOCK,
 		EOF,
 		ERROR
 	}
-	[CCode (cprefix = "SOUP_SSL_ERROR_", cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SSL_ERROR_")]
 	public errordomain SSLError {
 		HANDSHAKE_NEEDS_READ,
 		HANDSHAKE_NEEDS_WRITE,
@@ -1113,35 +1113,35 @@ namespace Soup {
 	public static void cookies_to_request (GLib.SList<Soup.Cookie> cookies, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static void cookies_to_response (GLib.SList<Soup.Cookie> cookies, Soup.Message msg);
-	[Deprecated (since = "vala-0.12", replacement = "Form.decode")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.decode", since = "vala-0.12")]
 	public static GLib.HashTable<string,string> form_decode (string encoded_form);
-	[Deprecated (since = "vala-0.12", replacement = "Form.decode_multipart")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.decode_multipart", since = "vala-0.12")]
 	public static GLib.HashTable<string,string> form_decode_multipart (Soup.Message msg, string file_control_name, out string filename, out string content_type, out Soup.Buffer file);
-	[Deprecated (since = "vala-0.12", replacement = "Form.encode")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.encode", since = "vala-0.12")]
 	public static string form_encode (...);
-	[Deprecated (since = "vala-0.12", replacement = "Form.encode_datalist")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.encode_datalist", since = "vala-0.12")]
 	public static string form_encode_datalist (void* form_data_set);
-	[Deprecated (since = "vala-0.12", replacement = "Form.encode_hash")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.encode_hash", since = "vala-0.12")]
 	public static string form_encode_hash (GLib.HashTable<string,string> form_data_set);
-	[Deprecated (since = "vala-0.12")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (since = "vala-0.12")]
 	public static string form_encode_valist (string first_field, void* args);
-	[Deprecated (since = "vala-0.12", replacement = "Form.request_new")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.request_new", since = "vala-0.12")]
 	public static Soup.Message form_request_new (string method, string uri, ...);
-	[Deprecated (since = "vala-0.12", replacement = "Form.request_new_from_datalist")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.request_new_from_datalist", since = "vala-0.12")]
 	public static Soup.Message form_request_new_from_datalist (string method, string uri, void* form_data_set);
-	[Deprecated (since = "vala-0.12", replacement = "Form.request_new_from_hash")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.request_new_from_hash", since = "vala-0.12")]
 	public static Soup.Message form_request_new_from_hash (string method, string uri, GLib.HashTable<string,string> form_data_set);
-	[Deprecated (since = "vala-0.12", replacement = "Form.request_new_from_multipart")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "Form.request_new_from_multipart", since = "vala-0.12")]
 	public static Soup.Message form_request_new_from_multipart (string uri, Soup.Multipart multipart);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool header_contains (string header, string token);
@@ -1169,8 +1169,8 @@ namespace Soup {
 	public static bool headers_parse_status_line (string status_line, out Soup.HTTPVersion ver, out uint status_code, out string reason_phrase);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark http_error_quark ();
-	[Deprecated (since = "vala-0.14", replacement = "SSLError.quark")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "SSLError.quark", since = "vala-0.14")]
 	public static GLib.Quark ssl_error_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static unowned string status_get_phrase (uint status_code);
@@ -1210,42 +1210,42 @@ namespace Soup {
 	public static GLib.HashTable<string,GLib.Value> value_hash_new ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.HashTable<string,GLib.Value> value_hash_new_with_vals (...);
-	[PrintfFormat]
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.build_fault")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.build_fault", since = "vala-0.12")]
+	[PrintfFormat]
 	public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.build_method_call")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.build_method_call", since = "vala-0.12")]
 	public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] @params);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.build_method_response")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.build_method_response", since = "vala-0.12")]
 	public static unowned string xmlrpc_build_method_response (GLib.Value value);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.error_quark")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.error_quark", since = "vala-0.12")]
 	public static GLib.Quark xmlrpc_error_quark ();
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.extract_method_call")]
 	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+	[Deprecated (replacement = "XMLRPC.extract_method_call", since = "vala-0.12")]
 	public static bool xmlrpc_extract_method_call (string method_call, int length, out unowned string method_name, ...);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.extract_method_response")]
 	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+	[Deprecated (replacement = "XMLRPC.extract_method_response", since = "vala-0.12")]
 	public static bool xmlrpc_extract_method_response (string method_response, int length, ...) throws GLib.Error;
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.fault_quark")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.fault_quark", since = "vala-0.12")]
 	public static GLib.Quark xmlrpc_fault_quark ();
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.parse_method_call")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.parse_method_call", since = "vala-0.12")]
 	public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray @params);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.parse_method_response")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.parse_method_response", since = "vala-0.12")]
 	public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.request_new")]
 	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+	[Deprecated (replacement = "XMLRPC.request_new", since = "vala-0.12")]
 	public static unowned Soup.Message xmlrpc_request_new (string uri, string method_name, ...);
-	[PrintfFormat]
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.set_fault")]
 	[CCode (cheader_filename = "libsoup/soup.h")]
+	[Deprecated (replacement = "XMLRPC.set_fault", since = "vala-0.12")]
+	[PrintfFormat]
 	public static void xmlrpc_set_fault (Soup.Message msg, int fault_code, string fault_format, ...);
-	[Deprecated (since = "vala-0.12", replacement = "XMLRPC.set_response")]
 	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
+	[Deprecated (replacement = "XMLRPC.set_response", since = "vala-0.12")]
 	public static void xmlrpc_set_response (Soup.Message msg, ...);
 }
diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi
index c8e8905..313b29e 100644
--- a/vapi/libwnck-1.0.vapi
+++ b/vapi/libwnck-1.0.vapi
@@ -4,7 +4,7 @@
 namespace Wnck {
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class ActionMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public ActionMenu (Wnck.Window window);
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -66,7 +66,7 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Pager : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Pager (Wnck.Screen screen);
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -83,8 +83,8 @@ namespace Wnck {
 		public void set_shadow_type (Gtk.ShadowType shadow_type);
 		public void set_show_all (bool show_all_workspaces);
 	}
-	[Compact]
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
+	[Compact]
 	public class ResourceUsage {
 		public uint n_colormap_entries;
 		public uint n_cursors;
@@ -168,7 +168,7 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Selector : Gtk.MenuBar, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Selector ();
 		[NoWrapper]
 		public virtual void pad1 ();
@@ -181,7 +181,7 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Tasklist : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Tasklist (Wnck.Screen screen);
 		public int get_minimum_height ();
 		public int get_minimum_width ();
@@ -326,8 +326,8 @@ namespace Wnck {
 		public virtual void pad4 ();
 		public virtual signal void name_changed ();
 	}
-	[Compact]
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
+	[Compact]
 	public class WorkspaceLayout {
 		public int cols;
 		public int current_col;
@@ -336,30 +336,30 @@ namespace Wnck {
 		public int grid_area;
 		public int rows;
 	}
-	[CCode (cprefix = "WNCK_CLIENT_TYPE_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_CLIENT_TYPE_")]
 	public enum ClientType {
 		APPLICATION,
 		PAGER
 	}
-	[CCode (cprefix = "WNCK_MOTION_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_MOTION_")]
 	public enum MotionDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cprefix = "WNCK_PAGER_DISPLAY_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_PAGER_DISPLAY_")]
 	public enum PagerDisplayMode {
 		NAME,
 		CONTENT
 	}
-	[CCode (cprefix = "WNCK_TASKLIST_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_TASKLIST_")]
 	public enum TasklistGroupingType {
 		NEVER_GROUP,
 		AUTO_GROUP,
 		ALWAYS_GROUP
 	}
-	[CCode (cprefix = "WNCK_WINDOW_ACTION_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_ACTION_")]
 	[Flags]
 	public enum WindowActions {
 		MOVE,
@@ -382,7 +382,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_GRAVITY_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_GRAVITY_")]
 	public enum WindowGravity {
 		CURRENT,
 		NORTHWEST,
@@ -396,7 +396,7 @@ namespace Wnck {
 		SOUTHEAST,
 		STATIC
 	}
-	[CCode (cprefix = "WNCK_WINDOW_CHANGE_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_CHANGE_")]
 	[Flags]
 	public enum WindowMoveResizeMask {
 		X,
@@ -404,7 +404,7 @@ namespace Wnck {
 		WIDTH,
 		HEIGHT
 	}
-	[CCode (cprefix = "WNCK_WINDOW_STATE_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_STATE_")]
 	[Flags]
 	public enum WindowState {
 		MINIMIZED,
@@ -421,7 +421,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cprefix = "WNCK_WINDOW_", cheader_filename = "libwnck/libwnck.h")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_")]
 	public enum WindowType {
 		NORMAL,
 		DESKTOP,
diff --git a/vapi/loudmouth-1.0.vapi b/vapi/loudmouth-1.0.vapi
index 8b32640..bdbe068 100644
--- a/vapi/loudmouth-1.0.vapi
+++ b/vapi/loudmouth-1.0.vapi
@@ -2,8 +2,8 @@
 
 [CCode (cprefix = "Lm", lower_case_cprefix = "lm_")]
 namespace Lm {
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_connection_ref", unref_function = "lm_connection_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_connection_ref", unref_function = "lm_connection_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class Connection {
 		public const int DEFAULT_PORT;
 		public const int DEFAULT_PORT_SSL;
@@ -42,8 +42,8 @@ namespace Lm {
 		[CCode (has_construct_function = false)]
 		public Connection.with_context (string server, GLib.MainContext context);
 	}
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_message_ref", unref_function = "lm_message_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_message_ref", unref_function = "lm_message_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class Message {
 		public Lm.MessageNode node;
 		[CCode (has_construct_function = false)]
@@ -54,16 +54,16 @@ namespace Lm {
 		[CCode (has_construct_function = false)]
 		public Message.with_sub_type (string? to, Lm.MessageType type, Lm.MessageSubType sub_type);
 	}
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_message_handler_ref", unref_function = "lm_message_handler_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_message_handler_ref", unref_function = "lm_message_handler_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class MessageHandler {
 		[CCode (has_construct_function = false)]
 		public MessageHandler (Lm.HandleMessageFunction function, GLib.DestroyNotify? notify);
 		public void invalidate ();
 		public bool is_valid ();
 	}
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_message_node_ref", unref_function = "lm_message_node_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_message_node_ref", unref_function = "lm_message_node_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class MessageNode {
 		public Lm.MessageNode children;
 		public string name;
@@ -84,8 +84,8 @@ namespace Lm {
 		public void set_value (string value);
 		public string to_string ();
 	}
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_proxy_ref", unref_function = "lm_proxy_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_proxy_ref", unref_function = "lm_proxy_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class Proxy {
 		[CCode (has_construct_function = false)]
 		public Proxy (Lm.ProxyType type);
@@ -101,8 +101,8 @@ namespace Lm {
 		[CCode (has_construct_function = false)]
 		public Proxy.with_server (Lm.ProxyType type, string server, uint port);
 	}
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", ref_function = "lm_ssl_ref", unref_function = "lm_ssl_unref")]
 	[Compact]
-	[CCode (ref_function = "lm_ssl_ref", unref_function = "lm_ssl_unref", cheader_filename = "loudmouth/loudmouth.h")]
 	public class SSL {
 		[CCode (has_construct_function = false)]
 		public SSL (string expected_fingerprint, Lm.SSLFunction ssl_function, GLib.DestroyNotify? notify);
@@ -112,13 +112,13 @@ namespace Lm {
 		public static bool is_supported ();
 		public void use_starttls (bool use_starttls, bool require);
 	}
-	[CCode (cprefix = "LM_CERT_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_CERT_", has_type_id = false)]
 	public enum CertificateStatus {
 		INVALID,
 		ISSUER_NOT_FOUND,
 		REVOKED
 	}
-	[CCode (cprefix = "LM_CONNECTION_STATE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_CONNECTION_STATE_", has_type_id = false)]
 	public enum ConnectionState {
 		CLOSED,
 		OPENING,
@@ -126,7 +126,7 @@ namespace Lm {
 		AUTHENTICATING,
 		AUTHENTICATED
 	}
-	[CCode (cprefix = "LM_DISCONNECT_REASON_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_DISCONNECT_REASON_", has_type_id = false)]
 	public enum DisconnectReason {
 		OK,
 		PING_TIME_OUT,
@@ -136,25 +136,25 @@ namespace Lm {
 		INVALID_XML,
 		UNKNOWN
 	}
-	[CCode (cprefix = "LM_ERROR_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_ERROR_", has_type_id = false)]
 	public enum Error {
 		CONNECTION_NOT_OPEN,
 		CONNECTION_OPEN,
 		AUTH_FAILED,
 		CONNECTION_FAILED
 	}
-	[CCode (cprefix = "LM_HANDLER_PRIORITY_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_HANDLER_PRIORITY_", has_type_id = false)]
 	public enum HandlerPriority {
 		LAST,
 		NORMAL,
 		FIRST
 	}
-	[CCode (cprefix = "LM_HANDLER_RESULT_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_HANDLER_RESULT_", has_type_id = false)]
 	public enum HandlerResult {
 		REMOVE_MESSAGE,
 		ALLOW_MORE_HANDLERS
 	}
-	[CCode (cprefix = "LM_MESSAGE_SUB_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_MESSAGE_SUB_TYPE_", has_type_id = false)]
 	public enum MessageSubType {
 		NOT_SET,
 		AVAILABLE,
@@ -173,7 +173,7 @@ namespace Lm {
 		RESULT,
 		ERROR
 	}
-	[CCode (cprefix = "LM_MESSAGE_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_MESSAGE_TYPE_", has_type_id = false)]
 	public enum MessageType {
 		MESSAGE,
 		PRESENCE,
@@ -190,17 +190,17 @@ namespace Lm {
 		STARTTLS,
 		UNKNOWN
 	}
-	[CCode (cprefix = "LM_PROXY_TYPE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_PROXY_TYPE_", has_type_id = false)]
 	public enum ProxyType {
 		NONE,
 		HTTP
 	}
-	[CCode (cprefix = "LM_SSL_RESPONSE_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_SSL_RESPONSE_", has_type_id = false)]
 	public enum SSLResponse {
 		CONTINUE,
 		STOP
 	}
-	[CCode (cprefix = "LM_SSL_STATUS_", has_type_id = false, cheader_filename = "loudmouth/loudmouth.h")]
+	[CCode (cheader_filename = "loudmouth/loudmouth.h", cprefix = "LM_SSL_STATUS_", has_type_id = false)]
 	public enum SSLStatus {
 		NO_CERT_FOUND,
 		UNTRUSTED_CERT,
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index 4468d4f..e1bfe5b 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -99,8 +99,8 @@ namespace Mx {
 		[NoAccessorMethod]
 		public bool y_fill { get; set; }
 	}
+	[CCode (cheader_filename = "mx/mx.h", type_id = "MX_TYPE_BORDER_IMAGE")]
 	[Compact]
-	[CCode (type_id = "MX_TYPE_BORDER_IMAGE", cheader_filename = "mx/mx.h")]
 	public class BorderImage {
 		public int bottom;
 		public int left;
@@ -111,7 +111,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class BoxLayout : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Scrollable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public BoxLayout ();
 		public void add_actor_with_properties (Clutter.Actor actor, int position, ...);
 		public bool get_enable_animations ();
@@ -146,7 +146,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Button : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Button ();
 		public bool get_is_toggle ();
 		public unowned string get_label ();
@@ -154,7 +154,7 @@ namespace Mx {
 		public void set_is_toggle (bool toggle);
 		public void set_label (string text);
 		public void set_toggled (bool toggled);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Button.with_label (string text);
 		public bool is_toggle { get; set; }
 		public string label { get; set; }
@@ -186,7 +186,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ComboBox : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ComboBox ();
 		public void append_text (string text);
 		public unowned string get_active_icon_name ();
@@ -205,7 +205,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class DeformBowTie : Mx.DeformTexture, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public DeformBowTie ();
 		public bool get_flip_back ();
 		public double get_period ();
@@ -216,7 +216,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class DeformPageTurn : Mx.DeformTexture, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public DeformPageTurn ();
 		public double get_angle ();
 		public double get_period ();
@@ -250,7 +250,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class DeformWaves : Mx.DeformTexture, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public DeformWaves ();
 		public double get_amplitude ();
 		public double get_angle ();
@@ -267,7 +267,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Entry : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Entry ();
 		public unowned Clutter.Actor get_clutter_text ();
 		public unowned string get_hint_text ();
@@ -278,7 +278,7 @@ namespace Mx {
 		public void set_primary_icon_from_file (string filename);
 		public void set_secondary_icon_from_file (string filename);
 		public void set_text (string text);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Entry.with_text (string text);
 		public Clutter.Text clutter_text { get; }
 		public string hint_text { get; set; }
@@ -289,7 +289,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Expander : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Expander ();
 		public bool get_expanded ();
 		public void set_expanded (bool expanded);
@@ -322,12 +322,12 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Frame : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Frame ();
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Grid : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Scrollable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Grid ();
 		public Mx.Align get_child_x_align ();
 		public Mx.Align get_child_y_align ();
@@ -359,7 +359,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Icon : Mx.Widget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Icon ();
 		public unowned string get_icon_name ();
 		public int get_icon_size ();
@@ -384,7 +384,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ItemView : Mx.Grid, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Scrollable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ItemView ();
 		public void add_attribute (string attribute, int column);
 		public void freeze ();
@@ -401,7 +401,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Label : Mx.Widget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label ();
 		public unowned Clutter.Actor get_clutter_text ();
 		public unowned string get_text ();
@@ -410,7 +410,7 @@ namespace Mx {
 		public void set_text (string text);
 		public void set_x_align (Mx.Align align);
 		public void set_y_align (Mx.Align align);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Label.with_text (string text);
 		public Clutter.Text clutter_text { get; }
 		public string text { get; set; }
@@ -419,7 +419,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ListView : Mx.BoxLayout, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Scrollable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ListView ();
 		public void add_attribute (string attribute, int column);
 		public void freeze ();
@@ -436,7 +436,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Menu : Mx.FloatingWidget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Menu ();
 		public void add_action (Mx.Action action);
 		public void remove_action (Mx.Action action);
@@ -446,7 +446,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Notebook : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Clutter.Container {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Notebook ();
 		public unowned Clutter.Actor get_current_page ();
 		public bool get_enable_gestures ();
@@ -457,7 +457,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Offscreen : Clutter.Texture, Clutter.Scriptable, Clutter.Container {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Offscreen ();
 		public bool get_auto_update ();
 		public unowned Clutter.Actor get_child ();
@@ -474,7 +474,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class PathBar : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public PathBar ();
 		public void clear ();
 		public bool get_clear_on_change ();
@@ -496,7 +496,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ProgressBar : Mx.Widget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ProgressBar ();
 		public double get_progress ();
 		public void set_progress (double progress);
@@ -504,13 +504,13 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ScrollBar : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ScrollBar ();
 		public unowned Mx.Adjustment get_adjustment ();
 		public Mx.Orientation get_orientation ();
 		public void set_adjustment (Mx.Adjustment adjustment);
 		public void set_orientation (Mx.Orientation orientation);
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ScrollBar.with_adjustment (Mx.Adjustment adjustment);
 		public Mx.Adjustment adjustment { get; set; }
 		public Mx.Orientation orientation { get; set; }
@@ -519,7 +519,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class ScrollView : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public ScrollView ();
 		public void ensure_visible (Clutter.Geometry geometry);
 		public bool get_enable_gestures ();
@@ -534,7 +534,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Slider : Mx.Widget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Slider ();
 		public double get_value ();
 		public void set_value (double value);
@@ -553,7 +553,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Table : Mx.Widget, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Table ();
 		public void add_actor_with_properties (Clutter.Actor actor, int row, int column, ...);
 		public int get_column_count ();
@@ -619,7 +619,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class TextureFrame : Clutter.Actor, Clutter.Scriptable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public TextureFrame (Clutter.Texture texture, float top, float right, float bottom, float left);
 		public void get_border_values (float top, float right, float bottom, float left);
 		public unowned Clutter.Texture get_parent_texture ();
@@ -637,7 +637,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Toggle : Mx.Widget, Clutter.Scriptable, Mx.Stylable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Toggle ();
 		public bool get_active ();
 		public void set_active (bool active);
@@ -645,7 +645,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Toolbar : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Toolbar ();
 		public bool get_has_close_button ();
 		public void set_has_close_button (bool has_close_button);
@@ -667,7 +667,7 @@ namespace Mx {
 	}
 	[CCode (cheader_filename = "mx/mx.h")]
 	public class Viewport : Mx.Bin, Clutter.Scriptable, Mx.Stylable, Clutter.Container, Mx.Focusable, Mx.Scrollable {
-		[CCode (type = "ClutterActor*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Viewport ();
 		public void get_origin (float x, float y, float z);
 		public bool get_sync_adjustments ();
@@ -797,32 +797,32 @@ namespace Mx {
 		[HasEmitter]
 		public signal void style_changed (Mx.StyleChangedFlags flags);
 	}
-	[CCode (type_id = "MX_TYPE_PADDING", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", type_id = "MX_TYPE_PADDING")]
 	public struct Padding {
 		public float top;
 		public float right;
 		public float bottom;
 		public float left;
 	}
-	[CCode (cprefix = "MX_ALIGN_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ALIGN_")]
 	public enum Align {
 		START,
 		MIDDLE,
 		END
 	}
-	[CCode (cprefix = "MX_APPLICATION_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_APPLICATION_")]
 	[Flags]
 	public enum ApplicationFlags {
 		SINGLE_INSTANCE,
 		KEEP_ALIVE
 	}
-	[CCode (cprefix = "MX_DRAG_AXIS_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_DRAG_AXIS_")]
 	public enum DragAxis {
 		NONE,
 		X,
 		Y
 	}
-	[CCode (cprefix = "MX_FOCUS_DIRECTION_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_DIRECTION_")]
 	public enum FocusDirection {
 		OUT,
 		UP,
@@ -832,44 +832,44 @@ namespace Mx {
 		NEXT,
 		PREVIOUS
 	}
-	[CCode (cprefix = "MX_FOCUS_HINT_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_HINT_")]
 	public enum FocusHint {
 		FIRST,
 		LAST,
 		PRIOR
 	}
-	[CCode (cprefix = "MX_FONT_WEIGHT_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FONT_WEIGHT_")]
 	public enum FontWeight {
 		NORMAL,
 		BOLD,
 		BOLDER,
 		LIGHTER
 	}
-	[CCode (cprefix = "MX_LONG_PRESS_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_LONG_PRESS_")]
 	public enum LongPressAction {
 		QUERY,
 		ACTION,
 		CANCEL
 	}
-	[CCode (cprefix = "MX_ORIENTATION_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ORIENTATION_")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cprefix = "MX_SCROLL_POLICY_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_SCROLL_POLICY_")]
 	public enum ScrollPolicy {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cprefix = "MX_STYLE_CHANGED_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_CHANGED_")]
 	[Flags]
 	public enum StyleChangedFlags {
 		NONE,
 		FORCE
 	}
-	[CCode (cprefix = "MX_STYLE_ERROR_INVALID_", cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_ERROR_INVALID_")]
 	public enum StyleError {
 		FILE
 	}
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 4941185..0d147ac 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -1,6 +1,6 @@
 /* pango.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Pango", lower_case_cprefix = "pango_", gir_namespace = "Pango", gir_version = "1.0")]
+[CCode (cprefix = "Pango", gir_namespace = "Pango", gir_version = "1.0", lower_case_cprefix = "pango_")]
 namespace Pango {
 	[CCode (cprefix = "PangoScale", lower_case_cprefix = "pango_scale_")]
 	namespace Scale {
@@ -19,38 +19,38 @@ namespace Pango {
 		[CCode (cheader_filename = "pango/pango.h")]
 		public const double X_SMALL;
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrClass {
 		public weak GLib.Callback copy;
 		public weak GLib.Callback destroy;
 		public weak GLib.Callback equal;
 		public Pango.AttrType type;
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrColor : Pango.Attribute {
 		public Pango.Color color;
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrFloat : Pango.Attribute {
 		public double value;
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrFontDesc : Pango.Attribute {
 		public weak Pango.FontDescription desc;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrFontDesc (Pango.FontDescription desc);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrInt : Pango.Attribute {
 		public int value;
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_attr_iterator_copy", free_function = "pango_attr_iterator_destroy")]
 	[Compact]
-	[CCode (copy_function = "pango_attr_iterator_copy", free_function = "pango_attr_iterator_destroy", cheader_filename = "pango/pango.h")]
 	public class AttrIterator {
 		public Pango.AttrIterator copy ();
 		public unowned Pango.Attribute @get (Pango.AttrType type);
@@ -59,15 +59,15 @@ namespace Pango {
 		public bool next ();
 		public void range (out int start, out int end);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrLanguage : Pango.Attribute {
 		public weak Pango.Language value;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrLanguage (Pango.Language language);
 	}
+	[CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", type_id = "PANGO_TYPE_ATTR_LIST", unref_function = "pango_attr_list_unref")]
 	[Compact]
-	[CCode (ref_function = "pango_attr_list_ref", unref_function = "pango_attr_list_unref", type_id = "PANGO_TYPE_ATTR_LIST", cheader_filename = "pango/pango.h")]
 	public class AttrList {
 		[CCode (has_construct_function = false)]
 		public AttrList ();
@@ -79,8 +79,8 @@ namespace Pango {
 		public void insert_before (owned Pango.Attribute attr);
 		public void splice (Pango.AttrList other, int pos, int len);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrShape<T> : Pango.Attribute {
 		public weak Pango.Attribute attr;
 		public weak Pango.AttrDataCopyFunc<T> copy_func;
@@ -88,26 +88,26 @@ namespace Pango {
 		public weak GLib.DestroyNotify destroy_func;
 		public Pango.Rectangle ink_rect;
 		public Pango.Rectangle logical_rect;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
-		[CCode (type = "PangoAttribute*", simple_generics = true, has_construct_function = false)]
+		[CCode (has_construct_function = false, simple_generics = true, type = "PangoAttribute*")]
 		public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, owned T data, Pango.AttrDataCopyFunc<T> copy_func);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrSize : Pango.Attribute {
 		public uint absolute;
 		public int size;
-		[CCode (type = "PangoAttribute*", has_construct_function = false)]
+		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrSize (int size);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class AttrString : Pango.Attribute {
 		public weak string value;
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_attribute_copy", free_function = "pango_attribute_destroy")]
 	[Compact]
-	[CCode (copy_function = "pango_attribute_copy", free_function = "pango_attribute_destroy", cheader_filename = "pango/pango.h")]
 	public class Attribute {
 		public uint end_index;
 		public weak Pango.AttrClass klass;
@@ -140,12 +140,12 @@ namespace Pango {
 		public void set_language (Pango.Language language);
 		public void set_matrix (Pango.Matrix matrix);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class ContextClass {
 	}
+	[CCode (cheader_filename = "pango/pango.h", ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref")]
 	[Compact]
-	[CCode (ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref", cheader_filename = "pango/pango.h")]
 	public class Coverage {
 		[CCode (has_construct_function = false)]
 		public Coverage ();
@@ -156,12 +156,12 @@ namespace Pango {
 		public void @set (int index_, Pango.CoverageLevel level);
 		public void to_bytes (out uchar[][] bytes);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class EngineLang {
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class EngineShape {
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
@@ -177,9 +177,9 @@ namespace Pango {
 		public void get_glyph_extents (Pango.Glyph glyph, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public Pango.FontMetrics get_metrics (Pango.Language? language);
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_font_description_copy", type_id = "PANGO_TYPE_FONT_DESCRIPTION")]
 	[Compact]
 	[Immutable]
-	[CCode (copy_function = "pango_font_description_copy", type_id = "PANGO_TYPE_FONT_DESCRIPTION", cheader_filename = "pango/pango.h")]
 	public class FontDescription {
 		[CCode (has_construct_function = false)]
 		public FontDescription ();
@@ -238,8 +238,8 @@ namespace Pango {
 		public unowned Pango.Font load_font (Pango.Context context, Pango.FontDescription desc);
 		public unowned Pango.Fontset load_fontset (Pango.Context context, Pango.FontDescription desc, Pango.Language language);
 	}
+	[CCode (cheader_filename = "pango/pango.h", ref_function = "pango_font_metrics_ref", type_id = "PANGO_TYPE_FONT_METRICS", unref_function = "pango_font_metrics_unref")]
 	[Compact]
-	[CCode (ref_function = "pango_font_metrics_ref", unref_function = "pango_font_metrics_unref", type_id = "PANGO_TYPE_FONT_METRICS", cheader_filename = "pango/pango.h")]
 	public class FontMetrics {
 		public int get_approximate_char_width ();
 		public int get_approximate_digit_width ();
@@ -258,8 +258,8 @@ namespace Pango {
 		public Pango.Font get_font (uint wc);
 		public Pango.FontMetrics get_metrics ();
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_item_copy", type_id = "PANGO_TYPE_GLYPH_ITEM")]
 	[Compact]
-	[CCode (copy_function = "pango_glyph_item_copy", type_id = "PANGO_TYPE_GLYPH_ITEM", cheader_filename = "pango/pango.h")]
 	public class GlyphItem {
 		public weak Pango.GlyphString glyphs;
 		public weak Pango.Item item;
@@ -269,8 +269,8 @@ namespace Pango {
 		public void letter_space (string text, Pango.LogAttr[] log_attrs, int letter_spacing);
 		public Pango.GlyphItem split (string text, int split_index);
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_glyph_string_copy", type_id = "PANGO_TYPE_GLYPH_STRING")]
 	[Compact]
-	[CCode (copy_function = "pango_glyph_string_copy", type_id = "PANGO_TYPE_GLYPH_STRING", cheader_filename = "pango/pango.h")]
 	public class GlyphString {
 		[CCode (array_length_cname = "num_glyphs")]
 		public Pango.GlyphInfo[] glyphs;
@@ -289,12 +289,12 @@ namespace Pango {
 		public void set_size (int new_len);
 		public void x_to_index (string text, int length, Pango.Analysis analysis, int x_pos, out int index_, out int trailing);
 	}
-	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
+	[Compact]
 	public class GlyphUnit {
 	}
+	[CCode (cheader_filename = "pango/pango.h", copy_function = "pango_item_copy", type_id = "PANGO_TYPE_ITEM")]
 	[Compact]
-	[CCode (copy_fu