vapigen: Fix signals in interfaces

36 files changed, 368 insertions, 367 deletions

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index f56101105..327cdb1d8 100644
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -761,7 +761,7 @@ public class Vala.Method : Member {
 			Report.error (source_reference, "Non-abstract, non-extern methods must have bodies");
 		}
 
-		if (coroutine && !analyzer.context.has_package ("gio-2.0")) {
+		if (coroutine && !external_package && !analyzer.context.has_package ("gio-2.0")) {
 			error = true;
 			Report.error (source_reference, "gio-2.0 package required for async methods");
 			return false;
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 1bf6ee9cc..de576c93e 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -159,11 +159,11 @@ namespace Atk {
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Relation : GLib.Object {
 		public Atk.RelationType relationship;
+		[CCode (has_construct_function = false)]
+		public Relation (Atk.Object[] targets, Atk.RelationType relationship);
 		public void add_target (Atk.Object target);
 		public Atk.RelationType get_relation_type ();
 		public unowned GLib.PtrArray get_target ();
-		[CCode (has_construct_function = false)]
-		public Relation (Atk.Object[] targets, Atk.RelationType relationship);
 		public bool remove_target (Atk.Object target);
 		public static Atk.RelationType type_for_name (string name);
 		public static unowned string type_get_name (Atk.RelationType type);
@@ -176,14 +176,14 @@ namespace Atk {
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class RelationSet : GLib.Object {
 		public weak GLib.PtrArray relations;
+		[CCode (has_construct_function = false)]
+		public RelationSet ();
 		public void add (Atk.Relation relation);
 		public void add_relation_by_type (Atk.RelationType relationship, Atk.Object target);
 		public bool contains (Atk.RelationType relationship);
 		public int get_n_relations ();
 		public unowned Atk.Relation get_relation (int i);
 		public unowned Atk.Relation get_relation_by_type (Atk.RelationType relationship);
-		[CCode (has_construct_function = false)]
-		public RelationSet ();
 		public void remove (Atk.Relation relation);
 	}
 	[Compact]
@@ -195,6 +195,8 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class StateSet : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public StateSet ();
 		public bool add_state (Atk.StateType type);
 		public void add_states (Atk.StateType[] types);
 		public unowned Atk.StateSet and_sets (Atk.StateSet compare_set);
@@ -202,8 +204,6 @@ namespace Atk {
 		public bool contains_state (Atk.StateType type);
 		public bool contains_states (Atk.StateType[] types);
 		public bool is_empty ();
-		[CCode (has_construct_function = false)]
-		public StateSet ();
 		public unowned Atk.StateSet or_sets (Atk.StateSet compare_set);
 		public bool remove_state (Atk.StateType type);
 		public unowned Atk.StateSet xor_sets (Atk.StateSet compare_set);
@@ -267,7 +267,7 @@ namespace Atk {
 		public abstract bool set_extents (int x, int y, int width, int height, Atk.CoordType coord_type);
 		public abstract bool set_position (int x, int y, Atk.CoordType coord_type);
 		public abstract bool set_size (int width, int height);
-		public virtual signal void bounds_changed (Atk.Rectangle bounds);
+		public signal void bounds_changed (Atk.Rectangle bounds);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Document {
@@ -285,9 +285,9 @@ namespace Atk {
 		public bool set_attribute_value (string attribute_name, string attribute_value);
 		[NoWrapper]
 		public abstract bool set_document_attribute (string attribute_name, string attribute_value);
-		public virtual signal void load_complete ();
-		public virtual signal void load_stopped ();
-		public virtual signal void reload ();
+		public signal void load_complete ();
+		public signal void load_stopped ();
+		public signal void reload ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface EditableText {
@@ -308,7 +308,7 @@ namespace Atk {
 		public abstract unowned Atk.Hyperlink get_link (int link_index);
 		public abstract int get_link_index (int char_index);
 		public abstract int get_n_links ();
-		public virtual signal void link_selected (int link_index);
+		public signal void link_selected (int link_index);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Image {
@@ -331,7 +331,7 @@ namespace Atk {
 		public abstract unowned Atk.Object ref_selection (int i);
 		public abstract bool remove_selection (int i);
 		public abstract bool select_all_selection ();
-		public virtual signal void selection_changed ();
+		public signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface StreamableContent {
@@ -371,13 +371,13 @@ namespace Atk {
 		public abstract void set_row_description (int row, string description);
 		public abstract void set_row_header (int row, Atk.Object header);
 		public abstract void set_summary (Atk.Object accessible);
-		public virtual signal void column_deleted (int column, int num_deleted);
-		public virtual signal void column_inserted (int column, int num_inserted);
-		public virtual signal void column_reordered ();
-		public virtual signal void model_changed ();
-		public virtual signal void row_deleted (int row, int num_deleted);
-		public virtual signal void row_inserted (int row, int num_inserted);
-		public virtual signal void row_reordered ();
+		public signal void column_deleted (int column, int num_deleted);
+		public signal void column_inserted (int column, int num_inserted);
+		public signal void column_reordered ();
+		public signal void model_changed ();
+		public signal void row_deleted (int row, int num_deleted);
+		public signal void row_inserted (int row, int num_inserted);
+		public signal void row_reordered ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Text {
@@ -405,10 +405,10 @@ namespace Atk {
 		public abstract bool remove_selection (int selection_num);
 		public abstract bool set_caret_offset (int offset);
 		public abstract bool set_selection (int selection_num, int start_offset, int end_offset);
-		public virtual signal void text_attributes_changed ();
-		public virtual signal void text_caret_moved (int location);
-		public virtual signal void text_changed (int position, int length);
-		public virtual signal void text_selection_changed ();
+		public signal void text_attributes_changed ();
+		public signal void text_caret_moved (int location);
+		public signal void text_changed (int position, int length);
+		public signal void text_selection_changed ();
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public interface Value {
diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index 5b1ebab74..0c54594f1 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -5,12 +5,12 @@ namespace GConf {
 	[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 ();
 		public bool check_value (string key, out unowned GConf.Value value_retloc);
 		public void clear ();
 		public void @foreach (GConf.ChangeSetForeachFunc func);
 		public void* get_user_data ();
-		[CCode (has_construct_function = false)]
-		public ChangeSet ();
 		public void remove (string key);
 		public void @set (string key, GConf.Value value);
 		public void set_bool (string key, bool val);
@@ -133,6 +133,8 @@ namespace GConf {
 	public class Entry {
 		public weak string key;
 		public weak GConf.Value value;
+		[CCode (has_construct_function = false)]
+		public Entry (string key, GConf.Value val);
 		public GConf.Entry copy ();
 		public bool equal (GConf.Entry b);
 		public bool get_is_default ();
@@ -141,8 +143,6 @@ namespace GConf {
 		public unowned string get_schema_name ();
 		public unowned GConf.Value get_value ();
 		[CCode (has_construct_function = false)]
-		public Entry (string key, GConf.Value val);
-		[CCode (has_construct_function = false)]
 		public Entry.nocopy (string key, GConf.Value val);
 		public void set_is_default (bool is_default);
 		public void set_is_writable (bool is_writable);
@@ -160,12 +160,12 @@ namespace GConf {
 	[Compact]
 	[CCode (cheader_filename = "gconf/gconf.h")]
 	public class Listeners {
+		[CCode (has_construct_function = false)]
+		public Listeners ();
 		public uint add (string listen_point, void* listener_data, GLib.FreeFunc destroy_notify);
 		public uint count ();
 		public void @foreach (GConf.ListenersForeach callback);
 		public bool get_data (uint cnxn_id, void* listener_data_p, string location_p);
-		[CCode (has_construct_function = false)]
-		public Listeners ();
 		public void notify (string all_above, GConf.ListenersCallback callback);
 		public void remove (uint cnxn_id);
 		public void remove_if (GConf.ListenersPredicate predicate);
@@ -176,12 +176,12 @@ namespace GConf {
 		public GLib.Time mod_time;
 		public weak string mod_user;
 		public weak string schema;
+		[CCode (has_construct_function = false)]
+		public MetaInfo ();
 		[CCode (cname = "gconf_meta_info_mod_time")]
 		public GLib.Time get_mod_time ();
 		public unowned string get_mod_user ();
 		public unowned string get_schema ();
-		[CCode (has_construct_function = false)]
-		public MetaInfo ();
 		public void set_mod_time (GLib.Time mod_time);
 		public void set_mod_user (string mod_user);
 		public void set_schema (string schema_name);
@@ -189,6 +189,8 @@ namespace GConf {
 	[Compact]
 	[CCode (copy_function = "gconf_schema_copy", cheader_filename = "gconf/gconf.h")]
 	public class Schema {
+		[CCode (has_construct_function = false)]
+		public Schema ();
 		public GConf.Schema copy ();
 		public GConf.ValueType get_car_type ();
 		public GConf.ValueType get_cdr_type ();
@@ -198,8 +200,6 @@ namespace GConf {
 		public unowned string get_long_desc ();
 		public unowned string get_owner ();
 		public unowned string get_short_desc ();
-		[CCode (has_construct_function = false)]
-		public Schema ();
 		public void set_car_type (GConf.ValueType type);
 		public void set_cdr_type (GConf.ValueType type);
 		public void set_default_value (GConf.Value val);
@@ -215,6 +215,8 @@ namespace GConf {
 	[CCode (copy_function = "gconf_value_copy", cheader_filename = "gconf/gconf.h")]
 	public class Value {
 		public GConf.ValueType type;
+		[CCode (has_construct_function = false)]
+		public Value (GConf.ValueType type);
 		public int compare (GConf.Value value_b);
 		public GConf.Value copy ();
 		[CCode (has_construct_function = false)]
@@ -228,8 +230,6 @@ namespace GConf {
 		public GConf.ValueType get_list_type ();
 		public unowned GConf.Schema get_schema ();
 		public unowned string get_string ();
-		[CCode (has_construct_function = false)]
-		public Value (GConf.ValueType type);
 		public void set_bool (bool the_bool);
 		public void set_car (GConf.Value car);
 		public void set_car_nocopy (GConf.Value car);
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index ddef2b52b..510abd7ba 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -4,6 +4,8 @@
 namespace Gdk {
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class Pixbuf : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
 		public unowned Gdk.Pixbuf add_alpha (bool substitute_color, uchar r, uchar g, uchar b);
 		public unowned Gdk.Pixbuf apply_embedded_orientation ();
 		public void composite (Gdk.Pixbuf dest, int dest_x, int dest_y, int dest_width, int dest_height, double offset_x, double offset_y, double scale_x, double scale_y, Gdk.InterpType interp_type, int overall_alpha);
@@ -43,8 +45,6 @@ namespace Gdk {
 		public unowned uchar[] get_pixels ();
 		public int get_rowstride ();
 		public int get_width ();
-		[CCode (has_construct_function = false)]
-		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
 		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;
@@ -99,12 +99,12 @@ namespace Gdk {
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufLoader : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public PixbufLoader ();
 		public bool close () throws GLib.Error;
 		public unowned Gdk.PixbufAnimation get_animation ();
 		public unowned Gdk.PixbufFormat get_format ();
 		public unowned Gdk.Pixbuf get_pixbuf ();
-		[CCode (has_construct_function = false)]
-		public PixbufLoader ();
 		public void set_size (int width, int height);
 		[CCode (has_construct_function = false)]
 		public PixbufLoader.with_mime_type (string mime_type) throws GLib.Error;
@@ -118,9 +118,9 @@ namespace Gdk {
 	}
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufSimpleAnim : Gdk.PixbufAnimation {
-		public void add_frame (Gdk.Pixbuf pixbuf);
 		[CCode (has_construct_function = false)]
 		public PixbufSimpleAnim (int width, int height, float rate);
+		public void add_frame (Gdk.Pixbuf pixbuf);
 	}
 	[Compact]
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 3e8611fe3..21a78b923 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -968,10 +968,10 @@ namespace GLib {
 		public abstract bool start_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public abstract void stop (GLib.MountUnmountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract bool stop_finish (GLib.AsyncResult _result) throws GLib.Error;
-		public virtual signal void changed ();
-		public virtual signal void disconnected ();
-		public virtual signal void eject_button ();
-		public virtual signal void stop_button ();
+		public signal void changed ();
+		public signal void disconnected ();
+		public signal void eject_button ();
+		public signal void stop_button ();
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface File : GLib.Object {
@@ -1144,9 +1144,9 @@ namespace GLib {
 		public abstract void unmount_with_operation (GLib.MountUnmountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract bool unmount_with_operation_finish (GLib.AsyncResult _result) throws GLib.Error;
 		public void unshadow ();
-		public virtual signal void changed ();
-		public virtual signal void pre_unmount ();
-		public virtual signal void unmounted ();
+		public signal void changed ();
+		public signal void pre_unmount ();
+		public signal void unmounted ();
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public interface Seekable : GLib.Object {
@@ -1182,8 +1182,8 @@ namespace GLib {
 		[NoWrapper]
 		public abstract void mount_fn (GLib.MountMountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract bool should_automount ();
-		public virtual signal void changed ();
-		public virtual signal void removed ();
+		public signal void changed ();
+		public signal void removed ();
 	}
 	[CCode (cprefix = "G_APP_INFO_CREATE_", cheader_filename = "gio/gio.h")]
 	[Flags]
diff --git a/vapi/gio-unix-2.0.vapi b/vapi/gio-unix-2.0.vapi
index 55f616da5..8823c7412 100644
--- a/vapi/gio-unix-2.0.vapi
+++ b/vapi/gio-unix-2.0.vapi
@@ -5,20 +5,20 @@ namespace GLib {
 	[CCode (cheader_filename = "gio/gdesktopappinfo.h")]
 	public class DesktopAppInfo : GLib.Object, GLib.AppInfo {
 		[CCode (has_construct_function = false)]
+		public DesktopAppInfo (string desktop_id);
+		[CCode (has_construct_function = false)]
 		public DesktopAppInfo.from_filename (string filename);
 		[CCode (has_construct_function = false)]
 		public DesktopAppInfo.from_keyfile (GLib.KeyFile key_file);
 		public bool get_is_hidden ();
-		[CCode (has_construct_function = false)]
-		public DesktopAppInfo (string desktop_id);
 		public static void set_desktop_env (string desktop_env);
 	}
 	[CCode (cheader_filename = "gio/gunixinputstream.h")]
 	public class UnixInputStream : GLib.InputStream {
-		public bool get_close_fd ();
-		public int get_fd ();
 		[CCode (type = "GInputStream*", has_construct_function = false)]
 		public UnixInputStream (int fd, bool close_fd);
+		public bool get_close_fd ();
+		public int get_fd ();
 		public void set_close_fd (bool close_fd);
 		public bool close_fd { get; set; }
 		public int fd { get; construct; }
@@ -26,10 +26,12 @@ namespace GLib {
 	[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);
 		[CCode (cname = "g_unix_mount_compare")]
 		public int compare (GLib.UnixMountEntry mount);
 		[CCode (cname = "g_unix_mounts_get")]
-		public static GLib.List<GLib.UnixMountEntry> get (ref uint64? time_read = null);
+		public static GLib.List<GLib.UnixMountEntry> @get (ref uint64? time_read = null);
 		[CCode (cname = "g_unix_mount_get_device_path")]
 		public unowned string get_device_path ();
 		[CCode (cname = "g_unix_mount_get_fs_type")]
@@ -48,8 +50,6 @@ namespace GLib {
 		public bool is_readonly ();
 		[CCode (cname = "g_unix_mount_is_system_internal")]
 		public bool is_system_internal ();
-		[CCode (cname = "g_unix_mount_at")]
-		public UnixMountEntry (string mount_path, uint64 time_read);
 	}
 	[CCode (cheader_filename = "gio/gunixmounts.h")]
 	public class UnixMountMonitor : GLib.Object {
@@ -79,10 +79,10 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gunixoutputstream.h")]
 	public class UnixOutputStream : GLib.OutputStream {
-		public bool get_close_fd ();
-		public int get_fd ();
 		[CCode (type = "GOutputStream*", has_construct_function = false)]
 		public UnixOutputStream (int fd, bool close_fd);
+		public bool get_close_fd ();
+		public int get_fd ();
 		public void set_close_fd (bool close_fd);
 		public bool close_fd { get; set; }
 		public int fd { get; construct; }
diff --git a/vapi/gnome-desktop-2.0.vapi b/vapi/gnome-desktop-2.0.vapi
index 289edaf74..970638cb5 100644
--- a/vapi/gnome-desktop-2.0.vapi
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -4,13 +4,13 @@
 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)]
+		public DItemEdit ();
 		public void clear ();
 		public unowned Gnome.DesktopItem get_ditem ();
 		public unowned string get_icon ();
 		public void grab_focus ();
 		public bool load_uri (string uri) throws GLib.Error;
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public DItemEdit ();
 		public void set_directory_only (bool directory_only);
 		public void set_ditem (Gnome.DesktopItem ditem);
 		public void set_editable (bool editable);
@@ -22,6 +22,8 @@ namespace Gnome {
 	[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 ();
 		public bool attr_exists (string attr);
 		public void clear_localestring (string attr);
 		public void clear_section (string section);
@@ -54,8 +56,6 @@ namespace Gnome {
 		public int launch (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags) throws GLib.Error;
 		public int launch_on_screen (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, Gdk.Screen screen, int workspace) throws GLib.Error;
 		public int launch_with_env (GLib.List file_list, Gnome.DesktopItemLaunchFlags flags, string[] envp) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public DesktopItem ();
 		public bool save (string under, bool force) throws GLib.Error;
 		public void set_boolean (string attr, bool value);
 		public void set_entry_type (Gnome.DesktopItemType type);
diff --git a/vapi/gnome-keyring-1.vapi b/vapi/gnome-keyring-1.vapi
index 5aa4b0f0d..7f34fc90b 100644
--- a/vapi/gnome-keyring-1.vapi
+++ b/vapi/gnome-keyring-1.vapi
@@ -5,27 +5,27 @@ namespace GnomeKeyring {
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_access_control_copy", cheader_filename = "gnome-keyring.h")]
 	public class AccessControl {
-		public GnomeKeyring.AccessControl copy ();
 		[CCode (has_construct_function = false)]
 		public AccessControl (GnomeKeyring.ApplicationRef application, GnomeKeyring.AccessType types_allowed);
+		public GnomeKeyring.AccessControl copy ();
 	}
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_application_ref_copy", cheader_filename = "gnome-keyring.h")]
 	public class ApplicationRef {
-		public GnomeKeyring.ApplicationRef copy ();
 		[CCode (has_construct_function = false)]
 		public ApplicationRef ();
+		public GnomeKeyring.ApplicationRef copy ();
 	}
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_attribute_list_copy", cheader_filename = "gnome-keyring.h")]
 	public class AttributeList {
 		public GnomeKeyring.Attribute[] data;
 		public uint len;
+		public AttributeList ();
 		public void append_string (string name, string value);
 		public void append_uint32 (string name, uint32 value);
 		public GnomeKeyring.AttributeList copy ();
 		public GnomeKeyring.Attribute index (int i);
-		public AttributeList ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "gnome-keyring.h")]
@@ -51,13 +51,13 @@ namespace GnomeKeyring {
 	[Compact]
 	[CCode (copy_function = "gnome_keyring_item_info_copy", cheader_filename = "gnome-keyring.h")]
 	public class ItemInfo {
+		[CCode (has_construct_function = false)]
+		public ItemInfo ();
 		public GnomeKeyring.ItemInfo copy ();
 		public ulong get_ctime ();
 		public unowned string get_display_name ();
 		public ulong get_mtime ();
 		public unowned string get_secret ();
-		[CCode (has_construct_function = false)]
-		public ItemInfo ();
 		public void set_display_name (string value);
 		public void set_secret (string value);
 		public void set_type (GnomeKeyring.ItemType type);
diff --git a/vapi/goocanvas.vapi b/vapi/goocanvas.vapi
index 60c39a37b..b49730055 100644
--- a/vapi/goocanvas.vapi
+++ b/vapi/goocanvas.vapi
@@ -602,17 +602,17 @@ namespace Goo {
 		public Goo.CairoMatrix transform { get; set; }
 		public Goo.CanvasItemVisibility visibility { get; set; }
 		public double visibility_threshold { get; set; }
-		public virtual signal bool button_press_event (Goo.CanvasItem target, Gdk.EventButton event);
-		public virtual signal bool button_release_event (Goo.CanvasItem target, Gdk.EventButton event);
-		public virtual signal void child_notify (GLib.ParamSpec pspec);
-		public virtual signal bool enter_notify_event (Goo.CanvasItem target, Gdk.EventCrossing event);
-		public virtual signal bool focus_in_event (Goo.CanvasItem target, Gdk.EventFocus event);
-		public virtual signal bool focus_out_event (Goo.CanvasItem target, Gdk.EventFocus event);
-		public virtual signal bool grab_broken_event (Goo.CanvasItem target, Gdk.EventGrabBroken event);
-		public virtual signal bool key_press_event (Goo.CanvasItem target, Gdk.EventKey event);
-		public virtual signal bool key_release_event (Goo.CanvasItem target, Gdk.EventKey event);
-		public virtual signal bool leave_notify_event (Goo.CanvasItem target, Gdk.EventCrossing event);
-		public virtual signal bool motion_notify_event (Goo.CanvasItem target, Gdk.EventMotion event);
+		public signal bool button_press_event (Goo.CanvasItem target, Gdk.EventButton event);
+		public signal bool button_release_event (Goo.CanvasItem target, Gdk.EventButton event);
+		public signal void child_notify (GLib.ParamSpec pspec);
+		public signal bool enter_notify_event (Goo.CanvasItem target, Gdk.EventCrossing event);
+		public signal bool focus_in_event (Goo.CanvasItem target, Gdk.EventFocus event);
+		public signal bool focus_out_event (Goo.CanvasItem target, Gdk.EventFocus event);
+		public signal bool grab_broken_event (Goo.CanvasItem target, Gdk.EventGrabBroken event);
+		public signal bool key_press_event (Goo.CanvasItem target, Gdk.EventKey event);
+		public signal bool key_release_event (Goo.CanvasItem target, Gdk.EventKey event);
+		public signal bool leave_notify_event (Goo.CanvasItem target, Gdk.EventCrossing event);
+		public signal bool motion_notify_event (Goo.CanvasItem target, Gdk.EventMotion event);
 	}
 	[CCode (cheader_filename = "goocanvas.h")]
 	public interface CanvasItemModel : GLib.Object {
@@ -662,11 +662,11 @@ namespace Goo {
 		public Goo.CairoMatrix transform { get; set; }
 		public Goo.CanvasItemVisibility visibility { get; set; }
 		public double visibility_threshold { get; set; }
-		public virtual signal void changed (bool recompute_bounds);
-		public virtual signal void child_added (int child_num);
-		public virtual signal void child_moved (int old_child_num, int new_child_num);
-		public virtual signal void child_notify (GLib.ParamSpec pspec);
-		public virtual signal void child_removed (int child_num);
+		public signal void changed (bool recompute_bounds);
+		public signal void child_added (int child_num);
+		public signal void child_moved (int old_child_num, int new_child_num);
+		public signal void child_notify (GLib.ParamSpec pspec);
+		public signal void child_removed (int child_num);
 	}
 	[CCode (type_id = "GOO_TYPE_CAIRO_LINE_DASH", cheader_filename = "goocanvas.h")]
 	public struct CairoLineDash {
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 2ce0a8fa2..3ab5f55e9 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -1307,9 +1307,9 @@ namespace Gst {
 		public static void set_property (Gst.Object object, string name, Gst.Value value);
 		public static void set_valist (Gst.Object object, string first_property_name, void* var_args);
 		[HasEmitter]
-		public virtual signal void child_added (GLib.Object child);
+		public signal void child_added (GLib.Object child);
 		[HasEmitter]
-		public virtual signal void child_removed (GLib.Object child);
+		public signal void child_removed (GLib.Object child);
 	}
 	[CCode (cheader_filename = "gst/gst.h")]
 	public interface ImplementsInterface : Gst.Element {
@@ -1331,7 +1331,7 @@ namespace Gst {
 		public uint get_uri_type ();
 		public abstract bool set_uri (string uri);
 		[HasEmitter]
-		public virtual signal void new_uri (string uri);
+		public signal void new_uri (string uri);
 	}
 	[CCode (type_id = "GST_TYPE_ARRAY", cheader_filename = "gst/gst.h")]
 	public struct Array {
diff --git a/vapi/gstreamer-base-0.10.vapi b/vapi/gstreamer-base-0.10.vapi
index e92b65142..a3c483ed5 100644
--- a/vapi/gstreamer-base-0.10.vapi
+++ b/vapi/gstreamer-base-0.10.vapi
@@ -4,13 +4,13 @@
 namespace Gst {
 	[CCode (cheader_filename = "gst/base/gstadapter.h")]
 	public class Adapter : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Adapter ();
 		public uint available ();
 		public uint available_fast ();
 		public void clear ();
 		public void copy (uchar dest, uint offset, uint size);
 		public void flush (uint flush);
-		[CCode (has_construct_function = false)]
-		public Adapter ();
 		[CCode (array_length = false)]
 		public unowned uchar[] peek (uint size);
 		public void push (owned Gst.Buffer buf);
@@ -89,7 +89,7 @@ namespace Gst {
 		public Gst.FlowReturn wait_eos (Gst.ClockTime time, out Gst.ClockTimeDiff jitter);
 		public Gst.FlowReturn wait_preroll ();
 		[NoAccessorMethod]
-		public bool async { get; set; }
+		public bool @async { get; set; }
 		public uint blocksize { get; set; }
 		public Gst.Buffer last_buffer { get; }
 		public int64 max_lateness { get; set; }
@@ -237,6 +237,8 @@ namespace Gst {
 		public uchar data;
 		public uint size;
 		[CCode (has_construct_function = false)]
+		public BitReader (uchar data, uint size);
+		[CCode (has_construct_function = false)]
 		public BitReader.from_buffer (Gst.Buffer buffer);
 		public bool get_bits_uint16 (out uint16 val, uint nbits);
 		public bool get_bits_uint32 (out uint32 val, uint nbits);
@@ -246,8 +248,6 @@ namespace Gst {
 		public uint get_remaining ();
 		public void init (uchar data, uint size);
 		public void init_from_buffer (Gst.Buffer buffer);
-		[CCode (has_construct_function = false)]
-		public BitReader (uchar data, uint size);
 		public bool peek_bits_uint16 (out uint16 val, uint nbits);
 		public bool peek_bits_uint32 (out uint32 val, uint nbits);
 		public bool peek_bits_uint64 (out uint64 val, uint nbits);
@@ -263,6 +263,8 @@ namespace Gst {
 		public uchar data;
 		public uint size;
 		[CCode (has_construct_function = false)]
+		public ByteReader (uchar data, uint size);
+		[CCode (has_construct_function = false)]
 		public ByteReader.from_buffer (Gst.Buffer buffer);
 		public bool get_data (uint size, out uchar val);
 		public bool get_float32_be (out float val);
@@ -291,8 +293,6 @@ namespace Gst {
 		public bool get_uint8 (out uchar val);
 		public void init (uchar data, uint size);
 		public void init_from_buffer (Gst.Buffer buffer);
-		[CCode (has_construct_function = false)]
-		public ByteReader (uchar data, uint size);
 		public bool peek_data (uint size, out uchar val);
 		public bool peek_float32_be (out float val);
 		public bool peek_float32_le (out float val);
@@ -339,6 +339,8 @@ namespace Gst {
 		public uint queuedpads;
 		public bool started;
 		public void* user_data;
+		[CCode (has_construct_function = false)]
+		public CollectPads ();
 		public unowned Gst.CollectData add_pad (Gst.Pad pad, uint size);
 		public unowned Gst.CollectData add_pad_full (Gst.Pad pad, uint size, Gst.CollectDataDestroyNotify destroy_notify);
 		public uint available ();
@@ -346,8 +348,6 @@ namespace Gst {
 		public Gst.FlowReturn collect_range (uint64 offset, uint length);
 		public uint flush (Gst.CollectData data, uint size);
 		public bool is_active (Gst.Pad pad);
-		[CCode (has_construct_function = false)]
-		public CollectPads ();
 		public unowned Gst.Buffer peek (Gst.CollectData data);
 		public unowned Gst.Buffer pop (Gst.CollectData data);
 		public uint read (Gst.CollectData data, uchar bytes, uint size);
@@ -369,14 +369,14 @@ namespace Gst {
 		public weak GLib.Cond item_del;
 		public weak GLib.Mutex qlock;
 		public weak GLib.Queue queue;
+		[CCode (has_construct_function = false)]
+		public DataQueue (Gst.DataQueueCheckFullFunction checkfull, void* checkdata);
 		public bool drop_head (GLib.Type type);
 		public void flush ();
 		public void get_level (Gst.DataQueueSize level);
 		public bool is_empty ();
 		public bool is_full ();
 		public void limits_changed ();
-		[CCode (has_construct_function = false)]
-		public DataQueue (Gst.DataQueueCheckFullFunction checkfull, void* checkdata);
 		public bool pop (out unowned Gst.DataQueueItem item);
 		public bool push (Gst.DataQueueItem item);
 		public void set_flushing (bool flushing);
diff --git a/vapi/gstreamer-controller-0.10.vapi b/vapi/gstreamer-controller-0.10.vapi
index 8e2c5c7fa..f4e96a15d 100644
--- a/vapi/gstreamer-controller-0.10.vapi
+++ b/vapi/gstreamer-controller-0.10.vapi
@@ -14,7 +14,9 @@ namespace Gst {
 		public weak GLib.Mutex @lock;
 		public weak GLib.Object object;
 		public weak GLib.List properties;
-		public Gst.Value get (string property_name, Gst.ClockTime timestamp);
+		[CCode (has_construct_function = false)]
+		public Controller (GLib.Object object);
+		public Gst.Value @get (string property_name, Gst.ClockTime timestamp);
 		public unowned GLib.List get_all (string property_name);
 		public unowned Gst.ControlSource get_control_source (string property_name);
 		public bool get_value_array (Gst.ClockTime timestamp, Gst.ValueArray value_array);
@@ -22,12 +24,10 @@ namespace Gst {
 		public static bool init (int argc, out unowned string argv);
 		[CCode (has_construct_function = false)]
 		public Controller.list (GLib.Object object, GLib.List list);
-		[CCode (has_construct_function = false)]
-		public Controller (GLib.Object object);
 		public bool remove_properties ();
 		public bool remove_properties_list (GLib.List list);
 		public bool remove_properties_valist (void* var_args);
-		public bool set (string property_name, Gst.ClockTime timestamp, Gst.Value value);
+		public bool @set (string property_name, Gst.ClockTime timestamp, Gst.Value value);
 		public bool set_control_source (string property_name, Gst.ControlSource csource);
 		public void set_disabled (bool disabled);
 		public bool set_from_list (string property_name, GLib.SList timedvalues);
@@ -45,11 +45,11 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/controller/gstcontroller.h")]
 	public class InterpolationControlSource : Gst.ControlSource {
 		public weak GLib.Mutex @lock;
-		public unowned GLib.List get_all ();
-		public int get_count ();
 		[CCode (has_construct_function = false)]
 		public InterpolationControlSource ();
-		public bool set (Gst.ClockTime timestamp, Gst.Value value);
+		public unowned GLib.List get_all ();
+		public int get_count ();
+		public bool @set (Gst.ClockTime timestamp, Gst.Value value);
 		public bool set_from_list (GLib.SList timedvalues);
 		public bool set_interpolation_mode (Gst.InterpolateMode mode);
 		public bool unset (Gst.ClockTime timestamp);
diff --git a/vapi/gstreamer-fft-0.10.vapi b/vapi/gstreamer-fft-0.10.vapi
index b38850408..39a153052 100644
--- a/vapi/gstreamer-fft-0.10.vapi
+++ b/vapi/gstreamer-fft-0.10.vapi
@@ -8,10 +8,10 @@ namespace Gst {
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (float timedata, Gst.FFTF32Complex freqdata);
-		public void inverse_fft (Gst.FFTF32Complex freqdata, float timedata);
 		[CCode (has_construct_function = false)]
 		public FFTF32 (int len, bool inverse);
+		public void fft (float timedata, Gst.FFTF32Complex freqdata);
+		public void inverse_fft (Gst.FFTF32Complex freqdata, float timedata);
 		public void window (float timedata, Gst.FFTWindow window);
 	}
 	[Compact]
@@ -26,10 +26,10 @@ namespace Gst {
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (double timedata, Gst.FFTF64Complex freqdata);
-		public void inverse_fft (Gst.FFTF64Complex freqdata, double timedata);
 		[CCode (has_construct_function = false)]
 		public FFTF64 (int len, bool inverse);
+		public void fft (double timedata, Gst.FFTF64Complex freqdata);
+		public void inverse_fft (Gst.FFTF64Complex freqdata, double timedata);
 		public void window (double timedata, Gst.FFTWindow window);
 	}
 	[Compact]
@@ -44,10 +44,10 @@ namespace Gst {
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (int16 timedata, Gst.FFTS16Complex freqdata);
-		public void inverse_fft (Gst.FFTS16Complex freqdata, int16 timedata);
 		[CCode (has_construct_function = false)]
 		public FFTS16 (int len, bool inverse);
+		public void fft (int16 timedata, Gst.FFTS16Complex freqdata);
+		public void inverse_fft (Gst.FFTS16Complex freqdata, int16 timedata);
 		public void window (int16 timedata, Gst.FFTWindow window);
 	}
 	[Compact]
@@ -62,10 +62,10 @@ namespace Gst {
 		public void* cfg;
 		public bool inverse;
 		public int len;
-		public void fft (int32 timedata, Gst.FFTS32Complex freqdata);
-		public void inverse_fft (Gst.FFTS32Complex freqdata, int32 timedata);
 		[CCode (has_construct_function = false)]
 		public FFTS32 (int len, bool inverse);
+		public void fft (int32 timedata, Gst.FFTS32Complex freqdata);
+		public void inverse_fft (Gst.FFTS32Complex freqdata, int32 timedata);
 		public void window (int32 timedata, Gst.FFTWindow window);
 	}
 	[Compact]
diff --git a/vapi/gstreamer-interfaces-0.10.vapi b/vapi/gstreamer-interfaces-0.10.vapi
index 95eeb0574..43d62c2c8 100644
--- a/vapi/gstreamer-interfaces-0.10.vapi
+++ b/vapi/gstreamer-interfaces-0.10.vapi
@@ -53,7 +53,7 @@ namespace Gst {
 		public abstract unowned GLib.List<Gst.ColorBalanceChannel> list_channels ();
 		public abstract void set_value (Gst.ColorBalanceChannel channel, int value);
 		[HasEmitter]
-		public virtual signal void value_changed (Gst.ColorBalanceChannel channel, int value);
+		public signal void value_changed (Gst.ColorBalanceChannel channel, int value);
 	}
 	[CCode (cheader_filename = "gst/interfaces/mixer.h")]
 	public interface Mixer : Gst.ImplementsInterface, Gst.Element {
@@ -71,13 +71,13 @@ namespace Gst {
 		public abstract void set_record (Gst.MixerTrack track, bool record);
 		public abstract void set_volume (Gst.MixerTrack track, int volumes);
 		[HasEmitter]
-		public virtual signal void mute_toggled (Gst.MixerTrack channel, bool mute);
+		public signal void mute_toggled (Gst.MixerTrack channel, bool mute);
 		[HasEmitter]
-		public virtual signal void option_changed (Gst.MixerOptions opts, string option);
+		public signal void option_changed (Gst.MixerOptions opts, string option);
 		[HasEmitter]
-		public virtual signal void record_toggled (Gst.MixerTrack channel, bool record);
+		public signal void record_toggled (Gst.MixerTrack channel, bool record);
 		[HasEmitter]
-		public virtual signal void volume_changed (Gst.MixerTrack channel, void* volumes);
+		public signal void volume_changed (Gst.MixerTrack channel, void* volumes);
 	}
 	[CCode (cheader_filename = "gst/interfaces/navigation.h")]
 	public interface Navigation : Gst.Element {
@@ -97,7 +97,7 @@ namespace Gst {
 		public unowned GLib.ValueArray probe_and_get_values_name (string name);
 		public abstract void probe_property (GLib.ParamSpec pspec);
 		public void probe_property_name (string name);
-		public virtual signal void probe_needed (void* pspec);
+		public signal void probe_needed (void* pspec);
 	}
 	[CCode (cheader_filename = "gst/interfaces/tuner.h")]
 	public interface Tuner : Gst.ImplementsInterface, Gst.Element {
@@ -112,12 +112,12 @@ namespace Gst {
 		public abstract void set_frequency (Gst.TunerChannel channel, ulong frequency);
 		public abstract void set_norm (Gst.TunerNorm norm);
 		public abstract int signal_strength (Gst.TunerChannel channel);
-		public virtual signal void channel_changed (Gst.TunerChannel channel);
+		public signal void channel_changed (Gst.TunerChannel channel);
 		[HasEmitter]
-		public virtual signal void frequency_changed (Gst.TunerChannel channel, ulong frequency);
-		public virtual signal void norm_changed (Gst.TunerNorm norm);
+		public signal void frequency_changed (Gst.TunerChannel channel, ulong frequency);
+		public signal void norm_changed (Gst.TunerNorm norm);
 		[HasEmitter]
-		public virtual signal void signal_changed (Gst.TunerChannel channel, int @signal);
+		public signal void signal_changed (Gst.TunerChannel channel, int @signal);
 	}
 	[CCode (cheader_filename = "gst/interfaces/videoorientation.h")]
 	public interface VideoOrientation : Gst.ImplementsInterface, Gst.Element {
diff --git a/vapi/gstreamer-netbuffer-0.10.vapi b/vapi/gstreamer-netbuffer-0.10.vapi
index 9b74ca58e..a3d295a18 100644
--- a/vapi/gstreamer-netbuffer-0.10.vapi
+++ b/vapi/gstreamer-netbuffer-0.10.vapi
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
-	[CCode (type_id = "GST_TYPE_NETBUFFER", cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
+	[CCode (cheader_filename = "gst/netbuffer/gstnetbuffer.h")]
 	public class NetBuffer : Gst.Buffer {
 		public weak Gst.Buffer buffer;
 		public Gst.NetAddress from;
diff --git a/vapi/gstreamer-rtsp-0.10.vapi b/vapi/gstreamer-rtsp-0.10.vapi
index ba2df3be0..5e338b095 100644
--- a/vapi/gstreamer-rtsp-0.10.vapi
+++ b/vapi/gstreamer-rtsp-0.10.vapi
@@ -129,9 +129,9 @@ namespace Gst {
 	[Compact]
 	[CCode (cheader_filename = "gst/gst.h")]
 	public class RTSPWatch {
-		public uint attach (GLib.MainContext context);
 		[CCode (has_construct_function = false)]
 		public RTSPWatch (Gst.RTSPConnection conn, Gst.RTSPWatchFuncs funcs, GLib.DestroyNotify notify);
+		public uint attach (GLib.MainContext context);
 		public uint queue_message (Gst.RTSPMessage message);
 		public void reset ();
 	}
@@ -157,7 +157,7 @@ namespace Gst {
 		public abstract Gst.RTSPResult setup_media (Gst.SDPMedia media);
 		public abstract Gst.RTSPResult stream_select (Gst.RTSPUrl url);
 		[HasEmitter]
-		public virtual signal Gst.RTSPResult send (void* req, void* resp);
+		public signal Gst.RTSPResult send (void* req, void* resp);
 	}
 	[CCode (cprefix = "GST_RTSP_AUTH_", cheader_filename = "gst/rtsp/gstrtspconnection.h")]
 	public enum RTSPAuthMethod {
diff --git a/vapi/gstreamer-sdp-0.10.vapi b/vapi/gstreamer-sdp-0.10.vapi
index e1a00ae78..48f92ea97 100644
--- a/vapi/gstreamer-sdp-0.10.vapi
+++ b/vapi/gstreamer-sdp-0.10.vapi
@@ -1,4 +1,4 @@
-/* gstreamer-sdp-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-sdp-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -42,6 +42,8 @@ namespace Gst {
 		public uint num_ports;
 		public uint port;
 		public weak string proto;
+		[CCode (type = "GstSDPResult", has_construct_function = false)]
+		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);
 		public Gst.SDPResult add_connection (string nettype, string addrtype, string address, uint ttl, uint addr_number);
@@ -64,8 +66,6 @@ namespace Gst {
 		public uint get_port ();
 		public unowned string get_proto ();
 		public Gst.SDPResult init ();
-		[CCode (type = "GstSDPResult", has_construct_function = false)]
-		public SDPMedia (out unowned Gst.SDPMedia media);
 		public Gst.SDPResult set_information (string information);
 		public Gst.SDPResult set_key (string type, string data);
 		public Gst.SDPResult set_media (string med);
@@ -90,6 +90,8 @@ namespace Gst {
 		public weak string uri;
 		public weak string version;
 		public weak GLib.Array zones;
+		[CCode (type = "GstSDPResult", has_construct_function = false)]
+		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);
 		public Gst.SDPResult add_email (string email);
@@ -120,8 +122,6 @@ namespace Gst {
 		public unowned Gst.SDPZone get_zone (uint idx);
 		public Gst.SDPResult init ();
 		public uint medias_len ();
-		[CCode (type = "GstSDPResult", has_construct_function = false)]
-		public SDPMessage (out unowned Gst.SDPMessage msg);
 		public static Gst.SDPResult parse_buffer (uchar data, uint size, Gst.SDPMessage msg);
 		public uint phones_len ();
 		public Gst.SDPResult set_connection (string nettype, string addrtype, string address, uint ttl, uint addr_number);
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index a9f69df6c..0a193033c 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -5491,9 +5491,9 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface CellEditable : Gtk.Widget {
 		[HasEmitter]
-		public virtual signal void editing_done ();
+		public signal void editing_done ();
 		[HasEmitter]
-		public virtual signal void remove_widget ();
+		public signal void remove_widget ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface CellLayout : GLib.Object {
@@ -5525,11 +5525,11 @@ namespace Gtk {
 		public abstract void select_region (int start_pos, int end_pos);
 		public void set_editable (bool is_editable);
 		public abstract void set_position (int position);
-		public virtual signal void changed ();
+		public signal void changed ();
 		[HasEmitter]
-		public virtual signal void delete_text (int start_pos, int end_pos);
+		public signal void delete_text (int start_pos, int end_pos);
 		[HasEmitter]
-		public virtual signal void insert_text (string text, int length, void* position);
+		public signal void insert_text (string text, int length, void* position);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface FileChooser : Gtk.Widget {
@@ -5601,11 +5601,11 @@ namespace Gtk {
 		public bool select_multiple { get; set; }
 		public bool show_hidden { get; set; }
 		public bool use_preview_label { get; set; }
-		public virtual signal Gtk.FileChooserConfirmation confirm_overwrite ();
-		public virtual signal void current_folder_changed ();
-		public virtual signal void file_activated ();
-		public virtual signal void selection_changed ();
-		public virtual signal void update_preview ();
+		public signal Gtk.FileChooserConfirmation confirm_overwrite ();
+		public signal void current_folder_changed ();
+		public signal void file_activated ();
+		public signal void selection_changed ();
+		public signal void update_preview ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface FileChooserEmbed {
@@ -5620,8 +5620,8 @@ namespace Gtk {
 		public abstract void end_preview ();
 		public abstract bool is_selected (int page_nr);
 		public abstract void render_page (int page_nr);
-		public virtual signal void got_page_size (Gtk.PrintContext context, Gtk.PageSetup page_setup);
-		public virtual signal void ready (Gtk.PrintContext context);
+		public signal void got_page_size (Gtk.PrintContext context, Gtk.PageSetup page_setup);
+		public signal void ready (Gtk.PrintContext context);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface RecentChooser : GLib.Object {
@@ -5669,8 +5669,8 @@ namespace Gtk {
 		public bool show_private { get; set; }
 		public bool show_tips { get; set; }
 		public Gtk.RecentSortType sort_type { get; set; }
-		public virtual signal void item_activated ();
-		public virtual signal void selection_changed ();
+		public signal void item_activated ();
+		public signal void selection_changed ();
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface ToolShell : Gtk.Widget {
@@ -5715,15 +5715,15 @@ namespace Gtk {
 		public abstract void ref_node (Gtk.TreeIter iter);
 		public abstract void unref_node (Gtk.TreeIter iter);
 		[HasEmitter]
-		public virtual signal void row_changed (Gtk.TreePath path, Gtk.TreeIter iter);
+		public signal void row_changed (Gtk.TreePath path, Gtk.TreeIter iter);
 		[HasEmitter]
-		public virtual signal void row_deleted (Gtk.TreePath path);
+		public signal void row_deleted (Gtk.TreePath path);
 		[HasEmitter]
-		public virtual signal void row_has_child_toggled (Gtk.TreePath path, Gtk.TreeIter iter);
+		public signal void row_has_child_toggled (Gtk.TreePath path, Gtk.TreeIter iter);
 		[HasEmitter]
-		public virtual signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter);
+		public signal void row_inserted (Gtk.TreePath path, Gtk.TreeIter iter);
 		[HasEmitter]
-		public virtual signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, void* new_order);
+		public signal void rows_reordered (Gtk.TreePath path, Gtk.TreeIter iter, void* new_order);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public interface TreeSortable : Gtk.TreeModel, GLib.Object {
@@ -5733,7 +5733,7 @@ namespace Gtk {
 		public abstract void set_sort_column_id (int sort_column_id, Gtk.SortType order);
 		public abstract void set_sort_func (int sort_column_id, owned Gtk.TreeIterCompareFunc sort_func);
 		[HasEmitter]
-		public virtual signal void sort_column_changed ();
+		public signal void sort_column_changed ();
 	}
 	[CCode (type_id = "GTK_TYPE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
 	public struct ActionEntry {
diff --git a/vapi/gtksourceview-2.0.vapi b/vapi/gtksourceview-2.0.vapi
index de6972d13..98dcf26a5 100644
--- a/vapi/gtksourceview-2.0.vapi
+++ b/vapi/gtksourceview-2.0.vapi
@@ -4,6 +4,8 @@
 namespace Gtk {
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceBuffer : Gtk.TextBuffer {
+		[CCode (has_construct_function = false)]
+		public SourceBuffer (Gtk.TextTagTable table);
 		public bool backward_iter_to_source_mark (Gtk.TextIter iter, string category);
 		public void begin_not_undoable_action ();
 		public unowned Gtk.SourceMark create_source_mark (string name, string category, Gtk.TextIter where);
@@ -17,8 +19,6 @@ namespace Gtk {
 		public unowned GLib.SList get_source_marks_at_iter (Gtk.TextIter iter, string category);
 		public unowned GLib.SList get_source_marks_at_line (int line, string category);
 		public unowned Gtk.SourceStyleScheme get_style_scheme ();
-		[CCode (has_construct_function = false)]
-		public SourceBuffer (Gtk.TextTagTable table);
 		public void redo ();
 		public void remove_source_marks (Gtk.TextIter start, Gtk.TextIter end, string category);
 		public void set_highlight_matching_brackets (bool highlight);
@@ -58,6 +58,8 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourcelanguagemanager.h")]
 	public class SourceLanguageManager : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public SourceLanguageManager ();
 		public static unowned Gtk.SourceLanguageManager get_default ();
 		public unowned Gtk.SourceLanguage get_language (string id);
 		[CCode (array_length = false, array_null_terminated = true)]
@@ -65,8 +67,6 @@ namespace Gtk {
 		[CCode (array_length = false, array_null_terminated = true)]
 		public unowned string[]? get_search_path ();
 		public unowned Gtk.SourceLanguage guess_language (string filename, string content_type);
-		[CCode (has_construct_function = false)]
-		public SourceLanguageManager ();
 		public void set_search_path ([CCode (array_length = false)] string[]? dirs);
 		[CCode (array_length = false, array_null_terminated = true)]
 		public string[] language_ids { get; }
@@ -75,15 +75,17 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceMark : Gtk.TextMark {
-		public unowned string get_category ();
 		[CCode (has_construct_function = false)]
 		public SourceMark (string name, string category);
+		public unowned string get_category ();
 		public unowned Gtk.SourceMark next (string category);
 		public unowned Gtk.SourceMark prev (string category);
 		public string category { get; construct; }
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceprintcompositor.h")]
 	public class SourcePrintCompositor : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public SourcePrintCompositor (Gtk.SourceBuffer buffer);
 		public void draw_page (Gtk.PrintContext context, int page_nr);
 		[CCode (has_construct_function = false)]
 		public SourcePrintCompositor.from_view (Gtk.SourceView view);
@@ -104,8 +106,6 @@ namespace Gtk {
 		public uint get_tab_width ();
 		public double get_top_margin (Gtk.Unit unit);
 		public Gtk.WrapMode get_wrap_mode ();
-		[CCode (has_construct_function = false)]
-		public SourcePrintCompositor (Gtk.SourceBuffer buffer);
 		public bool paginate (Gtk.PrintContext context);
 		public void set_body_font_name (string font_name);
 		public void set_bottom_margin (double margin, Gtk.Unit unit);
@@ -183,6 +183,8 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourcestyleschememanager.h")]
 	public class SourceStyleSchemeManager : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public SourceStyleSchemeManager ();
 		public void append_search_path (string path);
 		public void force_rescan ();
 		public static unowned Gtk.SourceStyleSchemeManager get_default ();
@@ -191,8 +193,6 @@ namespace Gtk {
 		public unowned string[] get_scheme_ids ();
 		[CCode (array_length = false, array_null_terminated = true)]
 		public unowned string[] get_search_path ();
-		[CCode (has_construct_function = false)]
-		public SourceStyleSchemeManager ();
 		public void prepend_search_path (string path);
 		public void set_search_path (string path);
 		[CCode (array_length = false, array_null_terminated = true)]
@@ -202,6 +202,8 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtksourceview/gtksourceview.h")]
 	public class SourceView : Gtk.TextView, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public SourceView ();
 		public bool get_auto_indent ();
 		public Gtk.SourceDrawSpacesFlags get_draw_spaces ();
 		public bool get_highlight_current_line ();
@@ -217,8 +219,6 @@ namespace Gtk {
 		public bool get_show_right_margin ();
 		public Gtk.SourceSmartHomeEndType get_smart_home_end ();
 		public uint get_tab_width ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SourceView ();
 		public void set_auto_indent (bool enable);
 		public void set_draw_spaces (Gtk.SourceDrawSpacesFlags flags);
 		public void set_highlight_current_line (bool show);
diff --git a/vapi/hildon-1.vapi b/vapi/hildon-1.vapi
index f17bc706f..b979abc0d 100644
--- a/vapi/hildon-1.vapi
+++ b/vapi/hildon-1.vapi
@@ -24,9 +24,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class BreadCrumbTrail : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public void clear ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public BreadCrumbTrail ();
+		public void clear ();
 		public void pop ();
 		public void push (Hildon.BreadCrumb item, void* id, GLib.DestroyNotify notify);
 		public void push_icon (string text, Gtk.Widget icon, void* id, GLib.DestroyNotify destroy);
@@ -55,13 +55,13 @@ namespace Hildon {
 		public int num_marked_dates;
 		public int selected_day;
 		public weak Gdk.GC xor_gc;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Calendar ();
 		public void clear_marks ();
 		public void freeze ();
 		public void get_date (uint year, uint month, uint day);
 		public Hildon.CalendarDisplayOptions get_display_options ();
 		public bool mark_day (uint day);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Calendar ();
 		public void select_day (uint day);
 		public bool select_month (uint month, uint year);
 		public void set_display_options (Hildon.CalendarDisplayOptions flags);
@@ -99,9 +99,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CalendarPopup : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public void get_date (uint year, uint month, uint day);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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);
 		[NoAccessorMethod]
 		public int day { get; set; }
@@ -116,6 +116,8 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Caption : Gtk.EventBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		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 ();
 		public Hildon.CaptionIconPosition get_icon_position ();
@@ -125,8 +127,6 @@ namespace Hildon {
 		public unowned Gtk.SizeGroup get_size_group ();
 		public Hildon.CaptionStatus get_status ();
 		public bool is_mandatory ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Caption (Gtk.SizeGroup group, string value, Gtk.Widget control, Gtk.Widget icon, Hildon.CaptionStatus flag);
 		public void set_child_expand (bool expand);
 		public void set_icon_image (Gtk.Widget icon);
 		public void set_icon_position (Hildon.CaptionIconPosition pos);
@@ -149,20 +149,20 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class CodeDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public void clear_code ();
-		public unowned string get_code ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public CodeDialog ();
+		public void clear_code ();
+		public unowned string get_code ();
 		public void set_help_text (string text);
 		public void set_input_sensitive (bool sensitive);
 		public virtual signal void input ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-		public void get_color (out Gdk.Color color);
-		public bool get_popup_shown ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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)]
@@ -172,27 +172,27 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooser : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
-		public void get_color (out Gdk.Color color);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public ColorChooser ();
+		public void get_color (out Gdk.Color color);
 		public virtual void set_color (Gdk.Color color);
 		public Gdk.Color color { get; set; }
 		public virtual signal void color_changed ();
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class ColorChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public void get_color (out Gdk.Color color);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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)]
+		public Controlbar ();
 		public int get_max ();
 		public int get_min ();
 		public int get_value ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Controlbar ();
 		public void set_max (int max);
 		public void set_min (int min);
 		public void set_range (int min, int max);
@@ -204,12 +204,12 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class DateEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public DateEditor ();
 		public void get_date (uint year, uint month, uint day);
 		public uint get_day ();
 		public uint get_month ();
 		public uint get_year ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public DateEditor ();
 		public void set_date (uint year, uint month, uint day);
 		public bool set_day (uint day);
 		public bool set_month (uint month);
@@ -225,12 +225,12 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class FindToolbar : Gtk.Toolbar, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public FindToolbar (string label);
 		public int get_active ();
 		public bool get_active_iter (out Gtk.TreeIter iter);
 		public int32 get_last_index ();
 		public void highlight_entry (bool get_focus);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FindToolbar (string label);
 		public void set_active (int index);
 		public void set_active_iter (Gtk.TreeIter iter);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
@@ -254,9 +254,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public unowned string get_preview_text ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public FontSelectionDialog (Gtk.Window parent, string title);
+		public unowned string get_preview_text ();
 		public void set_preview_text (string text);
 		[NoAccessorMethod]
 		public bool bold { get; set; }
@@ -296,9 +296,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class GetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public unowned string get_password ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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);
@@ -324,10 +324,10 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class LoginDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public unowned string get_password ();
-		public unowned string get_username ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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)]
 		public LoginDialog.with_default (Gtk.Window parent, string name, string password);
@@ -365,9 +365,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class NumberEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public int get_value ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public NumberEditor (int min, int max);
+		public int get_value ();
 		public void set_range (int min, int max);
 		public void set_value (int value);
 		public int value { get; set; }
@@ -390,14 +390,14 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class RangeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public RangeEditor ();
 		public int get_higher ();
 		public int get_lower ();
 		public int get_max ();
 		public int get_min ();
 		public void get_range (int start, int end);
 		public unowned string get_separator ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public RangeEditor ();
 		public void set_higher (int value);
 		public void set_limits (int start, int end);
 		public void set_lower (int value);
@@ -415,11 +415,11 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Seekbar : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Seekbar ();
 		public uint get_fraction ();
 		public int get_position ();
 		public int get_total_time ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Seekbar ();
 		public void set_fraction (uint fraction);
 		public void set_position (int time);
 		public void set_total_time (int time);
@@ -429,10 +429,10 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class SetPasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public unowned string get_password ();
-		public bool get_protected ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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)]
 		public SetPasswordDialog.with_default (Gtk.Window parent, string password, bool modify_protection);
@@ -445,12 +445,12 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class SortDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public SortDialog (Gtk.Window parent);
 		public int add_sort_key (string sort_key);
 		public int add_sort_key_reversed (string sort_key);
 		public int get_sort_key ();
 		public Gtk.SortType get_sort_order ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SortDialog (Gtk.Window parent);
 		public void set_sort_key (int key);
 		public void set_sort_order (Gtk.SortType order);
 		public int sort_key { get; set; }
@@ -458,6 +458,8 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimeEditor : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public TimeEditor ();
 		public uint get_duration_max ();
 		public uint get_duration_min ();
 		public bool get_duration_mode ();
@@ -467,8 +469,6 @@ namespace Hildon {
 		public uint get_ticks ();
 		public void get_time (uint hours, uint minutes, uint seconds);
 		public static void get_time_separators (Gtk.Label hm_sep_label, Gtk.Label ms_sep_label);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public TimeEditor ();
 		public void set_duration_max (uint duration_max);
 		public void set_duration_min (uint duration_min);
 		public void set_duration_mode (bool duration_mode);
@@ -487,9 +487,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class TimePicker : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public void get_time (uint hours, uint minutes);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public TimePicker (Gtk.Window parent);
+		public void get_time (uint hours, uint minutes);
 		public void set_time (uint hours, uint minutes);
 		[NoAccessorMethod]
 		public uint minutes { get; set; }
@@ -519,17 +519,17 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class VolumebarRange : Gtk.Scale, Atk.Implementor, Gtk.Buildable {
-		public double get_level ();
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public VolumebarRange (Gtk.Orientation orientation);
+		public double get_level ();
 		public void set_level (double level);
 		public double level { get; set; }
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class WeekdayPicker : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-		public bool isset_day (GLib.DateWeekday day);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public WeekdayPicker ();
+		public bool isset_day (GLib.DateWeekday day);
 		public void set_all ();
 		public void set_day (GLib.DateWeekday day);
 		public void toggle_day (GLib.DateWeekday day);
@@ -539,12 +539,12 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon.h")]
 	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Window ();
 		public void add_toolbar (Gtk.Toolbar toolbar);
 		public void add_with_scrollbar (Gtk.Widget child);
 		public bool get_is_topmost ();
 		public unowned Gtk.Menu get_menu ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Window ();
 		public void remove_toolbar (Gtk.Toolbar toolbar);
 		public void set_menu (Gtk.Menu menu);
 		public bool is_topmost { get; }
@@ -565,7 +565,7 @@ namespace Hildon {
 	public interface BreadCrumb : Gtk.Widget {
 		public void activated ();
 		public abstract void get_natural_size (int width, int height);
-		public virtual signal void crumb_activated ();
+		public signal void crumb_activated ();
 	}
 	[CCode (cprefix = "HILDON_CALENDAR_", has_type_id = "0", cheader_filename = "hildon/hildon.h")]
 	[Flags]
diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi
index ab6adbd87..bb7fdf4cb 100644
--- a/vapi/hildon-fm-2.vapi
+++ b/vapi/hildon-fm-2.vapi
@@ -4,6 +4,8 @@
 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)]
+		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);
 		public void focus_to_input ();
@@ -11,8 +13,6 @@ namespace Hildon {
 		public unowned string get_safe_folder ();
 		public unowned string get_safe_folder_uri ();
 		public bool get_show_upnp ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public FileChooserDialog (Gtk.Window parent, Gtk.FileChooserAction action);
 		public void set_extension (string extension);
 		public void set_safe_folder (string local_path);
 		public void set_safe_folder_uri (string uri);
@@ -42,9 +42,9 @@ namespace Hildon {
 	}
 	[CCode (cheader_filename = "hildon/hildon-file-details-dialog.h")]
 	public class FileDetailsDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-		public bool get_file_iter (out Gtk.TreeIter iter);
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		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)]
 		public FileDetailsDialog.with_model (Gtk.Window parent, Hildon.FileSystemModel model);
@@ -125,13 +125,13 @@ namespace Hildon {
 	[Compact]
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
 	public class FileSystemInfo {
+		[CCode (has_construct_function = false)]
+		public FileSystemInfo (string uri) throws GLib.Error;
 		public static void async_cancel (Hildon.FileSystemInfoHandle handle);
 		public static unowned Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback);
 		public unowned string get_display_name ();
 		public unowned Gdk.Pixbuf get_icon (Gtk.Widget ref_widget);
 		public unowned Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size);
-		[CCode (has_construct_function = false)]
-		public FileSystemInfo (string uri) throws GLib.Error;
 	}
 	[Compact]
 	[CCode (cheader_filename = "hildon/hildon-file-system-info.h")]
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 1cfab6201..47b35dee7 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -5,12 +5,12 @@ namespace Json {
 	[Compact]
 	[CCode (ref_function = "json_array_ref", unref_function = "json_array_unref", cheader_filename = "json-glib/json-glib.h")]
 	public class Array {
+		[CCode (has_construct_function = false)]
+		public Array ();
 		public void add_element (owned Json.Node node);
 		public unowned Json.Node get_element (uint index_);
 		public GLib.List<weak Json.Node> get_elements ();
 		public uint get_length ();
-		[CCode (has_construct_function = false)]
-		public Array ();
 		public void remove_element (uint index_);
 		public static unowned Json.Array sized_new (uint n_elements);
 	}
@@ -34,6 +34,8 @@ namespace Json {
 		public void* data;
 		public weak Json.Node parent;
 		public Json.NodeType type;
+		[CCode (has_construct_function = false)]
+		public Node (Json.NodeType type);
 		public Json.Node copy ();
 		public Json.Array dup_array ();
 		public Json.Object dup_object ();
@@ -47,8 +49,6 @@ namespace Json {
 		public unowned string get_string ();
 		public void get_value (out GLib.Value value);
 		public GLib.Type get_value_type ();
-		[CCode (has_construct_function = false)]
-		public Node (Json.NodeType type);
 		public void set_array (Json.Array array);
 		public void set_boolean (bool value);
 		public void set_double (double value);
@@ -63,18 +63,20 @@ namespace Json {
 	[Compact]
 	[CCode (ref_function = "json_object_ref", unref_function = "json_object_unref", cheader_filename = "json-glib/json-glib.h")]
 	public class Object {
+		[CCode (has_construct_function = false)]
+		public Object ();
 		public void add_member (string member_name, owned Json.Node node);
 		public unowned Json.Node get_member (string member_name);
 		public GLib.List<weak string> get_members ();
 		public uint get_size ();
 		public GLib.List<weak Json.Node> get_values ();
 		public bool has_member (string member_name);
-		[CCode (has_construct_function = false)]
-		public Object ();
 		public void remove_member (string member_name);
 	}
 	[CCode (cheader_filename = "json-glib/json-glib.h")]
 	public class Parser : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Parser ();
 		public static GLib.Quark error_quark ();
 		public uint get_current_line ();
 		public uint get_current_pos ();
@@ -82,8 +84,6 @@ namespace Json {
 		public bool has_assignment (out unowned string variable_name);
 		public bool load_from_data (string data, size_t length) throws GLib.Error;
 		public bool load_from_file (string filename) throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Parser ();
 		public virtual signal void array_element (Json.Array array, int index_);
 		public virtual signal void array_end (Json.Array array);
 		public virtual signal void array_start ();
diff --git a/vapi/libglade-2.0.vapi b/vapi/libglade-2.0.vapi
index 7b6eff273..8c6b81e05 100644
--- a/vapi/libglade-2.0.vapi
+++ b/vapi/libglade-2.0.vapi
@@ -35,7 +35,7 @@ namespace Glade {
 		public uint n_requires;
 		public uint n_toplevels;
 		public weak GLib.HashTable names;
-		public weak string requires;
+		public weak string @requires;
 		public weak GLib.HashTable strings;
 		public weak Glade.WidgetInfo toplevels;
 		public void dump (string filename);
@@ -78,6 +78,8 @@ namespace Glade {
 	[CCode (cheader_filename = "glade/glade.h")]
 	public class XML : GLib.Object {
 		public weak string filename;
+		[CCode (has_construct_function = false)]
+		public XML (string fname, string? root, string? domain);
 		public unowned Gtk.Widget build_widget (Glade.WidgetInfo info);
 		public bool @construct (string fname, string? root, string? domain);
 		public bool construct_from_buffer (string buffer, int size, string root, string domain);
@@ -90,8 +92,6 @@ namespace Glade {
 		public void handle_widget_prop (Gtk.Widget widget, string prop_name, string value_name);
 		[NoWrapper]
 		public virtual GLib.Type lookup_type (string gtypename);
-		[CCode (has_construct_function = false)]
-		public XML (string fname, string? root, string? domain);
 		public unowned string relative_file (string filename);
 		public void set_common_params (Gtk.Widget widget, Glade.WidgetInfo info);
 		public void set_packing_property (Gtk.Widget parent, Gtk.Widget child, string name, string value);
diff --git a/vapi/libgnome-2.0.vapi b/vapi/libgnome-2.0.vapi
index 462fef9e3..b2fd18379 100644
--- a/vapi/libgnome-2.0.vapi
+++ b/vapi/libgnome-2.0.vapi
@@ -25,12 +25,12 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnome/libgnome.h")]
 	public class Program : GLib.Object {
-		public static unowned Gnome.Program get ();
+		public static unowned Gnome.Program @get ();
 		public unowned string get_app_id ();
 		public unowned string get_app_version ();
 		public unowned string get_human_readable_name ();
 		public static unowned Gnome.Program init (string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 3.9)] string[] argv, ...);
-		public static unowned Gnome.Program init_paramv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, uint nparams, GLib.Parameter params);
+		public static unowned Gnome.Program init_paramv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, uint nparams, GLib.Parameter @params);
 		public static unowned Gnome.Program initv (GLib.Type type, string app_id, string app_version, Gnome.ModuleInfo module_info, [CCode (array_length_pos = 4.9)] string[] argv, string first_property_name, void* args);
 		public class uint install_property (GLib.ObjectGetPropertyFunc get_fn, GLib.ObjectSetPropertyFunc set_fn, GLib.ParamSpec pspec);
 		public unowned string locate_file (Gnome.FileDomain domain, string file_name, bool only_if_exists, GLib.SList ret_locations);
diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi
index de830905b..788397dfb 100644
--- a/vapi/libgnomeui-2.0.vapi
+++ b/vapi/libgnomeui-2.0.vapi
@@ -12,6 +12,8 @@ namespace Gnome {
 		public weak string prefix;
 		public weak Gtk.Widget statusbar;
 		public weak Gtk.Widget vbox;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public App (string appname, string title);
 		public void @construct (string appname, string title);
 		public void create_menus (Gnome.UIInfo uiinfo);
 		public void create_menus_custom (Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
@@ -37,8 +39,6 @@ namespace Gnome {
 		public static void install_appbar_menu_hints (Gnome.AppBar appbar, Gnome.UIInfo uiinfo);
 		public void install_menu_hints (Gnome.UIInfo uiinfo);
 		public static void install_statusbar_menu_hints (Gtk.Statusbar bar, Gnome.UIInfo uiinfo);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public App (string appname, string title);
 		public void remove_menu_range (string path, int start, int items);
 		public void remove_menus (string path, int items);
 		public void set_contents (Gtk.Widget contents);
@@ -52,6 +52,8 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class AppBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
+		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_clear_stack")]
 		public void clear_stack ();
 		[CCode (cname = "gnome_appbar_get_progress")]
@@ -60,8 +62,6 @@ namespace Gnome {
 		public unowned string get_response ();
 		[CCode (cname = "gnome_appbar_get_status")]
 		public unowned Gtk.Widget get_status ();
-		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
-		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_pop")]
 		public void pop ();
 		[CCode (cname = "gnome_appbar_push")]
@@ -120,6 +120,8 @@ namespace Gnome {
 		public uint state;
 		public weak GLib.List static_args;
 		public weak string user_id;
+		[CCode (has_construct_function = false)]
+		public Client ();
 		public void add_static_arg ();
 		public void flush ();
 		public unowned string get_config_prefix ();
@@ -129,8 +131,6 @@ namespace Gnome {
 		public unowned string get_id ();
 		public unowned string get_previous_id ();
 		public static unowned Gnome.ModuleInfo module_info_get ();
-		[CCode (has_construct_function = false)]
-		public Client ();
 		public void request_interaction (Gnome.DialogType dialog_type, Gnome.InteractFunction function, void* data);
 		public void request_interaction_interp (Gnome.DialogType dialog_type, Gtk.CallbackMarshal function, void* data, GLib.DestroyNotify destroy);
 		public void request_phase_2 ();
@@ -164,14 +164,14 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		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)]
 		public DateEdit.flags (ulong the_time, Gnome.DateEditFlags flags);
 		public int get_flags ();
 		public ulong get_initial_time ();
 		public ulong get_time ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public DateEdit (ulong the_time, bool show_time, bool use_24_format);
 		public void set_flags (Gnome.DateEditFlags flags);
 		public void set_popup_range (int low_hour, int up_hour);
 		public void set_time (ulong the_time);
@@ -193,6 +193,8 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconEntry (string history_id, string browse_dialog_title);
 		public void @construct (string history_id, string browse_dialog_title);
 		public unowned string get_filename ();
 		[CCode (cname = "gnome_icon_entry_pick_dialog")]
@@ -200,8 +202,6 @@ namespace Gnome {
 		public unowned Gtk.Widget gnome_entry ();
 		public unowned Gtk.Widget gnome_file_entry ();
 		public unowned Gtk.Widget gtk_entry ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconEntry (string history_id, string browse_dialog_title);
 		public void set_browse_dialog_title (string browse_dialog_title);
 		public bool set_filename (string filename);
 		public void set_history_id (string history_id);
@@ -222,14 +222,14 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class IconSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public IconSelection ();
 		public void add_defaults ();
 		public void add_directory (string dir);
 		public void clear (bool not_shown);
 		public unowned Gtk.Widget get_box ();
 		public unowned Gtk.Widget get_gil ();
 		public unowned string get_icon (bool full_path);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconSelection ();
 		public void select_icon (string filename);
 		public void show_icons ();
 		public void stop_loading ();
@@ -237,14 +237,14 @@ namespace Gnome {
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
 		public weak Gnome.PasswordDialogDetails details;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
 		public bool anon_selected ();
 		public unowned string get_domain ();
 		public unowned string get_new_password ();
 		public unowned string get_password ();
 		public Gnome.PasswordDialogRemember get_remember ();
 		public unowned string get_username ();
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
 		public bool run_and_block ();
 		public void set_domain (string domain);
 		public void set_new_password (string password);
@@ -298,13 +298,13 @@ namespace Gnome {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public class ThumbnailFactory : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public ThumbnailFactory (Gnome.ThumbnailSize size);
 		public bool can_thumbnail (string uri, string mime_type, ulong mtime);
 		public void create_failed_thumbnail (string uri, ulong mtime);
 		public unowned Gdk.Pixbuf generate_thumbnail (string uri, string mime_type);
 		public bool has_valid_failed_thumbnail (string uri, ulong mtime);
 		public unowned string lookup (string uri, ulong mtime);
-		[CCode (has_construct_function = false)]
-		public ThumbnailFactory (Gnome.ThumbnailSize size);
 		public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
 	}
 	[Compact]
diff --git a/vapi/libnotify.vapi b/vapi/libnotify.vapi
index 5ba1bff62..d5605ec3a 100644
--- a/vapi/libnotify.vapi
+++ b/vapi/libnotify.vapi
@@ -4,14 +4,14 @@
 namespace Notify {
 	[CCode (cheader_filename = "libnotify/notify.h")]
 	public class Notification : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Notification (string summary, string? body, string? icon, Gtk.Widget? attach);
 		public void add_action (string action, string label, owned Notify.ActionCallback callback);
 		public void attach_to_status_icon (Gtk.StatusIcon status_icon);
 		public void attach_to_widget (Gtk.Widget attach);
 		public void clear_actions ();
 		public void clear_hints ();
 		public bool close () throws GLib.Error;
-		[CCode (has_construct_function = false)]
-		public Notification (string summary, string? body, string? icon, Gtk.Widget? attach);
 		public void set_category (string category);
 		public void set_geometry_hints (Gdk.Screen screen, int x, int y);
 		public void set_hint_byte (string key, uchar value);
diff --git a/vapi/liboobs-1.vapi b/vapi/liboobs-1.vapi
index 89e44c9b3..5ee09882e 100644
--- a/vapi/liboobs-1.vapi
+++ b/vapi/liboobs-1.vapi
@@ -4,13 +4,13 @@
 namespace Oobs {
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Group : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Group (string name);
 		public void add_user (Oobs.User user);
 		public void clear_users ();
 		public long get_gid ();
 		public unowned string get_name ();
 		public unowned GLib.List get_users ();
-		[CCode (has_construct_function = false)]
-		public Group (string name);
 		public void remove_user (Oobs.User user);
 		public void set_crypted_password (string crypted_password);
 		public void set_gid (long gid);
@@ -23,7 +23,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class GroupsConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned Oobs.List get_groups ();
 		[NoAccessorMethod]
 		public int maximum_gid { get; set; }
@@ -32,7 +32,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class HostsConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned GLib.List get_dns_servers ();
 		public unowned string get_domainname ();
 		public unowned string get_hostname ();
@@ -158,7 +158,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class IfacesConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned GLib.List get_available_configuration_methods ();
 		public unowned GLib.List get_available_key_types ();
 		public unowned GLib.List get_available_ppp_types ();
@@ -168,14 +168,14 @@ namespace Oobs {
 	public class List : GLib.Object {
 		public void append (Oobs.ListIter iter);
 		public void clear ();
-		public unowned GLib.Object get (Oobs.ListIter iter);
+		public unowned GLib.Object @get (Oobs.ListIter iter);
 		public bool get_iter_first (Oobs.ListIter iter);
 		public int get_n_items ();
 		public void insert_after (Oobs.ListIter anchor, Oobs.ListIter iter);
 		public void insert_before (Oobs.ListIter anchor, Oobs.ListIter iter);
 		public void prepend (Oobs.ListIter iter);
 		public bool remove (Oobs.ListIter iter);
-		public void set (Oobs.ListIter iter, void* data);
+		public void @set (Oobs.ListIter iter, void* data);
 		public void* contained_type { construct; }
 	}
 	[Compact]
@@ -188,19 +188,19 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NFSConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned Oobs.List get_shares ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NTPConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned Oobs.List get_servers ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class NTPServer : GLib.Object {
-		public unowned string get_hostname ();
 		[CCode (has_construct_function = false)]
 		public NTPServer (string hostname);
+		public unowned string get_hostname ();
 		public void set_hostname (string hostname);
 		public string hostname { get; set; }
 	}
@@ -230,7 +230,7 @@ namespace Oobs {
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class SMBConfig : Oobs.Object {
 		public void delete_user_password (Oobs.User user);
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned string get_description ();
 		public bool get_is_wins_server ();
 		public unowned Oobs.List get_shares ();
@@ -249,7 +249,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class SelfConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned Oobs.User get_user ();
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
@@ -261,7 +261,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ServicesConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned Oobs.ServicesRunlevel get_default_runlevel ();
 		public unowned GLib.List get_runlevels ();
 		public unowned Oobs.List get_services ();
@@ -275,7 +275,7 @@ namespace Oobs {
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class Session : GLib.Object {
 		public Oobs.Result commit ();
-		public static unowned Oobs.Session get ();
+		public static unowned Oobs.Session @get ();
 		public unowned string get_authentication_action ();
 		public bool get_connected ();
 		public Oobs.Result get_platform (string platform);
@@ -298,19 +298,19 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareNFS : Oobs.Share {
-		public void add_acl_element (string element, bool read_only);
-		public unowned GLib.SList get_acl ();
 		[CCode (type = "OobsShare*", has_construct_function = false)]
 		public ShareNFS (string path);
+		public void add_acl_element (string element, bool read_only);
+		public unowned GLib.SList get_acl ();
 		public void set_acl (GLib.SList acl);
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class ShareSMB : Oobs.Share {
+		[CCode (type = "OobsShare*", has_construct_function = false)]
+		public ShareSMB (string path, string name, string comment, Oobs.ShareSMBFlags flags);
 		public unowned string get_comment ();
 		public Oobs.ShareSMBFlags get_flags ();
 		public unowned string get_name ();
-		[CCode (type = "OobsShare*", has_construct_function = false)]
-		public ShareSMB (string path, string name, string comment, Oobs.ShareSMBFlags flags);
 		public void set_comment (string comment);
 		public void set_flags (Oobs.ShareSMBFlags flags);
 		public void set_name (string name);
@@ -320,17 +320,17 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class StaticHost : GLib.Object {
-		public unowned GLib.List get_aliases ();
-		public unowned string get_ip_address ();
 		[CCode (has_construct_function = false)]
 		public StaticHost (string ip_address, GLib.List aliases);
+		public unowned GLib.List get_aliases ();
+		public unowned string get_ip_address ();
 		public void set_aliases (GLib.List aliases);
 		public void set_ip_address (string ip_address);
 		public string ip_address { get; set; }
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class TimeConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public void get_time (int year, int month, int day, int hour, int minute, int second);
 		public unowned string get_timezone ();
 		public long get_unix_time ();
@@ -344,6 +344,8 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class User : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public User (string name);
 		public bool get_active ();
 		public unowned string get_full_name ();
 		public unowned string get_home_directory ();
@@ -355,8 +357,6 @@ namespace Oobs {
 		public unowned string get_shell ();
 		public long get_uid ();
 		public unowned string get_work_phone_number ();
-		[CCode (has_construct_function = false)]
-		public User (string name);
 		public void set_crypted_password (string crypted_password);
 		public void set_full_name (string full_name);
 		public void set_home_directory (string home_directory);
@@ -387,7 +387,7 @@ namespace Oobs {
 	}
 	[CCode (cheader_filename = "oobs/oobs.h")]
 	public class UsersConfig : Oobs.Object {
-		public static unowned Oobs.Object get ();
+		public static unowned Oobs.Object @get ();
 		public unowned GLib.List get_available_shells ();
 		public unowned Oobs.Group get_default_group ();
 		public unowned string get_default_home_dir ();
diff --git a/vapi/libsexy.vapi b/vapi/libsexy.vapi
index 3ab335b0d..83a1ec234 100644
--- a/vapi/libsexy.vapi
+++ b/vapi/libsexy.vapi
@@ -4,11 +4,11 @@
 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)]
+		public IconEntry ();
 		public void add_clear_button ();
 		public unowned Gtk.Image get_icon (Sexy.IconEntryPosition position);
 		public bool get_icon_highlight (Sexy.IconEntryPosition position);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public IconEntry ();
 		public void set_icon (Sexy.IconEntryPosition position, Gtk.Image? icon);
 		public void set_icon_highlight (Sexy.IconEntryPosition position, bool highlight);
 		public virtual signal void icon_pressed (int icon_pos, int button);
@@ -16,6 +16,8 @@ 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)]
+		public SpellEntry ();
 		public void activate_default_languages ();
 		public bool activate_language (string lang) throws GLib.Error;
 		public void deactivate_language (string lang);
@@ -24,8 +26,6 @@ namespace Sexy {
 		public unowned GLib.SList get_languages ();
 		public bool is_checked ();
 		public bool language_is_active (string lang);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public SpellEntry ();
 		public bool set_active_languages (GLib.SList langs) throws GLib.Error;
 		public void set_checked (bool checked);
 		public virtual signal bool word_check (string word);
diff --git a/vapi/libsoup-2.2.vapi b/vapi/libsoup-2.2.vapi
index 939c336c8..7856d13ad 100644
--- a/vapi/libsoup-2.2.vapi
+++ b/vapi/libsoup-2.2.vapi
@@ -5,13 +5,13 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Address : GLib.Object {
 		[CCode (has_construct_function = false)]
+		public Address (string name, uint port);
+		[CCode (has_construct_function = false)]
 		public Address.any (Soup.AddressFamily family, uint port);
 		public unowned string get_name ();
 		public unowned string get_physical ();
 		public uint get_port ();
 		public void* get_sockaddr (int len);
-		[CCode (has_construct_function = false)]
-		public Address (string name, uint port);
 		public void resolve_async (Soup.AddressCallback callback);
 		public void resolve_async_full (GLib.MainContext async_context, Soup.AddressCallback callback);
 		public uint resolve_sync ();
@@ -19,13 +19,13 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Connection : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Connection (string propname1);
 		public void connect_async (Soup.ConnectionCallback callback);
 		public uint connect_sync ();
 		public void disconnect ();
 		public bool is_in_use ();
 		public ulong last_used ();
-		[CCode (has_construct_function = false)]
-		public Connection (string propname1);
 		public void release ();
 		public void reserve ();
 		public virtual void send_request (Soup.Message req);
@@ -58,6 +58,8 @@ namespace Soup {
 		public weak GLib.HashTable response_headers;
 		public Soup.MessageStatus status;
 		public uint status_code;
+		[CCode (has_construct_function = false)]
+		public Message (string method, string uri_string);
 		public void add_chunk (Soup.Ownership owner, owned string body, uint length);
 		public void add_final_chunk ();
 		public void add_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
@@ -80,8 +82,6 @@ namespace Soup {
 		public void io_stop ();
 		public void io_unpause ();
 		public bool is_keepalive ();
-		[CCode (has_construct_function = false)]
-		public Message (string method, string uri_string);
 		public void read_request (Soup.Socket sock);
 		public void remove_handler (Soup.HandlerPhase phase, Soup.MessageCallbackFn handler_cb);
 		public static void remove_header (GLib.HashTable hash, string name);
@@ -117,11 +117,11 @@ namespace Soup {
 	[Compact]
 	[CCode (free_function = "soup_message_queue_destroy", cheader_filename = "libsoup/soup.h")]
 	public class MessageQueue {
+		[CCode (has_construct_function = false)]
+		public MessageQueue ();
 		public void append (Soup.Message msg);
 		public unowned Soup.Message first (Soup.MessageQueueIter iter);
 		public void free_iter (Soup.MessageQueueIter iter);
-		[CCode (has_construct_function = false)]
-		public MessageQueue ();
 		public unowned Soup.Message next (Soup.MessageQueueIter iter);
 		public unowned Soup.Message remove (Soup.MessageQueueIter iter);
 		public void remove_message (Soup.Message msg);
@@ -138,6 +138,8 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Server (string optname1, ...);
 		public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, void* data);
 		public unowned GLib.MainContext get_async_context ();
 		public unowned Soup.ServerHandler get_handler (string path);
@@ -145,8 +147,6 @@ namespace Soup {
 		public uint get_port ();
 		public unowned Soup.Protocol get_protocol ();
 		public unowned GLib.SList list_handlers ();
-		[CCode (has_construct_function = false)]
-		public Server (string optname1, ...);
 		public void quit ();
 		public void remove_handler (string path);
 		public void run ();
@@ -166,10 +166,10 @@ namespace Soup {
 		public weak Soup.ServerAuthBasic basic;
 		public weak Soup.ServerAuthDigest digest;
 		public Soup.AuthType type;
-		public bool check_passwd (string passwd);
-		public unowned string get_user ();
 		[CCode (has_construct_function = false)]
 		public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
+		public bool check_passwd (string passwd);
+		public unowned string get_user ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -227,13 +227,13 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class ServerMessage : Soup.Message {
+		[CCode (has_construct_function = false)]
+		public ServerMessage (Soup.Server server);
 		public void finish ();
 		public Soup.TransferEncoding get_encoding ();
 		public unowned Soup.Server get_server ();
 		public bool is_finished ();
 		public bool is_started ();
-		[CCode (has_construct_function = false)]
-		public ServerMessage (Soup.Server server);
 		public void set_encoding (Soup.TransferEncoding encoding);
 		public void start ();
 	}
@@ -294,6 +294,8 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Socket : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Socket (string optname1);
 		public static unowned Soup.Socket client_new_async (string hostname, uint port, void* ssl_creds, Soup.SocketCallback callback);
 		public static unowned Soup.Socket client_new_sync (string hostname, uint port, void* ssl_creds, uint status_ret);
 		public uint connect (Soup.Address remote_addr);
@@ -302,8 +304,6 @@ namespace Soup {
 		public unowned Soup.Address get_remote_address ();
 		public bool is_connected ();
 		public bool listen (Soup.Address local_addr);
-		[CCode (has_construct_function = false)]
-		public Socket (string optname1);
 		public Soup.SocketIOStatus read (void* buffer, size_t len, size_t nread);
 		public Soup.SocketIOStatus read_until (void* buffer, size_t len, void* boundary, size_t boundary_len, size_t nread, bool got_boundary);
 		public static unowned Soup.Socket server_new (Soup.Address local_addr, void* ssl_creds, Soup.SocketListenerCallback callback);
@@ -344,13 +344,13 @@ namespace Soup {
 		public weak Soup.Protocol protocol;
 		public weak string query;
 		public weak string user;
+		[CCode (has_construct_function = false)]
+		public Uri (string uri_string);
 		public Soup.Uri copy ();
 		public unowned Soup.Uri copy_root ();
 		public static void decode (string part);
 		public static string encode (string part, string escape_extra);
 		public bool equal (Soup.Uri uri2);
-		[CCode (has_construct_function = false)]
-		public Uri (string uri_string);
 		public unowned string to_string (bool just_path);
 		public bool uses_default_port ();
 		[CCode (has_construct_function = false)]
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index a08d4823c..4630e1e13 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -5,6 +5,8 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Address : GLib.Object {
 		[CCode (has_construct_function = false)]
+		public Address (string name, uint port);
+		[CCode (has_construct_function = false)]
 		public Address.any (Soup.AddressFamily family, uint port);
 		public static bool equal_by_ip (void* addr1, void* addr2);
 		public static bool equal_by_name (void* addr1, void* addr2);
@@ -17,8 +19,6 @@ namespace Soup {
 		public static uint hash_by_ip (void* addr);
 		public static uint hash_by_name (void* addr);
 		public bool is_resolved ();
-		[CCode (has_construct_function = false)]
-		public Address (string name, uint port);
 		public void resolve_async (GLib.MainContext async_context, GLib.Cancellable cancellable, Soup.AddressCallback callback);
 		public uint resolve_sync (GLib.Cancellable cancellable);
 		[NoAccessorMethod]
@@ -30,6 +30,8 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Auth : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
 		public virtual void authenticate (string username, string password);
 		public void free_protection_space (GLib.SList space);
 		public virtual unowned string get_authorization (Soup.Message msg);
@@ -38,8 +40,6 @@ namespace Soup {
 		public virtual unowned GLib.SList get_protection_space (Soup.URI source_uri);
 		public unowned string get_realm ();
 		public unowned string get_scheme_name ();
-		[CCode (has_construct_function = false)]
-		public Auth (GLib.Type type, Soup.Message msg, string auth_header);
 		public virtual bool update (Soup.Message msg, string auth_header);
 		public string host { get; construct; }
 		[NoAccessorMethod]
@@ -85,9 +85,9 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class AuthDomainDigest : Soup.AuthDomain {
-		public static unowned string encode_password (string username, string realm, string password);
 		[CCode (type = "SoupAuthDomain*", has_construct_function = false)]
 		public AuthDomainDigest (string optname1);
+		public static unowned string encode_password (string username, string realm, string password);
 		public static void set_auth_callback (Soup.AuthDomain domain, Soup.AuthDomainDigestAuthCallback callback, GLib.DestroyNotify dnotify);
 		[NoAccessorMethod]
 		public void* auth_callback { get; set; }
@@ -99,10 +99,10 @@ namespace Soup {
 	public class Buffer {
 		public weak string data;
 		public size_t length;
-		public Soup.Buffer copy ();
-		public void* get_owner ();
 		[CCode (has_construct_function = false)]
 		public Buffer (Soup.MemoryUse use, void* data, size_t length);
+		public Soup.Buffer copy ();
+		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)]
@@ -131,11 +131,11 @@ namespace Soup {
 		public weak string path;
 		public bool secure;
 		public weak string value;
+		[CCode (has_construct_function = false)]
+		public Cookie (string name, string value, string domain, string path, int max_age);
 		public bool applies_to_uri (Soup.URI uri);
 		public Soup.Cookie copy ();
 		public bool equal (Soup.Cookie cookie2);
-		[CCode (has_construct_function = false)]
-		public Cookie (string name, string value, string domain, string path, int max_age);
 		public static unowned Soup.Cookie parse (string header, Soup.URI origin);
 		public void set_domain (string domain);
 		public void set_expires (Soup.Date expires);
@@ -150,12 +150,12 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class CookieJar : GLib.Object, Soup.SessionFeature {
+		[CCode (has_construct_function = false)]
+		public CookieJar ();
 		public void add_cookie (Soup.Cookie cookie);
 		public unowned GLib.SList all_cookies ();
 		public void delete_cookie (Soup.Cookie cookie);
 		public unowned string get_cookies (Soup.URI uri, bool for_http);
-		[CCode (has_construct_function = false)]
-		public CookieJar ();
 		public virtual void save ();
 		public void set_cookie (Soup.URI uri, string cookie);
 		[NoAccessorMethod]
@@ -180,6 +180,8 @@ namespace Soup {
 		public int second;
 		public bool utc;
 		public int year;
+		[CCode (has_construct_function = false)]
+		public Date (int year, int month, int day, int hour, int minute, int second);
 		public Soup.Date copy ();
 		[CCode (has_construct_function = false)]
 		public Date.from_now (int offset_seconds);
@@ -188,8 +190,6 @@ namespace Soup {
 		[CCode (has_construct_function = false)]
 		public Date.from_time_t (ulong when);
 		public bool is_past ();
-		[CCode (has_construct_function = false)]
-		public Date (int year, int month, int day, int hour, int minute, int second);
 		public unowned string to_string (Soup.DateFormat format);
 		public ulong to_time_t ();
 		public void to_timeval (GLib.TimeVal time);
@@ -208,6 +208,8 @@ namespace Soup {
 		public weak Soup.MessageHeaders request_headers;
 		public weak Soup.MessageBody response_body;
 		public weak Soup.MessageHeaders response_headers;
+		[CCode (has_construct_function = false)]
+		public Message (string method, string uri_string);
 		public uint add_header_handler (string @signal, string header, GLib.Callback callback);
 		public uint add_status_code_handler (string @signal, uint status_code, GLib.Callback callback);
 		[CCode (has_construct_function = false)]
@@ -217,8 +219,6 @@ namespace Soup {
 		public Soup.HTTPVersion get_http_version ();
 		public unowned Soup.URI get_uri ();
 		public bool is_keepalive ();
-		[CCode (has_construct_function = false)]
-		public Message (string method, string uri_string);
 		public void set_chunk_allocator (Soup.ChunkAllocator allocator, GLib.DestroyNotify destroy_notify);
 		public void set_flags (Soup.MessageFlags flags);
 		public void set_http_version (Soup.HTTPVersion version);
@@ -266,6 +266,8 @@ namespace Soup {
 	public class MessageBody {
 		public weak string data;
 		public int64 length;
+		[CCode (has_construct_function = false)]
+		public MessageBody ();
 		public void append (Soup.MemoryUse use, void* data, size_t length);
 		public void append_buffer (Soup.Buffer buffer);
 		public void complete ();
@@ -273,8 +275,6 @@ namespace Soup {
 		public bool get_accumulate ();
 		public unowned Soup.Buffer get_chunk (int64 offset);
 		public void got_chunk (Soup.Buffer chunk);
-		[CCode (has_construct_function = false)]
-		public MessageBody ();
 		public void set_accumulate (bool accumulate);
 		public void truncate ();
 		public void wrote_chunk (Soup.Buffer chunk);
@@ -282,26 +282,26 @@ namespace Soup {
 	[Compact]
 	[CCode (type_id = "SOUP_TYPE_MESSAGE_HEADERS", cheader_filename = "libsoup/soup.h")]
 	public class MessageHeaders {
+		[CCode (has_construct_function = false)]
+		public MessageHeaders (Soup.MessageHeadersType type);
 		public void append (string name, string value);
 		public void clear ();
 		public void @foreach (Soup.MessageHeadersForeachFunc func);
 		public void free_ranges (Soup.Range ranges);
-		public unowned string get (string name);
-		public bool get_content_disposition (out unowned string disposition, GLib.HashTable params);
+		public unowned string @get (string name);
+		public bool get_content_disposition (out unowned string disposition, GLib.HashTable @params);
 		public int64 get_content_length ();
 		public bool get_content_range (int64 start, int64 end, int64 total_length);
-		public unowned string get_content_type (GLib.HashTable params);
+		public unowned string get_content_type (GLib.HashTable @params);
 		public Soup.Encoding get_encoding ();
 		public Soup.Expectation get_expectations ();
 		public bool get_ranges (int64 total_length, out unowned Soup.Range ranges, int length);
-		[CCode (has_construct_function = false)]
-		public MessageHeaders (Soup.MessageHeadersType type);
 		public void remove (string name);
 		public void replace (string name, string value);
-		public void set_content_disposition (string disposition, GLib.HashTable params);
+		public void set_content_disposition (string disposition, GLib.HashTable @params);
 		public void set_content_length (int64 content_length);
 		public void set_content_range (int64 start, int64 end, int64 total_length);
-		public void set_content_type (string content_type, GLib.HashTable params);
+		public void set_content_type (string content_type, GLib.HashTable @params);
 		public void set_encoding (Soup.Encoding encoding);
 		public void set_expectations (Soup.Expectation expectations);
 		public void set_range (int64 start, int64 end);
@@ -317,6 +317,8 @@ namespace Soup {
 	[Compact]
 	[CCode (type_id = "SOUP_TYPE_MULTIPART", cheader_filename = "libsoup/soup.h")]
 	public class Multipart {
+		[CCode (has_construct_function = false)]
+		public Multipart (string mime_type);
 		public void append_form_file (string control_name, string filename, string content_type, Soup.Buffer body);
 		public void append_form_string (string control_name, string data);
 		public void append_part (Soup.MessageHeaders headers, Soup.Buffer body);
@@ -324,8 +326,6 @@ namespace Soup {
 		public Multipart.from_message (Soup.MessageHeaders headers, Soup.MessageBody body);
 		public int get_length ();
 		public bool get_part (int part, out unowned Soup.MessageHeaders headers, out unowned Soup.Buffer body);
-		[CCode (has_construct_function = false)]
-		public Multipart (string mime_type);
 		public void to_message (Soup.MessageHeaders dest_headers, Soup.MessageBody dest_body);
 	}
 	[Compact]
@@ -336,14 +336,14 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Server : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Server (string optname1, ...);
 		public void add_auth_domain (Soup.AuthDomain auth_domain);
 		public void add_handler (string path, owned Soup.ServerCallback callback);
 		public unowned GLib.MainContext get_async_context ();
 		public unowned Soup.Socket get_listener ();
 		public uint get_port ();
 		public bool is_https ();
-		[CCode (has_construct_function = false)]
-		public Server (string optname1, ...);
 		public void pause_message (Soup.Message msg);
 		public void quit ();
 		public void remove_auth_domain (Soup.AuthDomain auth_domain);
@@ -423,6 +423,8 @@ namespace Soup {
 	}
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public class Socket : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Socket (string optname1);
 		public void connect_async (GLib.Cancellable cancellable, Soup.SocketCallback callback);
 		public uint connect_sync (GLib.Cancellable cancellable);
 		public void disconnect ();
@@ -431,8 +433,6 @@ namespace Soup {
 		public bool is_connected ();
 		public bool is_ssl ();
 		public bool listen ();
-		[CCode (has_construct_function = false)]
-		public Socket (string optname1);
 		public Soup.SocketIOStatus read (void* buffer, size_t len, size_t nread, GLib.Cancellable cancellable) throws GLib.Error;
 		public Soup.SocketIOStatus read_until (void* buffer, size_t len, void* boundary, size_t boundary_len, size_t nread, bool got_boundary, GLib.Cancellable cancellable) throws GLib.Error;
 		public bool start_proxy_ssl (string ssl_host, GLib.Cancellable cancellable);
@@ -466,12 +466,12 @@ namespace Soup {
 		public weak string query;
 		public weak string scheme;
 		public weak string user;
+		[CCode (has_construct_function = false)]
+		public URI (string uri_string);
 		public Soup.URI copy ();
 		public static string decode (string part);
 		public static string encode (string part, string? escape_extra);
 		public bool equal (Soup.URI uri2);
-		[CCode (has_construct_function = false)]
-		public URI (string uri_string);
 		public static string normalize (string part, string unescape_extra);
 		public void set_fragment (string fragment);
 		public void set_host (string host);
@@ -985,7 +985,7 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static unowned string xmlrpc_build_fault (int fault_code, string fault_format, ...);
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] params);
+	public static unowned string xmlrpc_build_method_call (string method_name, GLib.Value[] @params);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static unowned string xmlrpc_build_method_response (GLib.Value value);
 	[CCode (cheader_filename = "libsoup/soup.h")]
@@ -997,7 +997,7 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static GLib.Quark xmlrpc_fault_quark ();
 	[CCode (cheader_filename = "libsoup/soup.h")]
-	public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray params);
+	public static bool xmlrpc_parse_method_call (string method_call, int length, out unowned string method_name, out unowned GLib.ValueArray @params);
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	public static bool xmlrpc_parse_method_response (string method_response, int length, GLib.Value value) throws GLib.Error;
 	[CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
diff --git a/vapi/libwnck-1.0.vapi b/vapi/libwnck-1.0.vapi
index 8664fc3e6..cbb620783 100644
--- a/vapi/libwnck-1.0.vapi
+++ b/vapi/libwnck-1.0.vapi
@@ -19,7 +19,7 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Application : GLib.Object {
-		public static unowned Wnck.Application get (ulong xwindow);
+		public static unowned Wnck.Application @get (ulong xwindow);
 		public unowned Gdk.Pixbuf get_icon ();
 		public bool get_icon_is_fallback ();
 		public unowned string get_icon_name ();
@@ -43,7 +43,7 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class ClassGroup : GLib.Object {
-		public static unowned Wnck.ClassGroup get (string res_class);
+		public static unowned Wnck.ClassGroup @get (string res_class);
 		public unowned Gdk.Pixbuf get_icon ();
 		public unowned Gdk.Pixbuf get_mini_icon ();
 		public unowned string get_name ();
@@ -110,7 +110,7 @@ namespace Wnck {
 		public void change_workspace_count (int count);
 		public void force_update ();
 		public static void free_workspace_layout (Wnck.WorkspaceLayout layout);
-		public static unowned Wnck.Screen get (int index);
+		public static unowned Wnck.Screen @get (int index);
 		public unowned Wnck.Window get_active_window ();
 		public unowned Wnck.Workspace get_active_workspace ();
 		public ulong get_background_pixmap ();
@@ -175,11 +175,11 @@ namespace Wnck {
 	}
 	[CCode (cheader_filename = "libwnck/libwnck.h")]
 	public class Tasklist : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Tasklist (Wnck.Screen screen);
 		public int get_minimum_height ();
 		public int get_minimum_width ();
 		public int get_size_hint_list (int n_elements);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Tasklist (Wnck.Screen screen);
 		[NoWrapper]
 		public virtual void pad1 ();
 		[NoWrapper]
@@ -203,7 +203,7 @@ namespace Wnck {
 		public void activate (uint32 timestamp);
 		public void activate_transient (uint32 timestamp);
 		public void close (uint32 timestamp);
-		public static unowned Wnck.Window get (ulong xwindow);
+		public static unowned Wnck.Window @get (ulong xwindow);
 		public Wnck.WindowActions get_actions ();
 		public unowned Wnck.Application get_application ();
 		public unowned Wnck.ClassGroup get_class_group ();
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index aec5b6110..0fb6ecbaa 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -49,7 +49,7 @@ namespace Pango {
 	[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);
+		public unowned Pango.Attribute @get (Pango.AttrType type);
 		public unowned GLib.SList get_attrs ();
 		public void get_font (Pango.FontDescription desc, out unowned Pango.Language language, GLib.SList extra_attrs);
 		public bool next ();
@@ -65,14 +65,14 @@ namespace Pango {
 	[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 ();
 		public void change (Pango.Attribute attr);
 		public Pango.AttrList copy ();
 		public unowned Pango.AttrList filter (Pango.AttrFilterFunc func, void* data);
 		public unowned Pango.AttrIterator get_iterator ();
 		public void insert (owned Pango.Attribute attr);
 		public void insert_before (Pango.Attribute attr);
-		[CCode (has_construct_function = false)]
-		public AttrList ();
 		public void splice (Pango.AttrList other, int pos, int len);
 	}
 	[Compact]
@@ -114,6 +114,8 @@ namespace Pango {
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Context : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Context ();
 		public Pango.Direction get_base_dir ();
 		public Pango.Gravity get_base_gravity ();
 		public unowned Pango.FontDescription get_font_description ();
@@ -126,8 +128,6 @@ namespace Pango {
 		public void list_families (Pango.FontFamily[] families);
 		public unowned Pango.Font load_font (Pango.FontDescription desc);
 		public unowned Pango.Fontset load_fontset (Pango.FontDescription desc, Pango.Language language);
-		[CCode (has_construct_function = false)]
-		public Context ();
 		public void set_base_dir (Pango.Direction direction);
 		public void set_base_gravity (Pango.Gravity gravity);
 		public void set_font_description (Pango.FontDescription desc);
@@ -143,13 +143,13 @@ namespace Pango {
 	[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 ();
 		public Pango.Coverage copy ();
 		public static unowned Pango.Coverage from_bytes (uchar[] bytes);
-		public Pango.CoverageLevel get (int index_);
+		public Pango.CoverageLevel @get (int index_);
 		public void max (Pango.Coverage other);
-		[CCode (has_construct_function = false)]
-		public Coverage ();
-		public void set (int index_, Pango.CoverageLevel level);
+		public void @set (int index_, Pango.CoverageLevel level);
 		public void to_bytes (uchar[] bytes);
 	}
 	[Compact]
@@ -175,6 +175,8 @@ namespace Pango {
 	[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 ();
 		public bool better_match (Pango.FontDescription old_match, Pango.FontDescription new_match);
 		public Pango.FontDescription copy ();
 		public bool equal (Pango.FontDescription desc2);
@@ -191,8 +193,6 @@ namespace Pango {
 		public uint hash ();
 		public void merge (Pango.FontDescription desc_to_merge, bool replace_existing);
 		public void merge_static (Pango.FontDescription desc_to_merge, bool replace_existing);
-		[CCode (has_construct_function = false)]
-		public FontDescription ();
 		public void set_absolute_size (double size);
 		public void set_family (string family);
 		public void set_family_static (string family);
@@ -282,14 +282,14 @@ namespace Pango {
 		public int log_clusters;
 		public int num_glyphs;
 		public int space;
+		[CCode (has_construct_function = false)]
+		public GlyphString ();
 		public Pango.GlyphString copy ();
 		public void extents (Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public void extents_range (int start, int end, Pango.Font font, out Pango.Rectangle ink_rect, out Pango.Rectangle logical_rect);
 		public void get_logical_widths (string text, int length, int embedding_level, int logical_widths);
 		public int get_width ();
 		public void index_to_x (string text, int length, Pango.Analysis analysis, int index_, bool trailing, int x_pos);
-		[CCode (has_construct_function = false)]
-		public GlyphString ();
 		public void set_size (int new_len);
 		public void x_to_index (string text, int length, Pango.Analysis analysis, int x_pos, int index_, int trailing);
 	}
@@ -304,9 +304,9 @@ namespace Pango {
 		public int length;
 		public int num_chars;
 		public int offset;
-		public Pango.Item copy ();
 		[CCode (has_construct_function = false)]
 		public Item ();
+		public Pango.Item copy ();
 		public unowned Pango.Item split (int split_index, int split_offset);
 	}
 	[Compact]
@@ -322,6 +322,8 @@ namespace Pango {
 	}
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class Layout : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Layout (Pango.Context context);
 		public void context_changed ();
 		public Pango.Layout copy ();
 		public Pango.Alignment get_alignment ();
@@ -358,8 +360,6 @@ namespace Pango {
 		public bool is_ellipsized ();
 		public bool is_wrapped ();
 		public void move_cursor_visually (bool strong, int old_index, int old_trailing, int direction, int new_index, int new_trailing);
-		[CCode (has_construct_function = false)]
-		public Layout (Pango.Context context);
 		public void set_alignment (Pango.Alignment alignment);
 		public void set_attributes (Pango.AttrList attrs);
 		public void set_auto_dir (bool auto_dir);
@@ -459,21 +459,21 @@ namespace Pango {
 	[Compact]
 	[CCode (cheader_filename = "pango/pango.h")]
 	public class ScriptIter {
-		public void get_range (out unowned string start, out unowned string end, Pango.Script script);
 		[CCode (has_construct_function = false)]
 		public ScriptIter (string text, int length);
+		public void get_range (out unowned string start, out unowned string end, Pango.Script script);
 		public bool next ();
 	}
 	[Compact]
 	[CCode (copy_function = "pango_tab_array_copy", type_id = "PANGO_TYPE_TAB_ARRAY", cheader_filename = "pango/pango.h")]
 	public class TabArray {
+		[CCode (has_construct_function = false)]
+		public TabArray (int initial_size, bool positions_in_pixels);
 		public Pango.TabArray copy ();
 		public bool get_positions_in_pixels ();
 		public int get_size ();
 		public void get_tab (int tab_index, Pango.TabAlign alignment, int location);
 		public void get_tabs (out Pango.TabAlign alignments, int locations);
-		[CCode (has_construct_function = false)]
-		public TabArray (int initial_size, bool positions_in_pixels);
 		public void resize (int new_size);
 		public void set_tab (int tab_index, Pango.TabAlign alignment, int location);
 		[CCode (has_construct_function = false)]
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index ae52b396a..ef3b7c509 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -40,7 +40,7 @@ namespace Poppler {
 	[CCode (cheader_filename = "poppler.h")]
 	public class ActionLaunch {
 		public weak string file_name;
-		public weak string params;
+		public weak string @params;
 		public weak string title;
 		public Poppler.ActionType type;
 	}
@@ -138,9 +138,9 @@ namespace Poppler {
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class FontInfo : GLib.Object {
-		public void free ();
 		[CCode (has_construct_function = false)]
 		public FontInfo (Poppler.Document document);
+		public void free ();
 		public bool scan (int n_pages, out unowned Poppler.FontsIter iter);
 	}
 	[Compact]
@@ -191,28 +191,28 @@ namespace Poppler {
 	public class FormFieldMapping {
 		public weak Poppler.Rectangle area;
 		public weak Poppler.FormField field;
-		public Poppler.FormFieldMapping copy ();
 		[CCode (has_construct_function = false)]
 		public FormFieldMapping ();
+		public Poppler.FormFieldMapping copy ();
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_image_mapping_copy", type_id = "POPPLER_TYPE_IMAGE_MAPPING", cheader_filename = "poppler.h")]
 	public class ImageMapping {
 		public weak Poppler.Rectangle area;
 		public weak Gdk.Pixbuf image;
-		public Poppler.ImageMapping copy ();
 		[CCode (has_construct_function = false)]
 		public ImageMapping ();
+		public Poppler.ImageMapping copy ();
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_index_iter_copy", type_id = "POPPLER_TYPE_INDEX_ITER", cheader_filename = "poppler.h")]
 	public class IndexIter {
+		[CCode (has_construct_function = false)]
+		public IndexIter (Poppler.Document document);
 		public Poppler.IndexIter copy ();
 		public unowned Poppler.Action get_action ();
 		public unowned Poppler.IndexIter get_child ();
 		public bool is_open ();
-		[CCode (has_construct_function = false)]
-		public IndexIter (Poppler.Document document);
 		public bool next ();
 	}
 	[Compact]
@@ -220,15 +220,15 @@ namespace Poppler {
 	public class LinkMapping {
 		public weak Poppler.Action action;
 		public weak Poppler.Rectangle area;
-		public Poppler.LinkMapping copy ();
 		[CCode (has_construct_function = false)]
 		public LinkMapping ();
+		public Poppler.LinkMapping copy ();
 	}
 	[CCode (cheader_filename = "poppler.h")]
 	public class PSFile : GLib.Object {
-		public void free ();
 		[CCode (has_construct_function = false)]
 		public PSFile (Poppler.Document document, string filename, int first_page, int n_pages);
+		public void free ();
 		public void set_duplex (bool duplex);
 		public void set_paper_size (double width, double height);
 	}
@@ -268,9 +268,9 @@ namespace Poppler {
 		public bool rectangular;
 		public double scale;
 		public Poppler.PageTransitionType type;
-		public Poppler.PageTransition copy ();
 		[CCode (has_construct_function = false)]
 		public PageTransition ();
+		public Poppler.PageTransition copy ();
 	}
 	[Compact]
 	[CCode (copy_function = "poppler_rectangle_copy", type_id = "POPPLER_TYPE_RECTANGLE", cheader_filename = "poppler.h")]
@@ -279,9 +279,9 @@ namespace Poppler {
 		public double x2;
 		public double y1;
 		public double y2;
-		public Poppler.Rectangle copy ();
 		[CCode (has_construct_function = false)]
 		public Rectangle ();
+		public Poppler.Rectangle copy ();
 	}
 	[CCode (cprefix = "POPPLER_ACTION_", has_type_id = "0", cheader_filename = "poppler.h")]
 	public enum ActionType {
diff --git a/vapi/vte.vapi b/vapi/vte.vapi
index 63412fe13..310020226 100644
--- a/vapi/vte.vapi
+++ b/vapi/vte.vapi
@@ -18,7 +18,7 @@ namespace Vte {
 		[CCode (array_length = false)]
 		public weak int[] iopipe;
 		public static int add_child (GLib.Pid pid);
-		public static unowned Vte.Reaper get ();
+		public static unowned Vte.Reaper @get ();
 		public virtual signal void child_exited (int p0, int p1);
 	}
 	[CCode (cheader_filename = "vte/vte.h")]
@@ -32,6 +32,8 @@ namespace Vte {
 		public weak string icon_title;
 		public long row_count;
 		public weak string window_title;
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public Terminal ();
 		public void copy_primary ();
 		public void feed (string data, long length);
 		public void feed_child (string text, long length);
@@ -71,8 +73,6 @@ namespace Vte {
 		public void match_remove (int tag);
 		public void match_set_cursor (int tag, Gdk.Cursor cursor);
 		public void match_set_cursor_type (int tag, Gdk.CursorType cursor_type);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public Terminal ();
 		public void paste_primary ();
 		public void reset (bool full, bool clear_history);
 		public void select_all ();
diff --git a/vapi/webkit-1.0.vapi b/vapi/webkit-1.0.vapi
index 4b07f611d..09e4effe4 100644
--- a/vapi/webkit-1.0.vapi
+++ b/vapi/webkit-1.0.vapi
@@ -4,6 +4,8 @@
 namespace WebKit {
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class Download : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Download (WebKit.NetworkRequest request);
 		public void cancel ();
 		public uint64 get_current_size ();
 		public unowned string get_destination_uri ();
@@ -14,8 +16,6 @@ namespace WebKit {
 		public unowned string get_suggested_filename ();
 		public uint64 get_total_size ();
 		public unowned string get_uri ();
-		[CCode (has_construct_function = false)]
-		public Download (WebKit.NetworkRequest request);
 		public void set_destination_uri (string destination_uri);
 		public void start ();
 		public uint64 current_size { get; }
@@ -29,10 +29,10 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class NetworkRequest : GLib.Object {
-		public unowned Soup.Message get_message ();
-		public unowned string get_uri ();
 		[CCode (has_construct_function = false)]
 		public NetworkRequest (string uri);
+		public unowned Soup.Message get_message ();
+		public unowned string get_uri ();
 		public void set_uri (string uri);
 		public Soup.Message message { get; construct; }
 		public string uri { get; set; }
@@ -63,6 +63,8 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebFrame : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public WebFrame (WebKit.WebView web_view);
 		public unowned WebKit.WebFrame find_frame (string name);
 		public WebKit.LoadStatus get_load_status ();
 		public unowned string get_name ();
@@ -74,8 +76,6 @@ namespace WebKit {
 		public void load_request (WebKit.NetworkRequest request);
 		public void load_string (string content, string mime_type, string encoding, string base_uri);
 		public void load_uri (string uri);
-		[CCode (has_construct_function = false)]
-		public WebFrame (WebKit.WebView web_view);
 		public void print ();
 		public Gtk.PrintOperationResult print_full (Gtk.PrintOperation operation, Gtk.PrintOperationAction action) throws GLib.Error;
 		public void reload ();
@@ -92,13 +92,13 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebHistoryItem : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public WebHistoryItem ();
 		public unowned string get_alternate_title ();
 		public double get_last_visited_time ();
 		public unowned string get_original_uri ();
 		public unowned string get_title ();
 		public unowned string get_uri ();
-		[CCode (has_construct_function = false)]
-		public WebHistoryItem ();
 		public void set_alternate_title (string title);
 		[CCode (has_construct_function = false)]
 		public WebHistoryItem.with_data (string uri, string title);
@@ -144,9 +144,9 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebSettings : GLib.Object {
-		public WebKit.WebSettings copy ();
 		[CCode (has_construct_function = false)]
 		public WebSettings ();
+		public WebKit.WebSettings copy ();
 		[NoAccessorMethod]
 		public bool auto_load_images { get; set construct; }
 		[NoAccessorMethod]
@@ -204,6 +204,8 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+		[CCode (type = "GtkWidget*", has_construct_function = false)]
+		public WebView ();
 		public bool can_copy_clipboard ();
 		public bool can_cut_clipboard ();
 		public bool can_go_back ();
@@ -243,8 +245,6 @@ namespace WebKit {
 		public void load_string (string content, string mime_type, string encoding, string base_uri);
 		public void load_uri (string uri);
 		public uint mark_text_matches (string str, bool case_sensitive, uint limit);
-		[CCode (type = "GtkWidget*", has_construct_function = false)]
-		public WebView ();
 		public void open (string uri);
 		public void reload ();
 		public void reload_bypass_cache ();
@@ -317,9 +317,9 @@ namespace WebKit {
 	}
 	[CCode (cheader_filename = "webkit/webkit.h")]
 	public class WebWindowFeatures : GLib.Object {
-		public bool equal (WebKit.WebWindowFeatures features2);
 		[CCode (has_construct_function = false)]
 		public WebWindowFeatures ();
+		public bool equal (WebKit.WebWindowFeatures features2);
 		[NoAccessorMethod]
 		public bool fullscreen { get; set construct; }
 		[NoAccessorMethod]
diff --git a/vapigen/valagidlparser.vala b/vapigen/valagidlparser.vala
index 4c5df9770..c7e2e1a66 100644
--- a/vapigen/valagidlparser.vala
+++ b/vapigen/valagidlparser.vala
@@ -1131,6 +1131,7 @@ public class Vala.GIdlParser : CodeVisitor {
 				var sig = parse_signal ((IdlNodeSignal) member);
 				if (sig != null) {
 					iface.add_signal (sig);
+					sig.is_virtual = false;
 				}
 			}
 		}