Regenerate GIR-based bindingswip/girparser2

21 files changed, 93 insertions, 93 deletions

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 273a5cd3f..8beebf578 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -177,7 +177,7 @@ namespace Atk {
 		[Version (since = "2.12")]
 		public double get_upper_limit ();
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_registry_get_type ()")]
 	public class Registry : GLib.Object {
 		[Version (deprecated = true)]
 		public weak GLib.HashTable<GLib.Type,Atk.ObjectFactory> factory_singleton_cache;
@@ -191,7 +191,7 @@ namespace Atk {
 		public GLib.Type get_factory_type (GLib.Type type);
 		public void set_factory_type (GLib.Type type, GLib.Type factory_type);
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_relation_get_type ()")]
 	public class Relation : GLib.Object {
 		public Atk.RelationType relationship;
 		[CCode (has_construct_function = false)]
@@ -475,7 +475,7 @@ namespace Atk {
 		[Version (since = "2.12")]
 		public abstract Atk.Object get_table ();
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_text_get_type ()")]
 	public interface Text : GLib.Object {
 		public abstract bool add_selection (int start_offset, int end_offset);
 		[Version (deprecated_since = "vala-0.16", replacement = "TextAttribute.for_name")]
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 4b769df04..f4fcdb3ad 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -5520,7 +5520,7 @@ namespace Clutter {
 		public GLib.Type get_property_type ();
 		public bool get_value (GLib.Value value);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class AnyEvent : Clutter.Event {
@@ -5530,7 +5530,7 @@ namespace Clutter {
 		public uint32 time;
 		public Clutter.EventType type;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_backend_get_type ()")]
 	[Version (since = "0.4")]
 	public class Backend : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -5909,7 +5909,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public Clutter.Color contrast { get; set; }
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class ButtonEvent : Clutter.Event {
@@ -6053,7 +6053,7 @@ namespace Clutter {
 		[NoWrapper]
 		public virtual void update_preferred_size (Clutter.Actor actor, Clutter.Orientation direction, float for_size, float minimum_size, float natural_size);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class CrossingEvent : Clutter.Event {
@@ -6583,7 +6583,7 @@ namespace Clutter {
 		public GLib.Value initial { owned get; set; }
 		public GLib.Type value_type { get; construct; }
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class KeyEvent : Clutter.Event {
@@ -6737,7 +6737,7 @@ namespace Clutter {
 		[NoAccessorMethod]
 		public uint row { get; set; }
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class MotionEvent : Clutter.Event {
@@ -7087,7 +7087,7 @@ namespace Clutter {
 		public void set_scroll_mode (Clutter.ScrollMode mode);
 		public Clutter.ScrollMode scroll_mode { get; set; }
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class ScrollEvent : Clutter.Event {
@@ -7383,7 +7383,7 @@ namespace Clutter {
 		[Version (since = "0.8")]
 		public virtual signal void stage_removed (Clutter.Stage stage);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "0.2")]
 	public class StageStateEvent : Clutter.Event {
@@ -7886,7 +7886,7 @@ namespace Clutter {
 		[Version (since = "1.12")]
 		public virtual signal void stopped (bool is_finished);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (deprecated = true, deprecated_since = "1.6", since = "0.6")]
 	public class TimeoutPool {
@@ -7897,7 +7897,7 @@ namespace Clutter {
 		[Version (since = "0.4")]
 		public void remove (uint id_);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "1.10")]
 	public class TouchEvent : Clutter.Event {
@@ -7913,7 +7913,7 @@ namespace Clutter {
 		public float x;
 		public float y;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "1.24")]
 	public class TouchpadPinchEvent : Clutter.Event {
@@ -7930,7 +7930,7 @@ namespace Clutter {
 		public float x;
 		public float y;
 	}
-	[CCode (cheader_filename = "clutter/clutter.h")]
+	[CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "1.24")]
 	public class TouchpadSwipeEvent : Clutter.Event {
@@ -8559,7 +8559,7 @@ namespace Clutter {
 		TOUCHPAD_SWIPE,
 		EVENT_LAST
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FEATURE_", type_id = "clutter_feature_flags_get_type ()")]
 	[Flags]
 	[Version (since = "0.4")]
 	public enum FeatureFlags {
diff --git a/vapi/clutter-gst-2.0.vapi b/vapi/clutter-gst-2.0.vapi
index 10c85a4b9..d84489cfd 100644
--- a/vapi/clutter-gst-2.0.vapi
+++ b/vapi/clutter-gst-2.0.vapi
@@ -37,7 +37,7 @@ namespace ClutterGst {
 		[NoAccessorMethod]
 		public Gst.Fraction pixel_aspect_ratio { owned get; set; }
 	}
-	[CCode (cheader_filename = "clutter-gst/clutter-gst.h")]
+	[CCode (cheader_filename = "clutter-gst/clutter-gst.h", type_id = "clutter_gst_player_get_type ()")]
 	[Version (since = "1.4")]
 	public interface Player : Clutter.Media, GLib.Object {
 		public static void class_init (GLib.ObjectClass object_class);
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 52ec48b28..1cf157d59 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -5901,7 +5901,7 @@ namespace Gdk {
 		[Version (since = "3.22")]
 		public int get_n_groups ();
 	}
-	[CCode (cheader_filename = "gdk/gdk.h")]
+	[CCode (cheader_filename = "gdk/gdk.h", has_type_id = false)]
 	[SimpleType]
 	public struct Atom : uint {
 		[CCode (cname = "GDK_NONE")]
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index 9c6d31985..94cb33697 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "Gdk", gir_namespace = "GdkPixbuf", gir_version = "2.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", type_id = "gdk_pixbuf_get_type ()")]
 	public class Pixbuf : GLib.Object, GLib.Icon, GLib.LoadableIcon {
 		[CCode (has_construct_function = false)]
 		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index ce836031a..5b426fa1f 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1036,7 +1036,7 @@ namespace GLib {
 		public GLib.DBusSignalInfo @ref ();
 		public void unref ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_data_input_stream_get_type ()")]
 	public class DataInputStream : GLib.BufferedInputStream, GLib.Seekable {
 		[CCode (has_construct_function = false)]
 		public DataInputStream (GLib.InputStream base_stream);
@@ -1347,14 +1347,14 @@ namespace GLib {
 		public GLib.OutputStream base_stream { get; construct; }
 		public bool close_base_stream { get; construct; }
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	[Compact]
 	public class IOExtension {
 		public unowned string get_name ();
 		public int get_priority ();
 		public GLib.Type get_type ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	[Compact]
 	public class IOExtensionPoint {
 		[CCode (cheader_filename = "gio/gio.h", cname = "G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME")]
@@ -1409,7 +1409,7 @@ namespace GLib {
 		public static void scan_all_in_directory_with_scope (string dirname, GLib.IOModuleScope scope);
 		public void unload ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "2.30")]
 	public class IOModuleScope {
@@ -1418,7 +1418,7 @@ namespace GLib {
 		public void block (string basename);
 		public void free ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	[Compact]
 	public class IOSchedulerJob {
 		[CCode (cheader_filename = "gio/gio.h", cname = "g_io_scheduler_cancel_all_jobs")]
@@ -1460,7 +1460,7 @@ namespace GLib {
 		public abstract GLib.InputStream input_stream { get; }
 		public abstract GLib.OutputStream output_stream { get; }
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	[Compact]
 	public class IOStreamAdapter {
 	}
@@ -1636,7 +1636,7 @@ namespace GLib {
 		[CCode (has_construct_function = false, type = "GInputStream*")]
 		public MemoryInputStream.from_data ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "gssize")] owned uint8[] data, GLib.DestroyNotify? destroy = GLib.g_free);
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_memory_output_stream_get_type ()")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.PollableOutputStream, GLib.Seekable {
 		[CCode (has_construct_function = false, type = "GOutputStream*")]
 		public MemoryOutputStream ([CCode (array_length_type = "gsize")] owned uint8[]? data, GLib.ReallocFunc? realloc_function = GLib.g_realloc, GLib.DestroyNotify? destroy_function = GLib.g_free);
@@ -1808,7 +1808,7 @@ namespace GLib {
 	public class NativeSocketAddress : GLib.SocketAddress {
 		public NativeSocketAddress (void* native, size_t len);
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_native_volume_monitor_get_type ()")]
 	public abstract class NativeVolumeMonitor : GLib.VolumeMonitor {
 		[CCode (has_construct_function = false)]
 		protected NativeVolumeMonitor ();
@@ -2289,7 +2289,7 @@ namespace GLib {
 		[Version (deprecated = true, deprecated_since = "2.38", since = "2.28")]
 		public void remove (string action_name);
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_simple_async_result_get_type ()")]
 	public class SimpleAsyncResult : GLib.Object, GLib.AsyncResult, GLib.AsyncResult {
 		[CCode (has_construct_function = false)]
 		public SimpleAsyncResult (GLib.Object? source_object, void* source_tag);
@@ -2553,7 +2553,7 @@ namespace GLib {
 		[Version (since = "2.32")]
 		public virtual signal void event (GLib.SocketClientEvent event, GLib.SocketConnectable connectable, GLib.IOStream? connection);
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_socket_connection_get_type ()")]
 	[Version (since = "2.22")]
 	public class SocketConnection : GLib.IOStream {
 		[CCode (has_construct_function = false)]
@@ -2922,7 +2922,7 @@ namespace GLib {
 		[Version (since = "2.40")]
 		public virtual async GLib.TlsInteractionResult request_certificate_async (GLib.TlsConnection connection, GLib.TlsCertificateRequestFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_tls_password_get_type ()")]
 	[Version (since = "2.30")]
 	public class TlsPassword : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -2992,7 +2992,7 @@ namespace GLib {
 		[Version (since = "2.50")]
 		public bool unregister_uri_scheme (string scheme);
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_volume_monitor_get_type ()")]
 	public class VolumeMonitor : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected VolumeMonitor ();
@@ -3179,7 +3179,7 @@ namespace GLib {
 		public abstract bool supports_files ();
 		public abstract bool supports_uris ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_async_initable_get_type ()")]
 	[Version (since = "2.22")]
 	public interface AsyncInitable : GLib.Object {
 		public virtual async bool init_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -3371,7 +3371,7 @@ namespace GLib {
 		[NoAccessorMethod]
 		public abstract GLib.TlsAuthenticationMode authentication_mode { get; set; }
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_file_get_type ()")]
 	public interface File : GLib.Object {
 		public abstract GLib.FileOutputStream append_to (GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error;
 		public virtual async GLib.FileOutputStream append_to_async (GLib.FileCreateFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error;
@@ -3508,7 +3508,7 @@ namespace GLib {
 		[Version (since = "2.22")]
 		public abstract async bool unmount_mountable_with_operation (GLib.MountUnmountFlags flags, GLib.MountOperation? mount_operation, GLib.Cancellable? cancellable = null) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", type_id = "g_icon_get_type ()")]
 	public interface Icon : GLib.Object {
 		[Version (since = "2.38")]
 		public static GLib.Icon deserialize (GLib.Variant value);
@@ -3758,7 +3758,7 @@ namespace GLib {
 		public virtual signal void changed ();
 		public virtual signal void removed ();
 	}
-	[CCode (cheader_filename = "gio/gio.h")]
+	[CCode (cheader_filename = "gio/gio.h", has_type_id = false)]
 	public struct ActionEntry {
 		public weak string name;
 		[Version (deprecated = true, deprecated_since = "vala-0.26", replacement = "activate_callback")]
@@ -3898,7 +3898,7 @@ namespace GLib {
 		[CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_for_bus_sync")]
 		public static string get_address_sync (GLib.BusType bus_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_", type_id = "g_converter_flags_get_type ()")]
 	[Flags]
 	[Version (since = "2.24")]
 	public enum ConverterFlags {
diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index 5d5f48a30..911681261 100644
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -247,7 +247,7 @@ namespace GI {
 		public static bool is_pointer (GI.TypeInfo info);
 		public static bool is_zero_terminated (GI.TypeInfo info);
 	}
-	[CCode (cheader_filename = "girepository.h")]
+	[CCode (cheader_filename = "girepository.h", has_type_id = false)]
 	[Compact]
 	public class Typelib {
 		public void free ();
@@ -270,7 +270,7 @@ namespace GI {
 		public static size_t get_size (GI.UnionInfo info);
 		public static bool is_discriminated (GI.UnionInfo info);
 	}
-	[CCode (cheader_filename = "girepository.h")]
+	[CCode (cheader_filename = "girepository.h", has_type_id = false)]
 	[Compact]
 	public class UnresolvedInfo {
 	}
diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index 901424644..933e44a70 100644
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -1046,7 +1046,7 @@ namespace Gst {
 		[CCode (has_construct_function = false)]
 		public DateTime.ymd (int year, int month, int day);
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", has_type_id = false)]
 	[Compact]
 	public class DebugMessage {
 		public unowned string @get ();
@@ -1661,7 +1661,7 @@ namespace Gst {
 		[Version (since = "1.10")]
 		public Message.warning_with_details (Gst.Object? src, GLib.Error error, string debug, owned Gst.Structure details);
 	}
-	[CCode (cheader_filename = "gst/gst.h", get_value_function = "g_value_get_boxed", ref_function = "gst_mini_object_ref", set_value_function = "g_value_set_boxed", take_value_function = "g_value_take_boxed", unref_function = "gst_mini_object_unref")]
+	[CCode (cheader_filename = "gst/gst.h", get_value_function = "g_value_get_boxed", has_type_id = false, ref_function = "gst_mini_object_ref", set_value_function = "g_value_set_boxed", take_value_function = "g_value_take_boxed", unref_function = "gst_mini_object_unref")]
 	[Compact]
 	public abstract class MiniObject {
 		public weak Gst.MiniObjectDisposeFunction dispose;
@@ -1944,7 +1944,7 @@ namespace Gst {
 		public static int rank_compare_func (void* p1, void* p2);
 		public void set_rank (uint rank);
 	}
-	[CCode (cheader_filename = "gst/gst.h")]
+	[CCode (cheader_filename = "gst/gst.h", has_type_id = false)]
 	[Compact]
 	public class Poll {
 		[CCode (has_construct_function = false)]
diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi
index 720021bca..cff38f948 100644
--- a/vapi/gstreamer-audio-1.0.vapi
+++ b/vapi/gstreamer-audio-1.0.vapi
@@ -85,7 +85,7 @@ namespace Gst {
 			[NoAccessorMethod]
 			public uint track { get; set; }
 		}
-		[CCode (cheader_filename = "gst/audio/audio.h")]
+		[CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "AudioChannelMixer")]
 		public class ChannelMixer {
@@ -103,7 +103,7 @@ namespace Gst {
 			public static void invalidate (Gst.Clock clock);
 			public void reset (Gst.ClockTime time);
 		}
-		[CCode (cheader_filename = "gst/audio/audio.h")]
+		[CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "AudioConverter")]
 		public class Converter {
@@ -310,7 +310,7 @@ namespace Gst {
 			public void set_format (Gst.Audio.Format format, int rate, int channels, Gst.Audio.ChannelPosition position);
 			public Gst.Caps to_caps ();
 		}
-		[CCode (cheader_filename = "gst/audio/audio.h")]
+		[CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "AudioQuantize")]
 		public class Quantize {
@@ -318,7 +318,7 @@ namespace Gst {
 			public void reset ();
 			public void samples (void* @in, void* @out, uint samples);
 		}
-		[CCode (cheader_filename = "gst/audio/audio.h")]
+		[CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "AudioResampler")]
 		public class Resampler {
diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi
index ad1741268..edd0f1a36 100644
--- a/vapi/gstreamer-base-1.0.vapi
+++ b/vapi/gstreamer-base-1.0.vapi
@@ -53,7 +53,7 @@ namespace Gst {
 			public GLib.List<Gst.Buffer>? take_list (size_t nbytes);
 			public void unmap ();
 		}
-		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader")]
+		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader", has_type_id = false)]
 		[Compact]
 		[GIR (name = "BitReader")]
 		public class BitReader {
@@ -95,7 +95,7 @@ namespace Gst {
 			[CCode (cname = "gst_bit_reader_skip_to_byte")]
 			public bool skip_to_byte ();
 		}
-		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader")]
+		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader", has_type_id = false)]
 		[Compact]
 		[GIR (name = "ByteReader")]
 		public class ByteReader {
@@ -233,7 +233,7 @@ namespace Gst {
 			[CCode (cname = "gst_byte_reader_skip_string_utf8")]
 			public bool skip_string_utf8 ();
 		}
-		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader")]
+		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader", has_type_id = false)]
 		[Compact]
 		[GIR (name = "ByteWriter")]
 		public class ByteWriter {
diff --git a/vapi/gstreamer-check-1.0.vapi b/vapi/gstreamer-check-1.0.vapi
index 6208c9e2e..d8c461c0a 100644
--- a/vapi/gstreamer-check-1.0.vapi
+++ b/vapi/gstreamer-check-1.0.vapi
@@ -3,13 +3,13 @@
 [CCode (cprefix = "Gst", gir_namespace = "GstCheck", gir_version = "1.0", lower_case_cprefix = "gst_")]
 namespace Gst {
 	namespace Check {
-		[CCode (cheader_filename = "gst/check/check.h", cname = "GstHarnessThread")]
+		[CCode (cheader_filename = "gst/check/check.h", cname = "GstHarnessThread", has_type_id = false)]
 		[Compact]
 		[GIR (name = "HarnessThread")]
 		[Version (since = "1.6")]
 		public class HarnessThread {
 		}
-		[CCode (cheader_filename = "gst/check/gstbufferstraw.h,gst/check/gstcheck.h,gst/check/gstconsistencychecker.h,gst/check/internal-check.h", cname = "GstStreamConsistency", lower_case_cprefix = "gst_consistency_checker_")]
+		[CCode (cheader_filename = "gst/check/gstbufferstraw.h,gst/check/gstcheck.h,gst/check/gstconsistencychecker.h,gst/check/internal-check.h", cname = "GstStreamConsistency", has_type_id = false, lower_case_cprefix = "gst_consistency_checker_")]
 		[Compact]
 		[GIR (name = "StreamConsistency")]
 		public class StreamConsistency {
diff --git a/vapi/gstreamer-fft-1.0.vapi b/vapi/gstreamer-fft-1.0.vapi
index cf2c52fd9..4b226a4ad 100644
--- a/vapi/gstreamer-fft-1.0.vapi
+++ b/vapi/gstreamer-fft-1.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gst", gir_namespace = "GstFft", gir_version = "1.0", lower_case_cprefix = "gst_")]
 namespace Gst {
 	namespace FFT {
-		[CCode (cheader_filename = "gst/fft/fft.h")]
+		[CCode (cheader_filename = "gst/fft/fft.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "FFTF32")]
 		public class F32 {
@@ -13,7 +13,7 @@ namespace Gst {
 			public void inverse_fft (Gst.FFT.F32Complex freqdata, float timedata);
 			public void window (float timedata, Gst.FFT.Window window);
 		}
-		[CCode (cheader_filename = "gst/fft/fft.h")]
+		[CCode (cheader_filename = "gst/fft/fft.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "FFTF64")]
 		public class F64 {
@@ -23,7 +23,7 @@ namespace Gst {
 			public void inverse_fft (Gst.FFT.F64Complex freqdata, double timedata);
 			public void window (double timedata, Gst.FFT.Window window);
 		}
-		[CCode (cheader_filename = "gst/fft/fft.h")]
+		[CCode (cheader_filename = "gst/fft/fft.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "FFTS16")]
 		public class S16 {
@@ -33,7 +33,7 @@ namespace Gst {
 			public void inverse_fft (Gst.FFT.S16Complex freqdata, int16 timedata);
 			public void window (int16 timedata, Gst.FFT.Window window);
 		}
-		[CCode (cheader_filename = "gst/fft/fft.h")]
+		[CCode (cheader_filename = "gst/fft/fft.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "FFTS32")]
 		public class S32 {
diff --git a/vapi/gstreamer-rtp-1.0.vapi b/vapi/gstreamer-rtp-1.0.vapi
index 571cf5855..dc0975fc1 100644
--- a/vapi/gstreamer-rtp-1.0.vapi
+++ b/vapi/gstreamer-rtp-1.0.vapi
@@ -94,7 +94,7 @@ namespace Gst {
 			[NoAccessorMethod]
 			public uint timestamp_offset { get; set; }
 		}
-		[CCode (cheader_filename = "gst/rtp/rtp.h")]
+		[CCode (cheader_filename = "gst/rtp/rtp.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "RTPBuffer")]
 		public class Buffer : Gst.Buffer {
@@ -296,7 +296,7 @@ namespace Gst {
 		public static unowned Gst.RTP.PayloadInfo? payload_info_for_pt (uint8 payload_type);
 	}
 	namespace RTPC {
-		[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GstRTCPBuffer")]
+		[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GstRTCPBuffer", has_type_id = false)]
 		[Compact]
 		[GIR (name = "RTCPBuffer")]
 		public class Buffer : Gst.Buffer {
diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi
index ea09c08ac..9275abc5b 100644
--- a/vapi/gstreamer-rtsp-1.0.vapi
+++ b/vapi/gstreamer-rtsp-1.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gst", gir_namespace = "GstRtsp", gir_version = "1.0", lower_case_cprefix = "gst_")]
 namespace Gst {
 	namespace RTSP {
-		[CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+		[CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "RTSPConnection")]
 		public class Connection {
@@ -71,7 +71,7 @@ namespace Gst {
 			public string get_request_uri ();
 			public Gst.RTSP.Result set_port (uint16 port);
 		}
-		[CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+		[CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "RTSPWatch")]
 		public class Watch {
diff --git a/vapi/gstreamer-sdp-1.0.vapi b/vapi/gstreamer-sdp-1.0.vapi
index 71aaf0c9b..c27af3143 100644
--- a/vapi/gstreamer-sdp-1.0.vapi
+++ b/vapi/gstreamer-sdp-1.0.vapi
@@ -3,12 +3,12 @@
 [CCode (cprefix = "Gst", gir_namespace = "GstSdp", gir_version = "1.0", lower_case_cprefix = "gst_")]
 namespace Gst {
 	namespace SDP {
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYDecryptInfo")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYDecryptInfo", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYDecryptInfo")]
 		public class MIKEYDecryptInfo {
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYEncryptInfo")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYEncryptInfo", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYEncryptInfo")]
 		public class MIKEYEncryptInfo {
@@ -126,7 +126,7 @@ namespace Gst {
 			[Version (since = "1.4")]
 			public bool t_set (Gst.SDP.MIKEYTSType type, [CCode (array_length = false)] uint8[] ts_value);
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadKEMAC")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadKEMAC", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadKEMAC")]
 		public class MIKEYPayloadKEMAC : Gst.SDP.MIKEYPayload {
@@ -134,7 +134,7 @@ namespace Gst {
 			public Gst.SDP.MIKEYMacAlg mac_alg;
 			public weak GLib.Array<void*> subpayloads;
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadKeyData")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadKeyData", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadKeyData")]
 		public class MIKEYPayloadKeyData : Gst.SDP.MIKEYPayload {
@@ -149,7 +149,7 @@ namespace Gst {
 			public uint8 salt_data;
 			public uint16 salt_len;
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadPKE")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadPKE", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadPKE")]
 		public class MIKEYPayloadPKE : Gst.SDP.MIKEYPayload {
@@ -157,14 +157,14 @@ namespace Gst {
 			public uint8 data;
 			public uint16 data_len;
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadRAND")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadRAND", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadRAND")]
 		public class MIKEYPayloadRAND : Gst.SDP.MIKEYPayload {
 			public uint8 len;
 			public uint8 rand;
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadSP")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadSP", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadSP")]
 		public class MIKEYPayloadSP : Gst.SDP.MIKEYPayload {
@@ -172,7 +172,7 @@ namespace Gst {
 			public uint policy;
 			public Gst.SDP.MIKEYSecProto proto;
 		}
-		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadT")]
+		[CCode (cheader_filename = "gst/sdp/sdp.h", cname = "GstMIKEYPayloadT", has_type_id = false)]
 		[Compact]
 		[GIR (name = "MIKEYPayloadT")]
 		public class MIKEYPayloadT : Gst.SDP.MIKEYPayload {
diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi
index 8853a2063..935567bce 100644
--- a/vapi/gstreamer-video-1.0.vapi
+++ b/vapi/gstreamer-video-1.0.vapi
@@ -61,7 +61,7 @@ namespace Gst {
 			protected ColorBalanceChannel ();
 			public virtual signal void value_changed (int value);
 		}
-		[CCode (cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "VideoConverter")]
 		public class Converter {
@@ -155,7 +155,7 @@ namespace Gst {
 			[NoWrapper]
 			public virtual bool transform_meta (Gst.Video.CodecFrame frame, Gst.Meta meta);
 		}
-		[CCode (cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "VideoDither")]
 		public class Dither {
@@ -315,7 +315,7 @@ namespace Gst {
 			public void set_global_alpha (float global_alpha);
 			public void set_render_rectangle (int render_x, int render_y, uint render_width, uint render_height);
 		}
-		[CCode (cheader_filename = "gst/video/video.h")]
+		[CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
 		[Compact]
 		[GIR (name = "VideoScaler")]
 		public class Scaler {
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index f6c3c0f6a..13100dc76 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -325,7 +325,7 @@ namespace Soup {
 		[Version (since = "2.50")]
 		public GLib.IOStream steal_connection ();
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	[Compact]
 	public class Connection {
 	}
@@ -674,11 +674,11 @@ namespace Soup {
 		[Version (since = "2.26")]
 		public void set_ranges (Soup.Range ranges, int length);
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	[Compact]
 	public class MessageQueue {
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	[Compact]
 	public class MessageQueueItem {
 	}
@@ -1130,7 +1130,7 @@ namespace Soup {
 		public virtual signal void error (GLib.Error error);
 		public virtual signal void message (int type, GLib.Bytes message);
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
+	[CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
 	[Compact]
 	[Version (since = "2.52")]
 	public class XMLRPCParams {
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index aa9712aeb..a630f4f5b 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -884,7 +884,7 @@ namespace Mx {
 		[NoAccessorMethod]
 		public bool small_screen { get; set; }
 	}
-	[CCode (cheader_filename = "mx/mx.h")]
+	[CCode (cheader_filename = "mx/mx.h", has_type_id = false)]
 	[Compact]
 	public class SettingsProvider {
 	}
@@ -1454,7 +1454,7 @@ namespace Mx {
 		FORCE,
 		INVALIDATE_CACHE
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_ERROR_INVALID_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_ERROR_INVALID_", type_id = "mx_style_error_get_type ()")]
 	public enum StyleError {
 		[Version (deprecated_since = "vala-0.14", replacement = "StyleError.INVALID_FILE")]
 		FILE,
diff --git a/vapi/packagekit-glib2.vapi b/vapi/packagekit-glib2.vapi
index c7409efda..7c8fc7db3 100644
--- a/vapi/packagekit-glib2.vapi
+++ b/vapi/packagekit-glib2.vapi
@@ -691,7 +691,7 @@ namespace Pk {
 		[Version (since = "0.8.6")]
 		public bool to_file (GLib.File file) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+	[CCode (cheader_filename = "packagekit-glib2/packagekit.h", has_type_id = false)]
 	[Compact]
 	public class PackageSackResults {
 	}
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 6e9e09dde..48d90b54f 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -18,7 +18,7 @@ namespace Pango {
 		[CCode (cheader_filename = "pango/pango.h", cname = "PANGO_SCALE_X_SMALL")]
 		public const double X_SMALL;
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrClass {
 		public GLib.Callback copy;
@@ -26,29 +26,29 @@ namespace Pango {
 		public GLib.Callback equal;
 		public Pango.AttrType type;
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrColor : Pango.Attribute {
 		public Pango.Color color;
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrFloat : Pango.Attribute {
 		public double value;
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrFontDesc : Pango.Attribute {
 		public weak Pango.FontDescription desc;
 		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrFontDesc (Pango.FontDescription desc);
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrInt : Pango.Attribute {
 		public int value;
 	}
-	[CCode (cheader_filename = "pango/pango.h", free_function = "pango_attr_iterator_destroy")]
+	[CCode (cheader_filename = "pango/pango.h", free_function = "pango_attr_iterator_destroy", has_type_id = false)]
 	[Compact]
 	public class AttrIterator {
 		public Pango.AttrIterator copy ();
@@ -60,7 +60,7 @@ namespace Pango {
 		public bool next ();
 		public void range (out int start, out int end);
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrLanguage : Pango.Attribute {
 		public weak Pango.Language value;
@@ -84,7 +84,7 @@ namespace Pango {
 		public void splice (Pango.AttrList other, int pos, int len);
 		public void unref ();
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrShape<T> : Pango.Attribute {
 		public weak Pango.AttrDataCopyFunc<T> copy_func;
@@ -97,7 +97,7 @@ namespace Pango {
 		[CCode (has_construct_function = false, simple_generics = true, type = "PangoAttribute*")]
 		public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, owned T data, Pango.AttrDataCopyFunc<T> copy_func);
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrSize : Pango.Attribute {
 		public uint absolute;
@@ -105,12 +105,12 @@ namespace Pango {
 		[CCode (has_construct_function = false, type = "PangoAttribute*")]
 		public AttrSize (int size);
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class AttrString : Pango.Attribute {
 		public weak string value;
 	}
-	[CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy")]
+	[CCode (cheader_filename = "pango/pango.h", free_function = "pango_attribute_destroy", has_type_id = false)]
 	[Compact]
 	public class Attribute {
 		public uint end_index;
@@ -158,7 +158,7 @@ namespace Pango {
 		[Version (since = "1.6")]
 		public void set_matrix (Pango.Matrix? matrix);
 	}
-	[CCode (cheader_filename = "pango/pango.h", ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false, ref_function = "pango_coverage_ref", unref_function = "pango_coverage_unref")]
 	[Compact]
 	public class Coverage {
 		[CCode (has_construct_function = false)]
@@ -522,11 +522,11 @@ namespace Pango {
 		[CCode (has_construct_function = false)]
 		protected LayoutRun ();
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class Map {
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class MapEntry {
 	}
@@ -569,7 +569,7 @@ namespace Pango {
 		public void set_color (Pango.RenderPart part, Pango.Color? color);
 		public void set_matrix (Pango.Matrix? matrix);
 	}
-	[CCode (cheader_filename = "pango/pango.h")]
+	[CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
 	[Compact]
 	public class ScriptIter {
 		[CCode (has_construct_function = false)]
diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi
index ded07cee3..71b9d50f8 100644
--- a/vapi/rest-0.7.vapi
+++ b/vapi/rest-0.7.vapi
@@ -79,7 +79,7 @@ namespace Rest {
 		[CCode (has_construct_function = false)]
 		public Param.with_owner (global::string name, [CCode (array_length_cname = "length", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] data, global::string content_type, global::string? filename, owned void* owner, GLib.DestroyNotify? owner_dnotify);
 	}
-	[CCode (cheader_filename = "rest/rest-params.h")]
+	[CCode (cheader_filename = "rest/rest-params.h", has_type_id = false)]
 	[Compact]
 	public class Params {
 		public void add (owned Rest.Param param);
@@ -89,7 +89,7 @@ namespace Rest {
 		public unowned Rest.Param? @get (string name);
 		public void remove (string name);
 	}
-	[CCode (cheader_filename = "rest/rest-params.h")]
+	[CCode (cheader_filename = "rest/rest-params.h", has_type_id = false)]
 	[Compact]
 	public class ParamsIter {
 		public void init (Rest.Params @params);