[vala] girparser: set CCode type_id for enumerations



commit 28ddcc01c794429debff9b632b64da246cd8d027
Author: Evan Nemerson <evan coeus-group com>
Date:   Sun Aug 12 20:02:37 2012 -0700

    girparser: set CCode type_id for enumerations

 vala/valagirparser.vala             |    7 ++
 vapi/atk.vapi                       |   20 +++---
 vapi/clutter-1.0.vapi               |  102 ++++++++++++++--------------
 vapi/gdk-3.0.vapi                   |   70 ++++++++++----------
 vapi/gdk-pixbuf-2.0.vapi            |   12 ++--
 vapi/gdl-3.0.vapi                   |   16 ++--
 vapi/gio-2.0.vapi                   |  128 +++++++++++++++++-----------------
 vapi/gobject-introspection-1.0.vapi |   24 +++---
 vapi/gtksourceview-3.0.vapi         |   14 ++--
 vapi/gudev-1.0.vapi                 |    2 +-
 vapi/json-glib-1.0.vapi             |    8 +-
 vapi/libgdata.vapi                  |   24 +++---
 vapi/libsoup-2.4.vapi               |   32 +++++-----
 vapi/libwnck-3.0.vapi               |   22 +++---
 vapi/mx-1.0.vapi                    |   32 +++++-----
 vapi/pango.vapi                     |   36 +++++-----
 vapi/poppler-glib.vapi              |   52 +++++++-------
 vapi/rest-0.7.vapi                  |    4 +-
 vapi/vte-2.90.vapi                  |   12 ++--
 19 files changed, 312 insertions(+), 305 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 7d7ee72..7f32257 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2060,6 +2060,13 @@ public class Vala.GirParser : CodeVisitor {
 					en.set_attribute ("Flags", true);
 				}
 				sym = en;
+
+				var type_id = reader.get_attribute ("glib:get-type");
+				if (type_id == null) {
+					en.set_attribute_bool ("CCode", "has_type_id", false);
+				} else {
+					en.set_attribute_string ("CCode", "type_id", "%s ()".printf (type_id));
+				}
 			}
 			current.symbol = sym;
 		} else {
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 8a6c180..ff96f28 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -489,23 +489,23 @@ namespace Atk {
 		public int width;
 		public int height;
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_XY_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_XY_", type_id = "atk_coord_type_get_type ()")]
 	public enum CoordType {
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_HYPERLINK_IS_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_HYPERLINK_IS_", type_id = "atk_hyperlink_state_flags_get_type ()")]
 	[Flags]
 	public enum HyperlinkStateFlags {
 		INLINE
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_KEY_EVENT_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_KEY_EVENT_", type_id = "atk_key_event_type_get_type ()")]
 	public enum KeyEventType {
 		PRESS,
 		RELEASE,
 		LAST_DEFINED
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_LAYER_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_LAYER_", type_id = "atk_layer_get_type ()")]
 	public enum Layer {
 		INVALID,
 		BACKGROUND,
@@ -516,7 +516,7 @@ namespace Atk {
 		OVERLAY,
 		WINDOW
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_RELATION_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_RELATION_", type_id = "atk_relation_type_get_type ()")]
 	public enum RelationType {
 		NULL,
 		CONTROLLED_BY,
@@ -543,7 +543,7 @@ namespace Atk {
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.RelationType register (string name);
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_", type_id = "atk_role_get_type ()")]
 	public enum Role {
 		INVALID,
 		ACCEL_LABEL,
@@ -656,7 +656,7 @@ namespace Atk {
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.Role register (string name);
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_STATE_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_STATE_", type_id = "atk_state_type_get_type ()")]
 	public enum StateType {
 		INVALID,
 		ACTIVE,
@@ -705,7 +705,7 @@ namespace Atk {
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.StateType register (string name);
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_ATTR_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_ATTR_", type_id = "atk_text_attribute_get_type ()")]
 	public enum TextAttribute {
 		INVALID,
 		LEFT_MARGIN,
@@ -745,7 +745,7 @@ namespace Atk {
 		[CCode (cheader_filename = "atk/atk.h")]
 		public static Atk.TextAttribute register (string name);
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_BOUNDARY_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_BOUNDARY_", type_id = "atk_text_boundary_get_type ()")]
 	public enum TextBoundary {
 		CHAR,
 		WORD_START,
@@ -755,7 +755,7 @@ namespace Atk {
 		LINE_START,
 		LINE_END
 	}
-	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_CLIP_")]
+	[CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_CLIP_", type_id = "atk_text_clip_type_get_type ()")]
 	public enum TextClipType {
 		NONE,
 		MIN,
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index aad4aca..c5a5d11 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -7415,14 +7415,14 @@ namespace Clutter {
 		public void free ();
 		public Clutter.Vertex init (float x, float y, float z);
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_", type_id = "clutter_actor_align_get_type ()")]
 	public enum ActorAlign {
 		FILL,
 		START,
 		CENTER,
 		END
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_", type_id = "clutter_actor_flags_get_type ()")]
 	[Flags]
 	public enum ActorFlags {
 		MAPPED,
@@ -7431,20 +7431,20 @@ namespace Clutter {
 		VISIBLE,
 		NO_LAYOUT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ALIGN_", type_id = "clutter_align_axis_get_type ()")]
 	public enum AlignAxis {
 		X_AXIS,
 		Y_AXIS,
 		BOTH
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_allocation_flags_get_type ()")]
 	[Flags]
 	public enum AllocationFlags {
 		ALLOCATION_NONE,
 		ABSOLUTE_ORIGIN_CHANGED,
 		DELEGATE_LAYOUT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_animation_mode_get_type ()")]
 	public enum AnimationMode {
 		CUSTOM_MODE,
 		LINEAR,
@@ -7488,7 +7488,7 @@ namespace Clutter {
 		EASE_IN_OUT,
 		ANIMATION_LAST
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIN_ALIGNMENT_", type_id = "clutter_bin_alignment_get_type ()")]
 	[Deprecated (since = "1.12")]
 	public enum BinAlignment {
 		FIXED,
@@ -7497,7 +7497,7 @@ namespace Clutter {
 		END,
 		CENTER
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BIND_", type_id = "clutter_bind_coordinate_get_type ()")]
 	public enum BindCoordinate {
 		X,
 		Y,
@@ -7507,13 +7507,13 @@ namespace Clutter {
 		SIZE,
 		ALL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_BOX_ALIGNMENT_", type_id = "clutter_box_alignment_get_type ()")]
 	public enum BoxAlignment {
 		START,
 		END,
 		CENTER
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_CONTENT_GRAVITY_", type_id = "clutter_content_gravity_get_type ()")]
 	public enum ContentGravity {
 		TOP_LEFT,
 		TOP,
@@ -7527,7 +7527,7 @@ namespace Clutter {
 		RESIZE_FILL,
 		RESIZE_ASPECT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPEAT_", type_id = "clutter_content_repeat_get_type ()")]
 	[Flags]
 	public enum ContentRepeat {
 		NONE,
@@ -7535,25 +7535,25 @@ namespace Clutter {
 		Y_AXIS,
 		BOTH
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_DRAG_", type_id = "clutter_drag_axis_get_type ()")]
 	public enum DragAxis {
 		AXIS_NONE,
 		X_AXIS,
 		Y_AXIS
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_ACTOR_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EFFECT_PAINT_ACTOR_", type_id = "clutter_effect_paint_flags_get_type ()")]
 	[Flags]
 	public enum EffectPaintFlags {
 		[CCode (cname = "CLUTTER_EFFECT_PAINT_ACTOR_DIRTY")]
 		ACTOR_DIRTY
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_EVENT_", type_id = "clutter_event_flags_get_type ()")]
 	[Flags]
 	public enum EventFlags {
 		NONE,
 		FLAG_SYNTHETIC
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_event_type_get_type ()")]
 	public enum EventType {
 		NOTHING,
 		KEY_PRESS,
@@ -7593,18 +7593,18 @@ namespace Clutter {
 		[CCode (cname = "clutter_feature_get_all")]
 		public static Clutter.FeatureFlags @get ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
 	public enum FlowOrientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FONT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FONT_", type_id = "clutter_font_flags_get_type ()")]
 	[Flags]
 	public enum FontFlags {
 		MIPMAPPING,
 		HINTING
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRAVITY_", type_id = "clutter_gravity_get_type ()")]
 	public enum Gravity {
 		NONE,
 		NORTH,
@@ -7617,14 +7617,14 @@ namespace Clutter {
 		NORTH_WEST,
 		CENTER
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_GRID_POSITION_", type_id = "clutter_grid_position_get_type ()")]
 	public enum GridPosition {
 		LEFT,
 		RIGHT,
 		TOP,
 		BOTTOM
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INIT_", type_id = "clutter_init_error_get_type ()")]
 	public enum InitError {
 		SUCCESS,
 		ERROR_UNKNOWN,
@@ -7633,7 +7633,7 @@ namespace Clutter {
 		ERROR_INTERNAL;
 		public static GLib.Quark quark ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_AXIS_", type_id = "clutter_input_axis_get_type ()")]
 	public enum InputAxis {
 		IGNORE,
 		X,
@@ -7645,7 +7645,7 @@ namespace Clutter {
 		DISTANCE,
 		LAST
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_input_device_type_get_type ()")]
 	public enum InputDeviceType {
 		POINTER_DEVICE,
 		KEYBOARD_DEVICE,
@@ -7659,24 +7659,24 @@ namespace Clutter {
 		CURSOR_DEVICE,
 		N_DEVICE_TYPES
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INPUT_MODE_", type_id = "clutter_input_mode_get_type ()")]
 	public enum InputMode {
 		MASTER,
 		SLAVE,
 		FLOATING
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_INTERPOLATION_", type_id = "clutter_interpolation_get_type ()")]
 	public enum Interpolation {
 		LINEAR,
 		CUBIC
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_LONG_PRESS_", type_id = "clutter_long_press_state_get_type ()")]
 	public enum LongPressState {
 		QUERY,
 		ACTIVATE,
 		CANCEL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_modifier_type_get_type ()")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -7712,18 +7712,18 @@ namespace Clutter {
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_OFFSCREEN_REDIRECT_", type_id = "clutter_offscreen_redirect_get_type ()")]
 	[Flags]
 	public enum OffscreenRedirect {
 		AUTOMATIC_FOR_OPACITY,
 		ALWAYS
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ORIENTATION_", type_id = "clutter_orientation_get_type ()")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PATH_", type_id = "clutter_path_node_type_get_type ()")]
 	public enum PathNodeType {
 		MOVE_TO,
 		LINE_TO,
@@ -7733,42 +7733,42 @@ namespace Clutter {
 		REL_LINE_TO,
 		REL_CURVE_TO
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_PICK_", type_id = "clutter_pick_mode_get_type ()")]
 	public enum PickMode {
 		NONE,
 		REACTIVE,
 		ALL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REPAINT_FLAGS_", type_id = "clutter_repaint_flags_get_type ()")]
 	[Flags]
 	public enum RepaintFlags {
 		PRE_PAINT,
 		POST_PAINT,
 		QUEUE_REDRAW_ON_ADD
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_REQUEST_", type_id = "clutter_request_mode_get_type ()")]
 	public enum RequestMode {
 		HEIGHT_FOR_WIDTH,
 		WIDTH_FOR_HEIGHT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_rotate_axis_get_type ()")]
 	public enum RotateAxis {
 		X_AXIS,
 		Y_AXIS,
 		Z_AXIS
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ROTATE_", type_id = "clutter_rotate_direction_get_type ()")]
 	public enum RotateDirection {
 		CW,
 		CCW
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCALING_FILTER_", type_id = "clutter_scaling_filter_get_type ()")]
 	public enum ScalingFilter {
 		LINEAR,
 		NEAREST,
 		TRILINEAR
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_direction_get_type ()")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
@@ -7776,7 +7776,7 @@ namespace Clutter {
 		RIGHT,
 		SMOOTH
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCROLL_", type_id = "clutter_scroll_mode_get_type ()")]
 	[Flags]
 	public enum ScrollMode {
 		NONE,
@@ -7784,32 +7784,32 @@ namespace Clutter {
 		VERTICALLY,
 		BOTH
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_", has_type_id = false)]
 	public enum ShaderError {
 		NO_ASM,
 		NO_GLSL,
 		COMPILE
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_", type_id = "clutter_shader_type_get_type ()")]
 	public enum ShaderType {
 		VERTEX_SHADER,
 		FRAGMENT_SHADER
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SNAP_EDGE_", type_id = "clutter_snap_edge_get_type ()")]
 	public enum SnapEdge {
 		TOP,
 		RIGHT,
 		BOTTOM,
 		LEFT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STAGE_STATE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STAGE_STATE_", type_id = "clutter_stage_state_get_type ()")]
 	[Flags]
 	public enum StageState {
 		FULLSCREEN,
 		OFFSCREEN,
 		ACTIVATED
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
 	public enum StaticColor {
 		WHITE,
 		BLACK,
@@ -7857,12 +7857,12 @@ namespace Clutter {
 		ALUMINIUM_6,
 		TRANSPARENT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
 	public enum StepMode {
 		START,
 		END
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SWIPE_DIRECTION_", type_id = "clutter_swipe_direction_get_type ()")]
 	[Flags]
 	public enum SwipeDirection {
 		UP,
@@ -7870,19 +7870,19 @@ namespace Clutter {
 		LEFT,
 		RIGHT
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TABLE_ALIGNMENT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TABLE_ALIGNMENT_", type_id = "clutter_table_alignment_get_type ()")]
 	public enum TableAlignment {
 		START,
 		CENTER,
 		END
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXT_DIRECTION_", type_id = "clutter_text_direction_get_type ()")]
 	public enum TextDirection {
 		DEFAULT,
 		LTR,
 		RTL
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_", type_id = "clutter_texture_flags_get_type ()")]
 	[Flags]
 	public enum TextureFlags {
 		NONE,
@@ -7890,18 +7890,18 @@ namespace Clutter {
 		RGB_FLAG_PREMULT,
 		YUV_FLAG_YUV2
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_QUALITY_", type_id = "clutter_texture_quality_get_type ()")]
 	public enum TextureQuality {
 		LOW,
 		MEDIUM,
 		HIGH
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TIMELINE_", type_id = "clutter_timeline_direction_get_type ()")]
 	public enum TimelineDirection {
 		FORWARD,
 		BACKWARD
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_UNIT_", type_id = "clutter_unit_type_get_type ()")]
 	public enum UnitType {
 		PIXEL,
 		EM,
@@ -7909,13 +7909,13 @@ namespace Clutter {
 		POINT,
 		CM
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_FILTER_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_FILTER_", type_id = "clutter_x11_filter_return_get_type ()")]
 	public enum X11FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_XINPUT_")]
+	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_X11_XINPUT_", type_id = "clutter_x11_xinput_event_types_get_type ()")]
 	public enum X11XInputEventTypes {
 		KEY_PRESS_EVENT,
 		KEY_RELEASE_EVENT,
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 9acbd85..a919681 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -5327,7 +5327,7 @@ namespace Gdk {
 		public bool override_redirect;
 		public Gdk.WindowTypeHint type_hint;
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_AXIS_", type_id = "gdk_axis_use_get_type ()")]
 	public enum AxisUse {
 		IGNORE,
 		X,
@@ -5338,12 +5338,12 @@ namespace Gdk {
 		WHEEL,
 		LAST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_byte_order_get_type ()")]
 	public enum ByteOrder {
 		LSB_FIRST,
 		MSB_FIRST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_CROSSING_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_CROSSING_", type_id = "gdk_crossing_mode_get_type ()")]
 	public enum CrossingMode {
 		NORMAL,
 		GRAB,
@@ -5355,7 +5355,7 @@ namespace Gdk {
 		TOUCH_END,
 		DEVICE_SWITCH
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_cursor_type_get_type ()")]
 	public enum CursorType {
 		X_CURSOR,
 		ARROW,
@@ -5438,13 +5438,13 @@ namespace Gdk {
 		BLANK_CURSOR,
 		CURSOR_IS_PIXMAP
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DEVICE_TYPE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DEVICE_TYPE_", type_id = "gdk_device_type_get_type ()")]
 	public enum DeviceType {
 		MASTER,
 		SLAVE,
 		FLOATING
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ACTION_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_ACTION_", type_id = "gdk_drag_action_get_type ()")]
 	[Flags]
 	public enum DragAction {
 		DEFAULT,
@@ -5454,7 +5454,7 @@ namespace Gdk {
 		PRIVATE,
 		ASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DRAG_PROTO_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DRAG_PROTO_", type_id = "gdk_drag_protocol_get_type ()")]
 	public enum DragProtocol {
 		NONE,
 		MOTIF,
@@ -5464,7 +5464,7 @@ namespace Gdk {
 		OLE2,
 		LOCAL
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_event_mask_get_type ()")]
 	[Flags]
 	public enum EventMask {
 		EXPOSURE_MASK,
@@ -5492,7 +5492,7 @@ namespace Gdk {
 		SMOOTH_SCROLL_MASK,
 		ALL_EVENTS_MASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_event_type_get_type ()")]
 	public enum EventType {
 		NOTHING,
 		DELETE,
@@ -5539,19 +5539,19 @@ namespace Gdk {
 		TOUCH_CANCEL,
 		EVENT_LAST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FILTER_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FILTER_", type_id = "gdk_filter_return_get_type ()")]
 	public enum FilterReturn {
 		CONTINUE,
 		TRANSLATE,
 		REMOVE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNERSHIP_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNERSHIP_", type_id = "gdk_grab_ownership_get_type ()")]
 	public enum GrabOwnership {
 		NONE,
 		WINDOW,
 		APPLICATION
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAB_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAB_", type_id = "gdk_grab_status_get_type ()")]
 	public enum GrabStatus {
 		SUCCESS,
 		ALREADY_GRABBED,
@@ -5559,7 +5559,7 @@ namespace Gdk {
 		NOT_VIEWABLE,
 		FROZEN
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAVITY_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GRAVITY_", type_id = "gdk_gravity_get_type ()")]
 	public enum Gravity {
 		NORTH_WEST,
 		NORTH,
@@ -5572,13 +5572,13 @@ namespace Gdk {
 		SOUTH_EAST,
 		STATIC
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODE_", type_id = "gdk_input_mode_get_type ()")]
 	public enum InputMode {
 		DISABLED,
 		SCREEN,
 		WINDOW
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SOURCE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SOURCE_", type_id = "gdk_input_source_get_type ()")]
 	public enum InputSource {
 		MOUSE,
 		PEN,
@@ -5588,7 +5588,7 @@ namespace Gdk {
 		TOUCHSCREEN,
 		TOUCHPAD
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODIFIER_INTENT_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_MODIFIER_INTENT_", type_id = "gdk_modifier_intent_get_type ()")]
 	public enum ModifierIntent {
 		PRIMARY_ACCELERATOR,
 		CONTEXT_MENU,
@@ -5597,7 +5597,7 @@ namespace Gdk {
 		NO_TEXT_INPUT,
 		SHIFT_GROUP
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_modifier_type_get_type ()")]
 	[Flags]
 	public enum ModifierType {
 		SHIFT_MASK,
@@ -5619,7 +5619,7 @@ namespace Gdk {
 		RELEASE_MASK,
 		MODIFIER_MASK
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_NOTIFY_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_NOTIFY_", type_id = "gdk_notify_type_get_type ()")]
 	public enum NotifyType {
 		ANCESTOR,
 		VIRTUAL,
@@ -5628,24 +5628,24 @@ namespace Gdk {
 		NONLINEAR_VIRTUAL,
 		UNKNOWN
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNER_CHANGE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_OWNER_CHANGE_", type_id = "gdk_owner_change_get_type ()")]
 	public enum OwnerChange {
 		NEW_OWNER,
 		DESTROY,
 		CLOSE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROP_MODE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROP_MODE_", type_id = "gdk_prop_mode_get_type ()")]
 	public enum PropMode {
 		REPLACE,
 		PREPEND,
 		APPEND
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROPERTY_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_PROPERTY_", type_id = "gdk_property_state_get_type ()")]
 	public enum PropertyState {
 		NEW_VALUE,
 		DELETE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SCROLL_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SCROLL_", type_id = "gdk_scroll_direction_get_type ()")]
 	public enum ScrollDirection {
 		UP,
 		DOWN,
@@ -5653,13 +5653,13 @@ namespace Gdk {
 		RIGHT,
 		SMOOTH
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SETTING_ACTION_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_SETTING_ACTION_", type_id = "gdk_setting_action_get_type ()")]
 	public enum SettingAction {
 		NEW,
 		CHANGED,
 		DELETED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_", type_id = "gdk_status_get_type ()")]
 	public enum Status {
 		OK,
 		ERROR,
@@ -5667,13 +5667,13 @@ namespace Gdk {
 		ERROR_FILE,
 		ERROR_MEM
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISIBILITY_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISIBILITY_", type_id = "gdk_visibility_state_get_type ()")]
 	public enum VisibilityState {
 		UNOBSCURED,
 		PARTIAL,
 		FULLY_OBSCURED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISUAL_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VISUAL_", type_id = "gdk_visual_type_get_type ()")]
 	public enum VisualType {
 		STATIC_GRAY,
 		GRAYSCALE,
@@ -5682,7 +5682,7 @@ namespace Gdk {
 		TRUE_COLOR,
 		DIRECT_COLOR
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DECOR_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_DECOR_", type_id = "gdk_wm_decoration_get_type ()")]
 	[Flags]
 	public enum WMDecoration {
 		ALL,
@@ -5693,7 +5693,7 @@ namespace Gdk {
 		MINIMIZE,
 		MAXIMIZE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FUNC_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_FUNC_", type_id = "gdk_wm_function_get_type ()")]
 	[Flags]
 	public enum WMFunction {
 		ALL,
@@ -5703,7 +5703,7 @@ namespace Gdk {
 		MAXIMIZE,
 		CLOSE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WA_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WA_", type_id = "gdk_window_attributes_type_get_type ()")]
 	[Flags]
 	public enum WindowAttributesType {
 		TITLE,
@@ -5715,7 +5715,7 @@ namespace Gdk {
 		NOREDIR,
 		TYPE_HINT
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_EDGE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_EDGE_", type_id = "gdk_window_edge_get_type ()")]
 	public enum WindowEdge {
 		NORTH_WEST,
 		NORTH,
@@ -5726,7 +5726,7 @@ namespace Gdk {
 		SOUTH,
 		SOUTH_EAST
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_HINT_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_HINT_", type_id = "gdk_window_hints_get_type ()")]
 	[Flags]
 	public enum WindowHints {
 		POS,
@@ -5739,7 +5739,7 @@ namespace Gdk {
 		USER_POS,
 		USER_SIZE
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_STATE_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_STATE_", type_id = "gdk_window_state_get_type ()")]
 	[Flags]
 	public enum WindowState {
 		WITHDRAWN,
@@ -5751,7 +5751,7 @@ namespace Gdk {
 		BELOW,
 		FOCUSED
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_", type_id = "gdk_window_type_get_type ()")]
 	public enum WindowType {
 		ROOT,
 		TOPLEVEL,
@@ -5760,7 +5760,7 @@ namespace Gdk {
 		FOREIGN,
 		OFFSCREEN
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_TYPE_HINT_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_WINDOW_TYPE_HINT_", type_id = "gdk_window_type_hint_get_type ()")]
 	public enum WindowTypeHint {
 		NORMAL,
 		DIALOG,
@@ -5777,7 +5777,7 @@ namespace Gdk {
 		COMBO,
 		DND
 	}
-	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_INPUT_")]
+	[CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_INPUT_", type_id = "gdk_window_window_class_get_type ()")]
 	public enum WindowWindowClass {
 		[CCode (cname = "GDK_INPUT_OUTPUT")]
 		INPUT_OUTPUT,
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index a9180bb..f740764 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -174,30 +174,30 @@ namespace Gdk {
 		public uint8[] serialize ();
 		public GLib.StringBuilder to_csource (string name, Gdk.PixdataDumpType dump_type);
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_COLORSPACE_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_COLORSPACE_", type_id = "gdk_colorspace_get_type ()")]
 	public enum Colorspace {
 		RGB
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_INTERP_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_INTERP_", type_id = "gdk_interp_type_get_type ()")]
 	public enum InterpType {
 		NEAREST,
 		TILES,
 		BILINEAR,
 		HYPER
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ALPHA_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ALPHA_", type_id = "gdk_pixbuf_alpha_mode_get_type ()")]
 	public enum PixbufAlphaMode {
 		BILEVEL,
 		FULL
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ROTATE_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ROTATE_", type_id = "gdk_pixbuf_rotation_get_type ()")]
 	public enum PixbufRotation {
 		NONE,
 		COUNTERCLOCKWISE,
 		UPSIDEDOWN,
 		CLOCKWISE
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_DUMP_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_DUMP_", has_type_id = false)]
 	[Flags]
 	public enum PixdataDumpType {
 		PIXDATA_STREAM,
@@ -209,7 +209,7 @@ namespace Gdk {
 		CONST,
 		RLE_DECODER
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_")]
+	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", cprefix = "GDK_PIXDATA_", has_type_id = false)]
 	[Flags]
 	public enum PixdataType {
 		COLOR_TYPE_RGB,
diff --git a/vapi/gdl-3.0.vapi b/vapi/gdl-3.0.vapi
index 376fcc1..5ecf6c1 100644
--- a/vapi/gdl-3.0.vapi
+++ b/vapi/gdl-3.0.vapi
@@ -250,14 +250,14 @@ namespace Gdl {
 		public Cairo.RectangleInt rect;
 		public GLib.Value extra;
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_BAR_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_BAR_", type_id = "gdl_dock_bar_style_get_type ()")]
 	public enum DockBarStyle {
 		ICONS,
 		TEXT,
 		BOTH,
 		AUTO
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_ITEM_BEH_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_ITEM_BEH_", type_id = "gdl_dock_item_behavior_get_type ()")]
 	[Flags]
 	public enum DockItemBehavior {
 		NORMAL,
@@ -274,12 +274,12 @@ namespace Gdl {
 		CANT_ICONIFY,
 		NO_GRIP
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_ITEM_BUTTON_IMAGE_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_ITEM_BUTTON_IMAGE_", has_type_id = false)]
 	public enum DockItemButtonImageType {
 		CLOSE,
 		ICONIFY
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_", type_id = "gdl_dock_item_flags_get_type ()")]
 	[Flags]
 	public enum DockItemFlags {
 		IN_DRAG,
@@ -287,7 +287,7 @@ namespace Gdl {
 		ICONIFIED,
 		USER_ACTION
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_", type_id = "gdl_dock_object_flags_get_type ()")]
 	[Flags]
 	public enum DockObjectFlags {
 		AUTOMATIC,
@@ -295,13 +295,13 @@ namespace Gdl {
 		IN_REFLOW,
 		IN_DETACH
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_PARAM_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_PARAM_", type_id = "gdl_dock_param_flags_get_type ()")]
 	[Flags]
 	public enum DockParamFlags {
 		EXPORT,
 		AFTER
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_DOCK_", type_id = "gdl_dock_placement_get_type ()")]
 	public enum DockPlacement {
 		NONE,
 		TOP,
@@ -311,7 +311,7 @@ namespace Gdl {
 		CENTER,
 		FLOATING
 	}
-	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_SWITCHER_STYLE_")]
+	[CCode (cheader_filename = "gdl/gdl.h", cprefix = "GDL_SWITCHER_STYLE_", type_id = "gdl_switcher_style_get_type ()")]
 	public enum SwitcherStyle {
 		TEXT,
 		ICON,
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 399a399..7665870 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -2697,7 +2697,7 @@ namespace GLib {
 		public unowned GLib.Resource get_resource ();
 		public void init ();
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APP_INFO_CREATE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APP_INFO_CREATE_", type_id = "g_app_info_create_flags_get_type ()")]
 	[Flags]
 	public enum AppInfoCreateFlags {
 		NONE,
@@ -2705,7 +2705,7 @@ namespace GLib {
 		SUPPORTS_URIS,
 		SUPPORTS_STARTUP_NOTIFICATION
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APPLICATION_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_APPLICATION_", type_id = "g_application_flags_get_type ()")]
 	[Flags]
 	public enum ApplicationFlags {
 		FLAGS_NONE,
@@ -2716,7 +2716,7 @@ namespace GLib {
 		SEND_ENVIRONMENT,
 		NON_UNIQUE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ASK_PASSWORD_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ASK_PASSWORD_", type_id = "g_ask_password_flags_get_type ()")]
 	[Flags]
 	public enum AskPasswordFlags {
 		NEED_PASSWORD,
@@ -2725,20 +2725,20 @@ namespace GLib {
 		SAVING_SUPPORTED,
 		ANONYMOUS_SUPPORTED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_OWNER_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_OWNER_FLAGS_", type_id = "g_bus_name_owner_flags_get_type ()")]
 	[Flags]
 	public enum BusNameOwnerFlags {
 		NONE,
 		ALLOW_REPLACEMENT,
 		REPLACE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_WATCHER_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_NAME_WATCHER_FLAGS_", type_id = "g_bus_name_watcher_flags_get_type ()")]
 	[Flags]
 	public enum BusNameWatcherFlags {
 		NONE,
 		AUTO_START
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_BUS_TYPE_", type_id = "g_bus_type_get_type ()")]
 	public enum BusType {
 		STARTER,
 		NONE,
@@ -2757,33 +2757,33 @@ namespace GLib {
 		INPUT_AT_END,
 		FLUSH
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_", type_id = "g_converter_result_get_type ()")]
 	public enum ConverterResult {
 		ERROR,
 		CONVERTED,
 		FINISHED,
 		FLUSHED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CREDENTIALS_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_CREDENTIALS_TYPE_", type_id = "g_credentials_type_get_type ()")]
 	public enum CredentialsType {
 		INVALID,
 		LINUX_UCRED,
 		FREEBSD_CMSGCRED,
 		OPENBSD_SOCKPEERCRED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CALL_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CALL_FLAGS_", type_id = "g_dbus_call_flags_get_type ()")]
 	[Flags]
 	public enum DBusCallFlags {
 		NONE,
 		NO_AUTO_START
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CAPABILITY_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CAPABILITY_FLAGS_", type_id = "g_dbus_capability_flags_get_type ()")]
 	[Flags]
 	public enum DBusCapabilityFlags {
 		NONE,
 		UNIX_FD_PASSING
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CONNECTION_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_CONNECTION_FLAGS_", type_id = "g_dbus_connection_flags_get_type ()")]
 	[Flags]
 	public enum DBusConnectionFlags {
 		NONE,
@@ -2793,25 +2793,25 @@ namespace GLib {
 		MESSAGE_BUS_CONNECTION,
 		DELAY_MESSAGE_PROCESSING
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_INTERFACE_SKELETON_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_INTERFACE_SKELETON_FLAGS_", type_id = "g_dbus_interface_skeleton_flags_get_type ()")]
 	[Flags]
 	public enum DBusInterfaceSkeletonFlags {
 		NONE,
 		HANDLE_METHOD_INVOCATIONS_IN_THREAD
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_BYTE_ORDER_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_BYTE_ORDER_", type_id = "g_dbus_message_byte_order_get_type ()")]
 	public enum DBusMessageByteOrder {
 		BIG_ENDIAN,
 		LITTLE_ENDIAN
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_FLAGS_", type_id = "g_dbus_message_flags_get_type ()")]
 	[Flags]
 	public enum DBusMessageFlags {
 		NONE,
 		NO_REPLY_EXPECTED,
 		NO_AUTO_START
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_HEADER_FIELD_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_HEADER_FIELD_", type_id = "g_dbus_message_header_field_get_type ()")]
 	public enum DBusMessageHeaderField {
 		INVALID,
 		PATH,
@@ -2824,7 +2824,7 @@ namespace GLib {
 		SIGNATURE,
 		NUM_UNIX_FDS
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_MESSAGE_TYPE_", type_id = "g_dbus_message_type_get_type ()")]
 	public enum DBusMessageType {
 		INVALID,
 		METHOD_CALL,
@@ -2832,20 +2832,20 @@ namespace GLib {
 		ERROR,
 		SIGNAL
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_", type_id = "g_dbus_object_manager_client_flags_get_type ()")]
 	[Flags]
 	public enum DBusObjectManagerClientFlags {
 		NONE,
 		DO_NOT_AUTO_START
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROPERTY_INFO_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROPERTY_INFO_FLAGS_", type_id = "g_dbus_property_info_flags_get_type ()")]
 	[Flags]
 	public enum DBusPropertyInfoFlags {
 		NONE,
 		READABLE,
 		WRITABLE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROXY_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_PROXY_FLAGS_", type_id = "g_dbus_proxy_flags_get_type ()")]
 	[Flags]
 	public enum DBusProxyFlags {
 		NONE,
@@ -2854,50 +2854,50 @@ namespace GLib {
 		DO_NOT_AUTO_START,
 		GET_INVALIDATED_PROPERTIES
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SEND_MESSAGE_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SEND_MESSAGE_FLAGS_", type_id = "g_dbus_send_message_flags_get_type ()")]
 	[Flags]
 	public enum DBusSendMessageFlags {
 		NONE,
 		PRESERVE_SERIAL
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SERVER_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SERVER_FLAGS_", type_id = "g_dbus_server_flags_get_type ()")]
 	[Flags]
 	public enum DBusServerFlags {
 		NONE,
 		RUN_IN_THREAD,
 		AUTHENTICATION_ALLOW_ANONYMOUS
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SIGNAL_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SIGNAL_FLAGS_", type_id = "g_dbus_signal_flags_get_type ()")]
 	[Flags]
 	public enum DBusSignalFlags {
 		NONE,
 		NO_MATCH_RULE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SUBTREE_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_SUBTREE_FLAGS_", type_id = "g_dbus_subtree_flags_get_type ()")]
 	[Flags]
 	public enum DBusSubtreeFlags {
 		NONE,
 		DISPATCH_TO_UNENUMERATED_NODES
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_BYTE_ORDER_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_BYTE_ORDER_", type_id = "g_data_stream_byte_order_get_type ()")]
 	public enum DataStreamByteOrder {
 		BIG_ENDIAN,
 		LITTLE_ENDIAN,
 		HOST_ENDIAN
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_NEWLINE_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DATA_STREAM_NEWLINE_TYPE_", type_id = "g_data_stream_newline_type_get_type ()")]
 	public enum DataStreamNewlineType {
 		LF,
 		CR,
 		CR_LF,
 		ANY
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_", type_id = "g_drive_start_flags_get_type ()")]
 	[Flags]
 	public enum DriveStartFlags {
 		NONE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_STOP_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_DRIVE_START_STOP_TYPE_", type_id = "g_drive_start_stop_type_get_type ()")]
 	public enum DriveStartStopType {
 		UNKNOWN,
 		SHUTDOWN,
@@ -2905,27 +2905,27 @@ namespace GLib {
 		MULTIDISK,
 		PASSWORD
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_EMBLEM_ORIGIN_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_EMBLEM_ORIGIN_", type_id = "g_emblem_origin_get_type ()")]
 	public enum EmblemOrigin {
 		UNKNOWN,
 		DEVICE,
 		LIVEMETADATA,
 		TAG
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_INFO_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_INFO_", type_id = "g_file_attribute_info_flags_get_type ()")]
 	[Flags]
 	public enum FileAttributeInfoFlags {
 		NONE,
 		COPY_WITH_FILE,
 		COPY_WHEN_MOVED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_STATUS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_STATUS_", type_id = "g_file_attribute_status_get_type ()")]
 	public enum FileAttributeStatus {
 		UNSET,
 		SET,
 		ERROR_SETTING
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_ATTRIBUTE_TYPE_", type_id = "g_file_attribute_type_get_type ()")]
 	public enum FileAttributeType {
 		INVALID,
 		STRING,
@@ -2938,7 +2938,7 @@ namespace GLib {
 		OBJECT,
 		STRINGV
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_COPY_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_COPY_", type_id = "g_file_copy_flags_get_type ()")]
 	[Flags]
 	public enum FileCopyFlags {
 		NONE,
@@ -2949,14 +2949,14 @@ namespace GLib {
 		NO_FALLBACK_FOR_MOVE,
 		TARGET_DEFAULT_PERMS
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_CREATE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_CREATE_", type_id = "g_file_create_flags_get_type ()")]
 	[Flags]
 	public enum FileCreateFlags {
 		NONE,
 		PRIVATE,
 		REPLACE_DESTINATION
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_EVENT_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_EVENT_", type_id = "g_file_monitor_event_get_type ()")]
 	public enum FileMonitorEvent {
 		CHANGED,
 		CHANGES_DONE_HINT,
@@ -2967,20 +2967,20 @@ namespace GLib {
 		UNMOUNTED,
 		MOVED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_MONITOR_", type_id = "g_file_monitor_flags_get_type ()")]
 	[Flags]
 	public enum FileMonitorFlags {
 		NONE,
 		WATCH_MOUNTS,
 		SEND_MOVED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_QUERY_INFO_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_QUERY_INFO_", type_id = "g_file_query_info_flags_get_type ()")]
 	[Flags]
 	public enum FileQueryInfoFlags {
 		NONE,
 		NOFOLLOW_SYMLINKS
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILE_TYPE_", type_id = "g_file_type_get_type ()")]
 	public enum FileType {
 		UNKNOWN,
 		REGULAR,
@@ -2990,18 +2990,18 @@ namespace GLib {
 		SHORTCUT,
 		MOUNTABLE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILESYSTEM_PREVIEW_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_FILESYSTEM_PREVIEW_TYPE_", type_id = "g_filesystem_preview_type_get_type ()")]
 	public enum FilesystemPreviewType {
 		IF_ALWAYS,
 		IF_LOCAL,
 		NEVER
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_MODULE_SCOPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_MODULE_SCOPE_", type_id = "g_io_module_scope_flags_get_type ()")]
 	public enum IOModuleScopeFlags {
 		NONE,
 		BLOCK_DUPLICATES
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_STREAM_SPLICE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_IO_STREAM_SPLICE_", type_id = "g_io_stream_splice_flags_get_type ()")]
 	[Flags]
 	public enum IOStreamSpliceFlags {
 		NONE,
@@ -3009,37 +3009,37 @@ namespace GLib {
 		CLOSE_STREAM2,
 		WAIT_FOR_BOTH
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_MOUNT_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_MOUNT_", type_id = "g_mount_mount_flags_get_type ()")]
 	[Flags]
 	public enum MountMountFlags {
 		NONE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_OPERATION_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_OPERATION_", type_id = "g_mount_operation_result_get_type ()")]
 	public enum MountOperationResult {
 		HANDLED,
 		ABORTED,
 		UNHANDLED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_UNMOUNT_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_MOUNT_UNMOUNT_", type_id = "g_mount_unmount_flags_get_type ()")]
 	[Flags]
 	public enum MountUnmountFlags {
 		NONE,
 		FORCE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_OUTPUT_STREAM_SPLICE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_OUTPUT_STREAM_SPLICE_", type_id = "g_output_stream_splice_flags_get_type ()")]
 	[Flags]
 	public enum OutputStreamSpliceFlags {
 		NONE,
 		CLOSE_SOURCE,
 		CLOSE_TARGET
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_PASSWORD_SAVE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_PASSWORD_SAVE_", type_id = "g_password_save_get_type ()")]
 	public enum PasswordSave {
 		NEVER,
 		FOR_SESSION,
 		PERMANENTLY
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOLVER_RECORD_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOLVER_RECORD_", type_id = "g_resolver_record_type_get_type ()")]
 	public enum ResolverRecordType {
 		SRV,
 		MX,
@@ -3047,18 +3047,18 @@ namespace GLib {
 		SOA,
 		NS
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_FLAGS_", type_id = "g_resource_flags_get_type ()")]
 	[Flags]
 	public enum ResourceFlags {
 		NONE,
 		COMPRESSED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_LOOKUP_FLAGS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_LOOKUP_FLAGS_", type_id = "g_resource_lookup_flags_get_type ()")]
 	[Flags]
 	public enum ResourceLookupFlags {
 		NONE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SETTINGS_BIND_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SETTINGS_BIND_", type_id = "g_settings_bind_flags_get_type ()")]
 	[Flags]
 	public enum SettingsBindFlags {
 		DEFAULT,
@@ -3068,7 +3068,7 @@ namespace GLib {
 		GET_NO_CHANGES,
 		INVERT_BOOLEAN
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_CLIENT_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_CLIENT_", type_id = "g_socket_client_event_get_type ()")]
 	public enum SocketClientEvent {
 		RESOLVING,
 		RESOLVED,
@@ -3080,14 +3080,14 @@ namespace GLib {
 		TLS_HANDSHAKED,
 		COMPLETE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_FAMILY_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_FAMILY_", type_id = "g_socket_family_get_type ()")]
 	public enum SocketFamily {
 		INVALID,
 		UNIX,
 		IPV4,
 		IPV6
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_MSG_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_MSG_", type_id = "g_socket_msg_flags_get_type ()")]
 	[Flags]
 	public enum SocketMsgFlags {
 		NONE,
@@ -3095,7 +3095,7 @@ namespace GLib {
 		PEEK,
 		DONTROUTE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_PROTOCOL_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_PROTOCOL_", type_id = "g_socket_protocol_get_type ()")]
 	public enum SocketProtocol {
 		UNKNOWN,
 		DEFAULT,
@@ -3103,25 +3103,25 @@ namespace GLib {
 		UDP,
 		SCTP
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_TYPE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_SOCKET_TYPE_", type_id = "g_socket_type_get_type ()")]
 	public enum SocketType {
 		INVALID,
 		STREAM,
 		DATAGRAM,
 		SEQPACKET
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TEST_DBUS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TEST_DBUS_", type_id = "g_test_dbus_flags_get_type ()")]
 	[Flags]
 	public enum TestDBusFlags {
 		NONE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_AUTHENTICATION_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_AUTHENTICATION_", type_id = "g_tls_authentication_mode_get_type ()")]
 	public enum TlsAuthenticationMode {
 		NONE,
 		REQUESTED,
 		REQUIRED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CERTIFICATE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CERTIFICATE_", type_id = "g_tls_certificate_flags_get_type ()")]
 	[Flags]
 	public enum TlsCertificateFlags {
 		UNKNOWN_CA,
@@ -3133,23 +3133,23 @@ namespace GLib {
 		GENERIC_ERROR,
 		VALIDATE_ALL
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_DATABASE_LOOKUP_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_DATABASE_LOOKUP_", type_id = "g_tls_database_lookup_flags_get_type ()")]
 	public enum TlsDatabaseLookupFlags {
 		NONE,
 		KEYPAIR
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_DATABASE_VERIFY_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_DATABASE_VERIFY_", type_id = "g_tls_database_verify_flags_get_type ()")]
 	[Flags]
 	public enum TlsDatabaseVerifyFlags {
 		NONE
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_INTERACTION_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_INTERACTION_", type_id = "g_tls_interaction_result_get_type ()")]
 	public enum TlsInteractionResult {
 		UNHANDLED,
 		HANDLED,
 		FAILED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_PASSWORD_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_PASSWORD_", type_id = "g_tls_password_flags_get_type ()")]
 	[Flags]
 	public enum TlsPasswordFlags {
 		NONE,
@@ -3157,13 +3157,13 @@ namespace GLib {
 		MANY_TRIES,
 		FINAL_TRY
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_REHANDSHAKE_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_REHANDSHAKE_", type_id = "g_tls_rehandshake_mode_get_type ()")]
 	public enum TlsRehandshakeMode {
 		NEVER,
 		SAFELY,
 		UNSAFELY
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_UNIX_SOCKET_ADDRESS_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_UNIX_SOCKET_ADDRESS_", type_id = "g_unix_socket_address_type_get_type ()")]
 	public enum UnixSocketAddressType {
 		INVALID,
 		ANONYMOUS,
@@ -3171,7 +3171,7 @@ namespace GLib {
 		ABSTRACT,
 		ABSTRACT_PADDED
 	}
-	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ZLIB_COMPRESSOR_FORMAT_")]
+	[CCode (cheader_filename = "gio/gio.h", cprefix = "G_ZLIB_COMPRESSOR_FORMAT_", type_id = "g_zlib_compressor_format_get_type ()")]
 	public enum ZlibCompressorFormat {
 		ZLIB,
 		GZIP,
diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index 0f67601..3bcd8ef 100644
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -301,26 +301,26 @@ namespace GI {
 	[CCode (cheader_filename = "girepository.h", cname = "_GIBaseInfoStub", has_type_id = false)]
 	public struct _BaseInfoStub {
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_ARRAY_TYPE_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_ARRAY_TYPE_", has_type_id = false)]
 	public enum ArrayType {
 		C,
 		ARRAY,
 		PTR_ARRAY,
 		BYTE_ARRAY
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_DIRECTION_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_DIRECTION_", has_type_id = false)]
 	public enum Direction {
 		IN,
 		OUT,
 		INOUT
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_FIELD_IS_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_FIELD_IS_", has_type_id = false)]
 	[Flags]
 	public enum FieldInfoFlags {
 		READABLE,
 		WRITABLE
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_FUNCTION_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_FUNCTION_", has_type_id = false)]
 	[Flags]
 	public enum FunctionInfoFlags {
 		IS_METHOD,
@@ -330,7 +330,7 @@ namespace GI {
 		WRAPS_VFUNC,
 		THROWS
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_INFO_TYPE_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_INFO_TYPE_", has_type_id = false)]
 	public enum InfoType {
 		INVALID,
 		FUNCTION,
@@ -354,33 +354,33 @@ namespace GI {
 		UNRESOLVED;
 		public static unowned string to_string (GI.InfoType type);
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_ERROR_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_ERROR_", has_type_id = false)]
 	public enum RepositoryError {
 		TYPELIB_NOT_FOUND,
 		NAMESPACE_MISMATCH,
 		NAMESPACE_VERSION_CONFLICT,
 		LIBRARY_NOT_FOUND
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_LOAD_FLAG_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_LOAD_FLAG_", has_type_id = false)]
 	[Flags]
 	public enum RepositoryLoadFlags {
 		[CCode (cname = "G_IREPOSITORY_LOAD_FLAG_LAZY")]
 		IREPOSITORY_LOAD_FLAG_LAZY
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_SCOPE_TYPE_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_SCOPE_TYPE_", has_type_id = false)]
 	public enum ScopeType {
 		INVALID,
 		CALL,
 		ASYNC,
 		NOTIFIED
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_TRANSFER_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_TRANSFER_", has_type_id = false)]
 	public enum Transfer {
 		NOTHING,
 		CONTAINER,
 		EVERYTHING
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_TYPE_TAG_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_TYPE_TAG_", has_type_id = false)]
 	public enum TypeTag {
 		VOID,
 		BOOLEAN,
@@ -406,7 +406,7 @@ namespace GI {
 		UNICHAR;
 		public static unowned string to_string (GI.TypeTag type);
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "GI_VFUNC_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "GI_VFUNC_", has_type_id = false)]
 	[Flags]
 	public enum VFuncInfoFlags {
 		MUST_CHAIN_UP,
@@ -414,7 +414,7 @@ namespace GI {
 		MUST_NOT_OVERRIDE,
 		THROWS
 	}
-	[CCode (cheader_filename = "girepository.h", cprefix = "G_INVOKE_ERROR_")]
+	[CCode (cheader_filename = "girepository.h", cprefix = "G_INVOKE_ERROR_", has_type_id = false)]
 	public enum nvokeError {
 		FAILED,
 		SYMBOL_NOT_FOUND,
diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
index 509c303..ac48733 100644
--- a/vapi/gtksourceview-3.0.vapi
+++ b/vapi/gtksourceview-3.0.vapi
@@ -581,7 +581,7 @@ namespace Gtk {
 		[HasEmitter]
 		public virtual signal void can_undo_changed ();
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_BRACKET_MATCH_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_BRACKET_MATCH_", type_id = "gtk_source_bracket_match_type_get_type ()")]
 	[GIR (name = "BracketMatchType")]
 	public enum SourceBracketMatchType {
 		NONE,
@@ -589,7 +589,7 @@ namespace Gtk {
 		NOT_FOUND,
 		FOUND
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_COMPLETION_ACTIVATION_", type_id = "gtk_source_completion_activation_get_type ()")]
 	[Flags]
 	[GIR (name = "CompletionActivation")]
 	public enum SourceCompletionActivation {
@@ -597,7 +597,7 @@ namespace Gtk {
 		INTERACTIVE,
 		USER_REQUESTED
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_DRAW_SPACES_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_DRAW_SPACES_", type_id = "gtk_source_draw_spaces_flags_get_type ()")]
 	[Flags]
 	[GIR (name = "DrawSpacesFlags")]
 	public enum SourceDrawSpacesFlags {
@@ -610,14 +610,14 @@ namespace Gtk {
 		TRAILING,
 		ALL
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_", type_id = "gtk_source_gutter_renderer_alignment_mode_get_type ()")]
 	[GIR (name = "GutterRendererAlignmentMode")]
 	public enum SourceGutterRendererAlignmentMode {
 		CELL,
 		FIRST,
 		LAST
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_GUTTER_RENDERER_STATE_", type_id = "gtk_source_gutter_renderer_state_get_type ()")]
 	[Flags]
 	[GIR (name = "GutterRendererState")]
 	public enum SourceGutterRendererState {
@@ -626,7 +626,7 @@ namespace Gtk {
 		PRELIT,
 		SELECTED
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SMART_HOME_END_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_SMART_HOME_END_", type_id = "gtk_source_smart_home_end_type_get_type ()")]
 	[GIR (name = "SmartHomeEndType")]
 	public enum SourceSmartHomeEndType {
 		DISABLED,
@@ -634,7 +634,7 @@ namespace Gtk {
 		AFTER,
 		ALWAYS
 	}
-	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_")]
+	[CCode (cheader_filename = "gtksourceview/gtksource.h", cprefix = "GTK_SOURCE_VIEW_GUTTER_POSITION_", type_id = "gtk_source_view_gutter_position_get_type ()")]
 	[GIR (name = "ViewGutterPosition")]
 	public enum SourceViewGutterPosition {
 		LINES,
diff --git a/vapi/gudev-1.0.vapi b/vapi/gudev-1.0.vapi
index c21e15e..d0db744 100644
--- a/vapi/gudev-1.0.vapi
+++ b/vapi/gudev-1.0.vapi
@@ -78,7 +78,7 @@ namespace GUdev {
 	[SimpleType]
 	public struct DeviceNumber : Posix.dev_t {
 	}
-	[CCode (cheader_filename = "gudev/gudev.h", cprefix = "G_UDEV_DEVICE_TYPE_")]
+	[CCode (cheader_filename = "gudev/gudev.h", cprefix = "G_UDEV_DEVICE_TYPE_", type_id = "g_udev_device_type_get_type ()")]
 	public enum DeviceType {
 		NONE,
 		BLOCK,
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index f839677..8bc9ce1 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -209,14 +209,14 @@ namespace Json {
 		public abstract Json.Node serialize_property (string property_name, GLib.Value value, GLib.ParamSpec pspec);
 		public abstract void set_property (GLib.ParamSpec pspec, GLib.Value value);
 	}
-	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_NODE_")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_NODE_", has_type_id = false)]
 	public enum NodeType {
 		OBJECT,
 		ARRAY,
 		VALUE,
 		NULL
 	}
-	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PARSER_ERROR_")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PARSER_ERROR_", has_type_id = false)]
 	public enum ParserError {
 		PARSE,
 		TRAILING_COMMA,
@@ -225,12 +225,12 @@ namespace Json {
 		INVALID_BAREWORD,
 		UNKNOWN
 	}
-	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PATH_ERROR_INVALID_")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PATH_ERROR_INVALID_", has_type_id = false)]
 	public enum PathError {
 		[CCode (cname = "JSON_PATH_ERROR_INVALID_QUERY")]
 		PATH_ERROR_INVALID_QUERY
 	}
-	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_READER_ERROR_")]
+	[CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_READER_ERROR_", has_type_id = false)]
 	public enum ReaderError {
 		NO_ARRAY,
 		INVALID_INDEX,
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index ee836e7..c3364c0 100644
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -1695,20 +1695,20 @@ namespace GData {
 		public static bool from_hexadecimal (string hexadecimal, out GData.Color color);
 		public string to_hexadecimal ();
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_BATCH_OPERATION_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_BATCH_OPERATION_", type_id = "gdata_batch_operation_type_get_type ()")]
 	public enum BatchOperationType {
 		QUERY,
 		INSERTION,
 		UPDATE,
 		DELETION
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_EXPRESSION_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_EXPRESSION_", type_id = "gdata_media_expression_get_type ()")]
 	public enum MediaExpression {
 		SAMPLE,
 		FULL,
 		NONSTOP
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_", type_id = "gdata_media_medium_get_type ()")]
 	public enum MediaMedium {
 		UNKNOWN,
 		IMAGE,
@@ -1717,7 +1717,7 @@ namespace GData {
 		DOCUMENT,
 		EXECUTABLE
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_OPERATION_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_OPERATION_", type_id = "gdata_operation_type_get_type ()")]
 	public enum OperationType {
 		QUERY,
 		INSERTION,
@@ -1728,44 +1728,44 @@ namespace GData {
 		AUTHENTICATION,
 		BATCH
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PICASAWEB_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PICASAWEB_", type_id = "gdata_picasaweb_visibility_get_type ()")]
 	public enum PicasaWebVisibility {
 		PUBLIC,
 		PRIVATE
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_AGE_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_AGE_", type_id = "gdata_youtube_age_get_type ()")]
 	public enum YouTubeAge {
 		ALL_TIME,
 		TODAY,
 		THIS_WEEK,
 		THIS_MONTH
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_FORMAT_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_FORMAT_", type_id = "gdata_youtube_format_get_type ()")]
 	public enum YouTubeFormat {
 		UNKNOWN,
 		RTSP_H263_AMR,
 		HTTP_SWF,
 		RTSP_MPEG4_AAC
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_PERMISSION_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_PERMISSION_", type_id = "gdata_youtube_permission_get_type ()")]
 	public enum YouTubePermission {
 		ALLOWED,
 		DENIED,
 		MODERATED
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SAFE_SEARCH_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SAFE_SEARCH_", type_id = "gdata_youtube_safe_search_get_type ()")]
 	public enum YouTubeSafeSearch {
 		NONE,
 		MODERATE,
 		STRICT
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SORT_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SORT_", type_id = "gdata_youtube_sort_order_get_type ()")]
 	public enum YouTubeSortOrder {
 		NONE,
 		ASCENDING,
 		DESCENDING
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_", type_id = "gdata_youtube_standard_feed_type_get_type ()")]
 	public enum YouTubeStandardFeedType {
 		TOP_RATED_FEED,
 		TOP_FAVORITES_FEED,
@@ -1778,7 +1778,7 @@ namespace GData {
 		RECENTLY_FEATURED_FEED,
 		WATCH_ON_MOBILE_FEED
 	}
-	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_UPLOADER_")]
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_UPLOADER_", type_id = "gdata_youtube_uploader_get_type ()")]
 	public enum YouTubeUploader {
 		ALL,
 		PARTNER
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 74d082f..8ed1bfd 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -807,24 +807,24 @@ namespace Soup {
 		public int64 start;
 		public int64 end;
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ADDRESS_FAMILY_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ADDRESS_FAMILY_", type_id = "soup_address_family_get_type ()")]
 	public enum AddressFamily {
 		INVALID,
 		IPV4,
 		IPV6
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_RESPONSE_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_RESPONSE_", type_id = "soup_cache_response_get_type ()")]
 	public enum CacheResponse {
 		FRESH,
 		NEEDS_VALIDATION,
 		STALE
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_", type_id = "soup_cache_type_get_type ()")]
 	public enum CacheType {
 		SINGLE_USER,
 		SHARED
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CACHE_", type_id = "soup_cacheability_get_type ()")]
 	[Flags]
 	public enum Cacheability {
 		CACHEABLE,
@@ -832,7 +832,7 @@ namespace Soup {
 		INVALIDATES,
 		VALIDATES
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CONNECTION_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_CONNECTION_", type_id = "soup_connection_state_get_type ()")]
 	public enum ConnectionState {
 		NEW,
 		CONNECTING,
@@ -841,13 +841,13 @@ namespace Soup {
 		REMOTE_DISCONNECTED,
 		DISCONNECTED
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_COOKIE_JAR_ACCEPT_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_COOKIE_JAR_ACCEPT_", type_id = "soup_cookie_jar_accept_policy_get_type ()")]
 	public enum CookieJarAcceptPolicy {
 		ALWAYS,
 		NEVER,
 		NO_THIRD_PARTY
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_DATE_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_DATE_", type_id = "soup_date_format_get_type ()")]
 	public enum DateFormat {
 		HTTP,
 		COOKIE,
@@ -857,7 +857,7 @@ namespace Soup {
 		ISO8601,
 		ISO8601_XMLRPC
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ENCODING_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_ENCODING_", type_id = "soup_encoding_get_type ()")]
 	public enum Encoding {
 		UNRECOGNIZED,
 		NONE,
@@ -866,18 +866,18 @@ namespace Soup {
 		CHUNKED,
 		BYTERANGES
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_EXPECTATION_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_EXPECTATION_", type_id = "soup_expectation_get_type ()")]
 	[Flags]
 	public enum Expectation {
 		UNRECOGNIZED,
 		CONTINUE
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HTTP_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_HTTP_", type_id = "soup_http_version_get_type ()")]
 	public enum HTTPVersion {
 		@1_0,
 		@1_1
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_STATUS_", type_id = "soup_known_status_code_get_type ()")]
 	public enum KnownStatusCode {
 		NONE,
 		CANCELLED,
@@ -943,21 +943,21 @@ namespace Soup {
 		INSUFFICIENT_STORAGE,
 		NOT_EXTENDED
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_LOGGER_LOG_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_LOGGER_LOG_", type_id = "soup_logger_log_level_get_type ()")]
 	public enum LoggerLogLevel {
 		NONE,
 		MINIMAL,
 		HEADERS,
 		BODY
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MEMORY_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MEMORY_", type_id = "soup_memory_use_get_type ()")]
 	public enum MemoryUse {
 		STATIC,
 		TAKE,
 		COPY,
 		TEMPORARY
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_", type_id = "soup_message_flags_get_type ()")]
 	[Flags]
 	public enum MessageFlags {
 		NO_REDIRECT,
@@ -967,13 +967,13 @@ namespace Soup {
 		CERTIFICATE_TRUSTED,
 		NEW_CONNECTION
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_HEADERS_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_MESSAGE_HEADERS_", type_id = "soup_message_headers_type_get_type ()")]
 	public enum MessageHeadersType {
 		REQUEST,
 		RESPONSE,
 		MULTIPART
 	}
-	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SOCKET_")]
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SOCKET_", type_id = "soup_socket_io_status_get_type ()")]
 	public enum SocketIOStatus {
 		OK,
 		WOULD_BLOCK,
diff --git a/vapi/libwnck-3.0.vapi b/vapi/libwnck-3.0.vapi
index 6b005c8..d8ff688 100644
--- a/vapi/libwnck-3.0.vapi
+++ b/vapi/libwnck-3.0.vapi
@@ -257,30 +257,30 @@ namespace Wnck {
 		public int current_row;
 		public int current_col;
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_CLIENT_TYPE_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_CLIENT_TYPE_", type_id = "wnck_client_type_get_type ()")]
 	public enum ClientType {
 		APPLICATION,
 		PAGER
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_MOTION_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_MOTION_", type_id = "wnck_motion_direction_get_type ()")]
 	public enum MotionDirection {
 		UP,
 		DOWN,
 		LEFT,
 		RIGHT
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_PAGER_DISPLAY_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_PAGER_DISPLAY_", type_id = "wnck_pager_display_mode_get_type ()")]
 	public enum PagerDisplayMode {
 		NAME,
 		CONTENT
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_TASKLIST_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_TASKLIST_", type_id = "wnck_tasklist_grouping_type_get_type ()")]
 	public enum TasklistGroupingType {
 		NEVER_GROUP,
 		AUTO_GROUP,
 		ALWAYS_GROUP
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_ACTION_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_ACTION_", type_id = "wnck_window_actions_get_type ()")]
 	[Flags]
 	public enum WindowActions {
 		MOVE,
@@ -303,7 +303,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_GRAVITY_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_GRAVITY_", type_id = "wnck_window_gravity_get_type ()")]
 	public enum WindowGravity {
 		CURRENT,
 		NORTHWEST,
@@ -317,7 +317,7 @@ namespace Wnck {
 		SOUTHEAST,
 		STATIC
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_CHANGE_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_CHANGE_", type_id = "wnck_window_move_resize_mask_get_type ()")]
 	[Flags]
 	public enum WindowMoveResizeMask {
 		X,
@@ -325,7 +325,7 @@ namespace Wnck {
 		WIDTH,
 		HEIGHT
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_STATE_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_STATE_", type_id = "wnck_window_state_get_type ()")]
 	[Flags]
 	public enum WindowState {
 		MINIMIZED,
@@ -342,7 +342,7 @@ namespace Wnck {
 		ABOVE,
 		BELOW
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cprefix = "WNCK_WINDOW_", type_id = "wnck_window_type_get_type ()")]
 	public enum WindowType {
 		NORMAL,
 		DESKTOP,
@@ -353,14 +353,14 @@ namespace Wnck {
 		UTILITY,
 		SPLASHSCREEN
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutCorner", cprefix = "WNCK_LAYOUT_CORNER_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutCorner", cprefix = "WNCK_LAYOUT_CORNER_", has_type_id = false)]
 	public enum _LayoutCorner {
 		TOPLEFT,
 		TOPRIGHT,
 		BOTTOMRIGHT,
 		BOTTOMLEFT
 	}
-	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutOrientation", cprefix = "WNCK_LAYOUT_ORIENTATION_")]
+	[CCode (cheader_filename = "libwnck/libwnck.h", cname = "_WnckLayoutOrientation", cprefix = "WNCK_LAYOUT_ORIENTATION_", has_type_id = false)]
 	public enum _LayoutOrientation {
 		HORIZONTAL,
 		VERTICAL
diff --git a/vapi/mx-1.0.vapi b/vapi/mx-1.0.vapi
index e2c1602..5464968 100644
--- a/vapi/mx-1.0.vapi
+++ b/vapi/mx-1.0.vapi
@@ -1201,32 +1201,32 @@ namespace Mx {
 	[CCode (cheader_filename = "mx/mx.h", has_type_id = false)]
 	public struct SettingsProviderIface {
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ACTOR_MANAGER_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ACTOR_MANAGER_", type_id = "mx_actor_manager_error_get_type ()")]
 	public enum ActorManagerError {
 		CONTAINER_DESTROYED,
 		ACTOR_DESTROYED,
 		CREATION_FAILED,
 		UNKNOWN_OPERATION
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ALIGN_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ALIGN_", type_id = "mx_align_get_type ()")]
 	public enum Align {
 		START,
 		MIDDLE,
 		END
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_APPLICATION_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_APPLICATION_", type_id = "mx_application_flags_get_type ()")]
 	[Flags]
 	public enum ApplicationFlags {
 		SINGLE_INSTANCE,
 		KEEP_ALIVE
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_DRAG_AXIS_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_DRAG_AXIS_", type_id = "mx_drag_axis_get_type ()")]
 	public enum DragAxis {
 		NONE,
 		X,
 		Y
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_DIRECTION_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_DIRECTION_", type_id = "mx_focus_direction_get_type ()")]
 	public enum FocusDirection {
 		OUT,
 		UP,
@@ -1236,7 +1236,7 @@ namespace Mx {
 		NEXT,
 		PREVIOUS
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_HINT_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FOCUS_HINT_", type_id = "mx_focus_hint_get_type ()")]
 	public enum FocusHint {
 		FIRST,
 		LAST,
@@ -1247,7 +1247,7 @@ namespace Mx {
 		FROM_RIGHT;
 		public static Mx.FocusHint from_direction (Mx.FocusDirection direction);
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FONT_WEIGHT_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_FONT_WEIGHT_", type_id = "mx_font_weight_get_type ()")]
 	public enum FontWeight {
 		NORMAL,
 		BOLD,
@@ -1255,45 +1255,45 @@ namespace Mx {
 		LIGHTER;
 		public static void set_from_string (GLib.Value value, string str);
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_IMAGE_SCALE_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_IMAGE_SCALE_", type_id = "mx_image_scale_mode_get_type ()")]
 	public enum ImageScaleMode {
 		NONE,
 		FIT,
 		CROP
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_KINETIC_SCROLL_VIEW_STATE_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_KINETIC_SCROLL_VIEW_STATE_", type_id = "mx_kinetic_scroll_view_state_get_type ()")]
 	public enum KineticScrollViewState {
 		IDLE,
 		PANNING,
 		SCROLLING,
 		CLAMPING
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_LONG_PRESS_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_LONG_PRESS_", type_id = "mx_long_press_action_get_type ()")]
 	public enum LongPressAction {
 		QUERY,
 		ACTION,
 		CANCEL
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ORIENTATION_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_ORIENTATION_", type_id = "mx_orientation_get_type ()")]
 	public enum Orientation {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_POSITION_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_POSITION_", type_id = "mx_position_get_type ()")]
 	public enum Position {
 		TOP,
 		RIGHT,
 		BOTTOM,
 		LEFT
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_SCROLL_POLICY_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_SCROLL_POLICY_", type_id = "mx_scroll_policy_get_type ()")]
 	public enum ScrollPolicy {
 		NONE,
 		HORIZONTAL,
 		VERTICAL,
 		BOTH
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_CHANGED_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_STYLE_CHANGED_", type_id = "mx_style_changed_flags_get_type ()")]
 	[Flags]
 	public enum StyleChangedFlags {
 		NONE,
@@ -1307,12 +1307,12 @@ namespace Mx {
 		[CCode (cname = "MX_STYLE_ERROR_INVALID_FILE")]
 		INVALID_FILE
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_TOOLTIP_ANIMATION_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_TOOLTIP_ANIMATION_", type_id = "mx_tooltip_animation_get_type ()")]
 	public enum TooltipAnimation {
 		BOUNCE,
 		FADE
 	}
-	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_WINDOW_")]
+	[CCode (cheader_filename = "mx/mx.h", cprefix = "MX_WINDOW_", type_id = "mx_window_rotation_get_type ()")]
 	public enum WindowRotation {
 		[CCode (cname = "MX_WINDOW_ROTATION_0")]
 		@0,
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 05ba90f..9e1c65e 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -586,13 +586,13 @@ namespace Pango {
 		public int width;
 		public int height;
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ALIGN_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ALIGN_", type_id = "pango_alignment_get_type ()")]
 	public enum Alignment {
 		LEFT,
 		CENTER,
 		RIGHT
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ATTR_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ATTR_", type_id = "pango_attr_type_get_type ()")]
 	public enum AttrType {
 		INVALID,
 		LANGUAGE,
@@ -620,7 +620,7 @@ namespace Pango {
 		public static unowned string get_name (Pango.AttrType type);
 		public static Pango.AttrType register (string name);
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_BIDI_TYPE_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_BIDI_TYPE_", type_id = "pango_bidi_type_get_type ()")]
 	public enum BidiType {
 		L,
 		LRE,
@@ -643,14 +643,14 @@ namespace Pango {
 		ON;
 		public static Pango.BidiType for_unichar (unichar ch);
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_COVERAGE_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_COVERAGE_", type_id = "pango_coverage_level_get_type ()")]
 	public enum CoverageLevel {
 		NONE,
 		FALLBACK,
 		APPROXIMATE,
 		EXACT
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_DIRECTION_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_DIRECTION_", type_id = "pango_direction_get_type ()")]
 	public enum Direction {
 		LTR,
 		RTL,
@@ -660,14 +660,14 @@ namespace Pango {
 		WEAK_RTL,
 		NEUTRAL
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ELLIPSIZE_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_ELLIPSIZE_", type_id = "pango_ellipsize_mode_get_type ()")]
 	public enum EllipsizeMode {
 		NONE,
 		START,
 		MIDDLE,
 		END
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_FONT_MASK_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_FONT_MASK_", type_id = "pango_font_mask_get_type ()")]
 	[Flags]
 	public enum FontMask {
 		FAMILY,
@@ -678,7 +678,7 @@ namespace Pango {
 		SIZE,
 		GRAVITY
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_GRAVITY_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_GRAVITY_", type_id = "pango_gravity_get_type ()")]
 	public enum Gravity {
 		SOUTH,
 		EAST,
@@ -690,20 +690,20 @@ namespace Pango {
 		public static Pango.Gravity get_for_script_and_width (Pango.Script script, bool wide, Pango.Gravity base_gravity, Pango.GravityHint hint);
 		public static double to_rotation (Pango.Gravity gravity);
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_GRAVITY_HINT_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_GRAVITY_HINT_", type_id = "pango_gravity_hint_get_type ()")]
 	public enum GravityHint {
 		NATURAL,
 		STRONG,
 		LINE
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_RENDER_PART_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_RENDER_PART_", type_id = "pango_render_part_get_type ()")]
 	public enum RenderPart {
 		FOREGROUND,
 		BACKGROUND,
 		UNDERLINE,
 		STRIKETHROUGH
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_SCRIPT_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_SCRIPT_", type_id = "pango_script_get_type ()")]
 	public enum Script {
 		INVALID_CODE,
 		COMMON,
@@ -787,7 +787,7 @@ namespace Pango {
 		public static Pango.Script for_unichar (unichar ch);
 		public static Pango.Language get_sample_language (Pango.Script script);
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_STRETCH_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_STRETCH_", type_id = "pango_stretch_get_type ()")]
 	public enum Stretch {
 		ULTRA_CONDENSED,
 		EXTRA_CONDENSED,
@@ -799,17 +799,17 @@ namespace Pango {
 		EXTRA_EXPANDED,
 		ULTRA_EXPANDED
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_STYLE_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_STYLE_", type_id = "pango_style_get_type ()")]
 	public enum Style {
 		NORMAL,
 		OBLIQUE,
 		ITALIC
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_TAB_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_TAB_", type_id = "pango_tab_align_get_type ()")]
 	public enum TabAlign {
 		LEFT
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_UNDERLINE_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_UNDERLINE_", type_id = "pango_underline_get_type ()")]
 	public enum Underline {
 		NONE,
 		SINGLE,
@@ -817,12 +817,12 @@ namespace Pango {
 		LOW,
 		ERROR
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_VARIANT_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_VARIANT_", type_id = "pango_variant_get_type ()")]
 	public enum Variant {
 		NORMAL,
 		SMALL_CAPS
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_WEIGHT_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_WEIGHT_", type_id = "pango_weight_get_type ()")]
 	public enum Weight {
 		THIN,
 		ULTRALIGHT,
@@ -836,7 +836,7 @@ namespace Pango {
 		HEAVY,
 		ULTRAHEAVY
 	}
-	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_WRAP_")]
+	[CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_WRAP_", type_id = "pango_wrap_mode_get_type ()")]
 	public enum WrapMode {
 		WORD,
 		CHAR,
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index e2c5ffd..9d9cc11 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -529,20 +529,20 @@ namespace Poppler {
 		public Poppler.Rectangle copy ();
 		public void free ();
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_LAYER_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_LAYER_", type_id = "poppler_action_layer_action_get_type ()")]
 	public enum ActionLayerAction {
 		ON,
 		OFF,
 		TOGGLE
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_MOVIE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_MOVIE_", type_id = "poppler_action_movie_operation_get_type ()")]
 	public enum ActionMovieOperation {
 		PLAY,
 		PAUSE,
 		RESUME,
 		STOP
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_", type_id = "poppler_action_type_get_type ()")]
 	public enum ActionType {
 		UNKNOWN,
 		NONE,
@@ -556,12 +556,12 @@ namespace Poppler {
 		OCG_STATE,
 		JAVASCRIPT
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_", type_id = "poppler_annot_external_data_type_get_type ()")]
 	public enum AnnotExternalDataType {
 		@3D,
 		UNKNOWN
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_FLAG_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_FLAG_", type_id = "poppler_annot_flag_get_type ()")]
 	[Flags]
 	public enum AnnotFlag {
 		UNKNOWN,
@@ -576,18 +576,18 @@ namespace Poppler {
 		TOGGLE_NO_VIEW,
 		LOCKED_CONTENTS
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_FREE_TEXT_QUADDING_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_FREE_TEXT_QUADDING_", type_id = "poppler_annot_free_text_quadding_get_type ()")]
 	public enum AnnotFreeTextQuadding {
 		LEFT_JUSTIFIED,
 		CENTERED,
 		RIGHT_JUSTIFIED
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_MARKUP_REPLY_TYPE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_MARKUP_REPLY_TYPE_", type_id = "poppler_annot_markup_reply_type_get_type ()")]
 	public enum AnnotMarkupReplyType {
 		R,
 		GROUP
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_TEXT_STATE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_TEXT_STATE_", type_id = "poppler_annot_text_state_get_type ()")]
 	public enum AnnotTextState {
 		MARKED,
 		UNMARKED,
@@ -598,7 +598,7 @@ namespace Poppler {
 		NONE,
 		UNKNOWN
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_", type_id = "poppler_annot_type_get_type ()")]
 	public enum AnnotType {
 		UNKNOWN,
 		TEXT,
@@ -627,13 +627,13 @@ namespace Poppler {
 		WATERMARK,
 		@3D
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_BACKEND_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_BACKEND_", type_id = "poppler_backend_get_type ()")]
 	public enum Backend {
 		UNKNOWN,
 		SPLASH,
 		CAIRO
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_DEST_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_DEST_", type_id = "poppler_dest_type_get_type ()")]
 	public enum DestType {
 		UNKNOWN,
 		XYZ,
@@ -646,7 +646,7 @@ namespace Poppler {
 		FITBV,
 		NAMED
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FONT_TYPE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FONT_TYPE_", type_id = "poppler_font_type_get_type ()")]
 	public enum FontType {
 		UNKNOWN,
 		TYPE1,
@@ -661,18 +661,18 @@ namespace Poppler {
 		CID_TYPE2,
 		CID_TYPE2OT
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_BUTTON_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_BUTTON_", type_id = "poppler_form_button_type_get_type ()")]
 	public enum FormButtonType {
 		PUSH,
 		CHECK,
 		RADIO
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_CHOICE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_CHOICE_", type_id = "poppler_form_choice_type_get_type ()")]
 	public enum FormChoiceType {
 		COMBO,
 		LIST
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_FIELD_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_FIELD_", type_id = "poppler_form_field_type_get_type ()")]
 	public enum FormFieldType {
 		UNKNOWN,
 		BUTTON,
@@ -680,20 +680,20 @@ namespace Poppler {
 		CHOICE,
 		SIGNATURE
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_TEXT_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FORM_TEXT_", type_id = "poppler_form_text_type_get_type ()")]
 	public enum FormTextType {
 		NORMAL,
 		MULTILINE,
 		FILE_SELECT
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ORIENTATION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ORIENTATION_", type_id = "poppler_orientation_get_type ()")]
 	public enum Orientation {
 		PORTRAIT,
 		LANDSCAPE,
 		UPSIDEDOWN,
 		SEASCAPE
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_LAYOUT_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_LAYOUT_", type_id = "poppler_page_layout_get_type ()")]
 	public enum PageLayout {
 		UNSET,
 		SINGLE_PAGE,
@@ -703,7 +703,7 @@ namespace Poppler {
 		TWO_PAGE_LEFT,
 		TWO_PAGE_RIGHT
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_MODE_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_MODE_", type_id = "poppler_page_mode_get_type ()")]
 	public enum PageMode {
 		UNSET,
 		NONE,
@@ -713,17 +713,17 @@ namespace Poppler {
 		USE_OC,
 		USE_ATTACHMENTS
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_", type_id = "poppler_page_transition_alignment_get_type ()")]
 	public enum PageTransitionAlignment {
 		HORIZONTAL,
 		VERTICAL
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_", type_id = "poppler_page_transition_direction_get_type ()")]
 	public enum PageTransitionDirection {
 		INWARD,
 		OUTWARD
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PAGE_TRANSITION_", type_id = "poppler_page_transition_type_get_type ()")]
 	public enum PageTransitionType {
 		REPLACE,
 		SPLIT,
@@ -738,7 +738,7 @@ namespace Poppler {
 		UNCOVER,
 		FADE
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PERMISSIONS_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PERMISSIONS_", type_id = "poppler_permissions_get_type ()")]
 	[Flags]
 	public enum Permissions {
 		OK_TO_PRINT,
@@ -751,7 +751,7 @@ namespace Poppler {
 		OK_TO_PRINT_HIGH_RESOLUTION,
 		FULL
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PRINT_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PRINT_", type_id = "poppler_print_flags_get_type ()")]
 	[Flags]
 	public enum PrintFlags {
 		DOCUMENT,
@@ -759,13 +759,13 @@ namespace Poppler {
 		STAMP_ANNOTS_ONLY,
 		ALL
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_SELECTION_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_SELECTION_", type_id = "poppler_selection_style_get_type ()")]
 	public enum SelectionStyle {
 		GLYPH,
 		WORD,
 		LINE
 	}
-	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_VIEWER_PREFERENCES_")]
+	[CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_VIEWER_PREFERENCES_", type_id = "poppler_viewer_preferences_get_type ()")]
 	[Flags]
 	public enum ViewerPreferences {
 		UNSET,
diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi
index da6d8e1..c6d9c11 100644
--- a/vapi/rest-0.7.vapi
+++ b/vapi/rest-0.7.vapi
@@ -184,13 +184,13 @@ namespace Rest {
 		public XmlParser ();
 		public Rest.XmlNode parse_from_data (string data, int64 len);
 	}
-	[CCode (cheader_filename = "rest/rest-param.h", cprefix = "REST_MEMORY_")]
+	[CCode (cheader_filename = "rest/rest-param.h", cprefix = "REST_MEMORY_", has_type_id = false)]
 	public enum MemoryUse {
 		STATIC,
 		TAKE,
 		COPY
 	}
-	[CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthSignatureMethod", cprefix = "")]
+	[CCode (cheader_filename = "rest/oauth-proxy.h", cname = "OAuthSignatureMethod", cprefix = "", type_id = "oauth_signature_method_get_type ()")]
 	public enum OAuthSignatureMethod {
 		PLAINTEXT,
 		HMAC_SHA1
diff --git a/vapi/vte-2.90.vapi b/vapi/vte-2.90.vapi
index 3479329..7ade3d5 100644
--- a/vapi/vte-2.90.vapi
+++ b/vapi/vte-2.90.vapi
@@ -189,7 +189,7 @@ namespace Vte {
 	[CCode (cheader_filename = "vte/vte.h", cname = "_VteCharAttributes", has_type_id = false)]
 	public struct _CharAttributes {
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_PTY_", type_id = "vte_pty_flags_get_type ()")]
 	[Flags]
 	public enum PtyFlags {
 		NO_LASTLOG,
@@ -199,25 +199,25 @@ namespace Vte {
 		NO_FALLBACK,
 		DEFAULT
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_ANTI_ALIAS_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_ANTI_ALIAS_", type_id = "vte_terminal_anti_alias_get_type ()")]
 	public enum TerminalAntiAlias {
 		USE_DEFAULT,
 		FORCE_ENABLE,
 		FORCE_DISABLE
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_CURSOR_BLINK_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_CURSOR_BLINK_", type_id = "vte_terminal_cursor_blink_mode_get_type ()")]
 	public enum TerminalCursorBlinkMode {
 		SYSTEM,
 		ON,
 		OFF
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_CURSOR_SHAPE_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_CURSOR_SHAPE_", type_id = "vte_terminal_cursor_shape_get_type ()")]
 	public enum TerminalCursorShape {
 		BLOCK,
 		IBEAM,
 		UNDERLINE
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_ERASE_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_ERASE_", type_id = "vte_terminal_erase_binding_get_type ()")]
 	public enum TerminalEraseBinding {
 		AUTO,
 		ASCII_BACKSPACE,
@@ -225,7 +225,7 @@ namespace Vte {
 		DELETE_SEQUENCE,
 		TTY
 	}
-	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_TERMINAL_WRITE_")]
+	[CCode (cheader_filename = "vte/vte.h", cprefix = "VTE_TERMINAL_WRITE_", type_id = "vte_terminal_write_flags_get_type ()")]
 	public enum TerminalWriteFlags {
 		DEFAULT
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]