diff --git a/lib/Utils.vala b/lib/Utils.vala
index 7c22b7465..9a6570627 100644
--- a/lib/Utils.vala
+++ b/lib/Utils.vala
@@ -117,7 +117,11 @@ namespace Gala {
                 }
             }
 
+#if HAS_MUTTER46
+            unowned Meta.Group group = window.x11_get_group ();
+#else
             unowned Meta.Group group = window.get_group ();
+#endif
             if (group != null) {
                 var group_windows = group.list_windows ();
                 group_windows.foreach ((window) => {
diff --git a/vapi/Clutter-14.metadata b/vapi/Clutter-14.metadata
index 2555ce73a..21cb052e1 100644
--- a/vapi/Clutter-14.metadata
+++ b/vapi/Clutter-14.metadata
@@ -10,8 +10,6 @@ Perspective struct
 Actor
 	.apply_transform.matrix ref
 	.get_abs_allocation_vertices.verts out=false
-Canvas
-	.new symbol_type="constructor"
 Event.type#method name="get_type"
 Image
 	.new symbol_type="constructor"
@@ -77,9 +75,6 @@ ActorBox
 Margin
 	.new skip
 
-// Struct return values
-color_get_static nullable
-
 // Upstream
 Event
 	.get_position.position out
diff --git a/vapi/Cogl-14.metadata b/vapi/Cogl-14.metadata
index 1987d1f19..0e2cf77db 100644
--- a/vapi/Cogl-14.metadata
+++ b/vapi/Cogl-14.metadata
@@ -47,6 +47,3 @@ blit_framebuffer parent="Cogl.Framebuffer" symbol_type="method" instance_idx=0 n
 Onscreen
   .add_dirty_callback unowned
   .add_frame_callback unowned
-  .queue_damage_region.rectangles array array_length_idx=1
-  .swap_buffers_with_damage.rectangles array array_length_idx=1
-  .swap_region.rectangles array array_length_idx=1
diff --git a/vapi/Meta-14.metadata b/vapi/Meta-14.metadata
index dd4338262..5a09a2748 100644
--- a/vapi/Meta-14.metadata
+++ b/vapi/Meta-14.metadata
@@ -19,7 +19,6 @@ BarrierFlags cheader_filename="meta/barrier.h"
 ButtonFunction cheader_filename="meta/common.h"
 ButtonLayout cheader_filename="meta/common.h"
 Compositor cheader_filename="meta/compositor.h"
-get_feedback_group_for_display parent="Meta.Display" symbol_type="method" name="get_feedback_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
 get_stage_for_display parent="Meta.Display" symbol_type="method" name="get_stage" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
 get_top_window_group_for_display parent="Meta.Display" symbol_type="method" name="get_top_window_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
 get_window_group_for_display parent="Meta.Display" symbol_type="method" name="get_window_group" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
@@ -41,6 +40,7 @@ DebugTopic cheader_filename="meta/util.h"
 DebugPaintFlag cheader_filename="meta/util.h"
 Direction cheader_filename="meta/common.h"
 Display cheader_filename="meta/display.h"
+Display.focus_window#signal name="do_focus_window"
 DisplayCorner cheader_filename="meta/display.h"
 DisplayDirection cheader_filename="meta/display.h"
 Dnd cheader_filename="meta/meta-dnd.h"
@@ -107,7 +107,6 @@ Stage cheader_filename="meta/meta-stage.h"
 Strut cheader_filename="meta/boxes.h"
 TabList cheader_filename="meta/display.h"
 TabShowType cheader_filename="meta/display.h"
-VirtualModifier cheader_filename="meta/common.h"
 WaylandClient cheader_filename="meta/meta-wayland-client.h"
 WaylandCompositor cheader_filename="meta/meta-wayland-compositor.h"
 Workspace cheader_filename="meta/workspace.h"
@@ -175,10 +174,6 @@ unsigned_long_hash.v type="ulong?"
 warning parent="Meta.Util" cheader_filename="meta/util.h"
 create_context parent="Meta.Context" name="new" symbol_type="constructor" cheader_filename="meta/meta-context.h"
 
-x11_error_trap_pop parent="Meta.X11Display" symbol_type="method" name="error_trap_pop" instance_idx=0 cheader_filename="meta/meta-x11-errors.h"
-x11_error_trap_pop_with_return parent="Meta.X11Display" symbol_type="method" name="error_trap_pop_with_return" instance_idx=0 cheader_filename="meta/meta-x11-errors.h"
-x11_error_trap_push parent="Meta.X11Display" symbol_type="method" name="error_trap_push" instance_idx=0 cheader_filename="meta/meta-x11-errors.h"
-
 BackgroundActor sealed
 BackgroundContent sealed
 BackgroundImage sealed
diff --git a/vapi/Mtk-14.metadata b/vapi/Mtk-14.metadata
index a8b51c6c0..95a62dde6 100644
--- a/vapi/Mtk-14.metadata
+++ b/vapi/Mtk-14.metadata
@@ -1 +1,3 @@
 Rectangle struct
+RECTANGLE_MAX_STACK_RECTS parent="Mtk.Rectangle" name="MAX_STACK_RECTS"
+REGION_BUILDER_MAX_LEVELS parent="Mtk.RegionBuilder" name="MAX_LEVELS"
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
index 21da1b919..eadc3cf9d 100644
--- a/vapi/libmutter.vapi
+++ b/vapi/libmutter.vapi
@@ -146,6 +146,9 @@ namespace Meta {
 	public abstract class Backend : GLib.Object, GLib.Initable {
 		[CCode (has_construct_function = false)]
 		protected Backend ();
+#if HAS_MUTTER46
+		public void freeze_keyboard (uint32 timestamp);
+#endif
 #if !HAS_MUTTER44
 		[CCode (cheader_filename = "meta/meta-backend.h", cname = "meta_get_backend")]
 		public static unowned Meta.Backend get_backend ();
@@ -163,7 +166,13 @@ namespace Meta {
 		public bool is_headless ();
 		public bool is_rendering_hardware_accelerated ();
 		public void lock_layout_group (uint idx);
+#if HAS_MUTTER46
+		public void set_keymap (string layouts, string variants, string options, string model);
+		public void unfreeze_keyboard (uint32 timestamp);
+		public void ungrab_keyboard (uint32 timestamp);
+#else
 		public void set_keymap (string layouts, string variants, string options);
+#endif
 #if HAS_MUTTER43
 		public Meta.BackendCapabilities capabilities { get; }
 #endif
@@ -966,7 +975,9 @@ namespace Meta {
 #else
 		public Meta.Rectangle client_rect_to_frame_rect (Meta.Rectangle client_rect);
 #endif
+#if !HAS_MUTTER46
 		public void compute_group ();
+#endif
 		public void @delete (uint32 timestamp);
 		public unowned Meta.Window find_root_ancestor ();
 		public void focus (uint32 timestamp);
@@ -979,7 +990,9 @@ namespace Meta {
 		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
 		public Meta.Rectangle get_buffer_rect ();
 #endif
+#if !HAS_MUTTER46
 		public unowned string? get_client_machine ();
+#endif
 		public Meta.WindowClientType get_client_type ();
 		public unowned GLib.Object get_compositor_private ();
 		public unowned string get_description ();
@@ -996,7 +1009,9 @@ namespace Meta {
 		public Meta.Rectangle get_frame_rect ();
 #endif
 		public Meta.FrameType get_frame_type ();
+#if !HAS_MUTTER46
 		public unowned Meta.Group? get_group ();
+#endif
 		public unowned string? get_gtk_app_menu_object_path ();
 		public unowned string? get_gtk_application_id ();
 		public unowned string? get_gtk_application_object_path ();
@@ -1036,8 +1051,10 @@ namespace Meta {
 		public Meta.Rectangle get_work_area_for_monitor (int which_monitor);
 #endif
 		public unowned Meta.Workspace get_workspace ();
+#if !HAS_MUTTER46
 		public X.Window get_xwindow ();
 		public void group_leader_changed ();
+#endif
 		public bool has_attached_dialogs ();
 		public bool has_focus ();
 #if HAS_MUTTER45
@@ -1087,7 +1104,9 @@ namespace Meta {
 #endif
 		public void shove_titlebar_onscreen ();
 		public bool showing_on_its_workspace ();
+#if !HAS_MUTTER46
 		public void shutdown_group ();
+#endif
 		public void stick ();
 		public bool titlebar_is_onscreen ();
 		public void unmake_above ();
@@ -1099,6 +1118,9 @@ namespace Meta {
 		public void unshade (uint32 timestamp);
 #endif
 		public void unstick ();
+#if HAS_MUTTER46
+		public unowned Meta.Group? x11_get_group ();
+#endif
 		[NoAccessorMethod]
 		public bool above { get; }
 		[NoAccessorMethod]
@@ -1259,14 +1281,22 @@ namespace Meta {
 		public unowned Meta.Workspace get_active_workspace ();
 		public int get_active_workspace_index ();
 		public int get_n_workspaces ();
+#if HAS_MUTTER46
+		public int get_layout_columns ();
+		public int get_layout_rows ();
+#endif
 		public unowned Meta.Workspace? get_workspace_by_index (int index);
 		public unowned GLib.List<Meta.Workspace> get_workspaces ();
 		public void override_workspace_layout (Meta.DisplayCorner starting_corner, bool vertical_layout, int n_rows, int n_columns);
 		public void remove_workspace (Meta.Workspace workspace, uint32 timestamp);
 		public void reorder_workspace (Meta.Workspace workspace, int new_index);
+#if !HAS_MUTTER46
 		[NoAccessorMethod]
+#endif
 		public int layout_columns { get; }
+#if !HAS_MUTTER46
 		[NoAccessorMethod]
+#endif
 		public int layout_rows { get; }
 		public int n_workspaces { get; }
 		public signal void active_workspace_changed ();
@@ -1303,6 +1333,9 @@ namespace Meta {
 		public bool has_shape ();
 #endif
 		public unowned Meta.Group lookup_group (X.Window group_leader);
+#if HAS_MUTTER46
+		public X.Window lookup_xwindow (Meta.Window window);
+#endif
 #if HAS_MUTTER45
 		public void redirect_windows (Meta.Display display);
 		public void remove_event_func (uint id);
@@ -1973,6 +2006,7 @@ namespace Meta {
 		ICON,
 		INSTANTLY
 	}
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "meta/common.h", cprefix = "META_VIRTUAL_", type_id = "meta_virtual_modifier_get_type ()")]
 	[Flags]
 	public enum VirtualModifier {
@@ -1987,6 +2021,7 @@ namespace Meta {
 		MOD4_MASK,
 		MOD5_MASK
 	}
+#endif
 	[CCode (cheader_filename = "meta/window.h", cprefix = "META_WINDOW_CLIENT_TYPE_", type_id = "meta_window_client_type_get_type ()")]
 	public enum WindowClientType {
 		WAYLAND,
@@ -2056,8 +2091,10 @@ namespace Meta {
 	public static void add_clutter_debug_flags (Clutter.DebugFlag debug_flags, Clutter.DrawDebugFlag draw_flags, Clutter.PickDebugFlag pick_flags);
 	[CCode (cheader_filename = "meta/main.h")]
 	public static void add_debug_paint_flag (Meta.DebugPaintFlag flag);
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "meta/main.h")]
 	public static void clutter_init ();
+#endif
 	[CCode (cheader_filename = "meta/main.h")]
 	public static void exit (Meta.ExitCode code);
 #if HAS_MUTTER44
@@ -2085,3 +2122,4 @@ namespace Meta {
 	public static void restart (string? message);
 #endif
 }
+
diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi
index 507156fb0..33d5c1d97 100644
--- a/vapi/mutter-clutter.vapi
+++ b/vapi/mutter-clutter.vapi
@@ -4706,6 +4706,9 @@ namespace Clutter {
 		public Pango.Context create_pango_context ();
 		[Version (since = "1.0")]
 		public Pango.Layout create_pango_layout (string? text);
+#if HAS_MUTTER46
+		public Clutter.PaintNode create_texture_paint_node (Cogl.Texture texture);
+#endif
 		[Version (since = "1.10")]
 		public void destroy_all_children ();
 		[CCode (cname = "clutter_actor_event")]
@@ -5348,7 +5351,7 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_align_constraint_get_type ()")]
 	[Version (since = "1.4")]
-	public class AlignConstraint : Clutter.Constraint {
+	public sealed class AlignConstraint : Clutter.Constraint {
 		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public AlignConstraint (Clutter.Actor? source, Clutter.AlignAxis axis, float factor);
 		public Clutter.AlignAxis get_align_axis ();
@@ -5418,7 +5421,7 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_bind_constraint_get_type ()")]
 	[Version (since = "1.4")]
-	public class BindConstraint : Clutter.Constraint {
+	public sealed class BindConstraint : Clutter.Constraint {
 		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public BindConstraint (Clutter.Actor? source, Clutter.BindCoordinate coordinate, float offset);
 		public Clutter.BindCoordinate get_coordinate ();
@@ -5433,7 +5436,7 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_binding_pool_get_type ()")]
 	[Version (since = "1.0")]
-	public class BindingPool : GLib.Object {
+	public sealed class BindingPool : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public BindingPool (string name);
 		public bool activate (uint key_val, Clutter.ModifierType modifiers, GLib.Object gobject);
@@ -5441,7 +5444,11 @@ namespace Clutter {
 		public static unowned Clutter.BindingPool find (string name);
 		public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
 		public static unowned Clutter.BindingPool get_for_class (void* klass);
+#if HAS_MUTTER46
+		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
+#else
 		public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned Clutter.BindingActionFunc callback);
+#endif
 		public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
 		public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
 		public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
@@ -5537,6 +5544,7 @@ namespace Clutter {
 		public float y;
 #endif
 	}
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_canvas_get_type ()")]
 	[Version (since = "1.10")]
 	public class Canvas : GLib.Object, Clutter.Content {
@@ -5552,7 +5560,6 @@ namespace Clutter {
 		public int width { get; set; }
 		public virtual signal bool draw (Cairo.Context cr, int width, int height);
 	}
-#if !HAS_MUTTER46
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_child_meta_get_type ()")]
 	[Version (since = "0.8")]
 	public abstract class ChildMeta : GLib.Object {
@@ -5753,8 +5760,10 @@ namespace Clutter {
 #if !HAS_MUTTER45
 		public Clutter.EventType type;
 #endif
+#if !HAS_MUTTER46
 		[CCode (has_construct_function = false)]
 		public Event (Clutter.EventType type);
+#endif
 		[Version (since = "1.18")]
 		public static uint add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
 		public Clutter.Event copy ();
@@ -5907,13 +5916,21 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_flow_layout_get_type ()")]
 	[Version (since = "1.2")]
-	public class FlowLayout : Clutter.LayoutManager {
+	public sealed class FlowLayout : Clutter.LayoutManager {
 		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
+#if HAS_MUTTER46
+		public FlowLayout (Clutter.Orientation orientation);
+#else
 		public FlowLayout (Clutter.FlowOrientation orientation);
+#endif
 		public float get_column_spacing ();
 		public void get_column_width (out float min_width, out float max_width);
 		public bool get_homogeneous ();
+#if HAS_MUTTER46
+		public Clutter.Orientation get_orientation ();
+#else
 		public Clutter.FlowOrientation get_orientation ();
+#endif
 		public void get_row_height (out float min_height, out float max_height);
 		public float get_row_spacing ();
 		[Version (since = "1.16")]
@@ -5921,7 +5938,11 @@ namespace Clutter {
 		public void set_column_spacing (float spacing);
 		public void set_column_width (float min_width, float max_width);
 		public void set_homogeneous (bool homogeneous);
+#if HAS_MUTTER46
+		public void set_orientation (Clutter.Orientation orientation);
+#else
 		public void set_orientation (Clutter.FlowOrientation orientation);
+#endif
 		public void set_row_height (float min_height, float max_height);
 		public void set_row_spacing (float spacing);
 		[Version (since = "1.16")]
@@ -5936,7 +5957,11 @@ namespace Clutter {
 		public float min_column_width { get; set; }
 		[NoAccessorMethod]
 		public float min_row_height { get; set; }
+#if HAS_MUTTER46
+		public Clutter.Orientation orientation { get; set construct; }
+#else
 		public Clutter.FlowOrientation orientation { get; set construct; }
+#endif
 		public float row_spacing { get; set; }
 		[Version (since = "1.16")]
 		public bool snap_to_grid { get; set; }
@@ -5950,7 +5975,9 @@ namespace Clutter {
 	public class Frame {
 #if HAS_MUTTER44
 		public int64 get_count ();
-#if HAS_MUTTER45
+#if HAS_MUTTER46
+		public bool get_frame_deadline (int64 frame_deadline_us);
+#elif HAS_MUTTER45
 		public bool get_min_render_time_allowed (int64 min_render_time_allowed_us);
 #endif
 		public bool get_target_presentation_time (int64 target_presentation_time_us);
@@ -6036,17 +6063,30 @@ namespace Clutter {
 		public virtual signal void gesture_end (Clutter.Actor actor);
 		public virtual signal bool gesture_progress (Clutter.Actor actor);
 	}
+#if HAS_MUTTER46
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grab_get_type ()")]
+	public sealed class Grab : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected Grab ();
+#else
 	[CCode (cheader_filename = "clutter/clutter.h", ref_function = "clutter_grab_ref", type_id = "clutter_grab_get_type ()", unref_function = "clutter_grab_unref")]
 	[Compact]
 	public class Grab {
+#endif
 		public void dismiss ();
 		public Clutter.GrabState get_seat_state ();
+#if HAS_MUTTER46
+		public bool is_revoked ();
+		[NoAccessorMethod]
+		public bool revoked { get; }
+#else
 		public unowned Clutter.Grab @ref ();
 		public void unref ();
+#endif
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_grid_layout_get_type ()")]
 	[Version (since = "1.12")]
-	public class GridLayout : Clutter.LayoutManager {
+	public sealed class GridLayout : Clutter.LayoutManager {
 		[CCode (has_construct_function = false, type = "ClutterLayoutManager*")]
 		public GridLayout ();
 		public void attach (Clutter.Actor child, int left, int top, int width, int height);
@@ -6343,7 +6383,11 @@ namespace Clutter {
 		[CCode (has_construct_function = false)]
 		protected Keymap ();
 		public bool get_caps_lock_state ();
+#if HAS_MUTTER46
+		public virtual Clutter.TextDirection get_direction ();
+#else
 		public virtual Pango.Direction get_direction ();
+#endif
 		public bool get_num_lock_state ();
 		public bool caps_lock_state { get; }
 		public bool num_lock_state { get; }
@@ -6843,7 +6887,7 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_settings_get_type ()")]
 	[Version (since = "1.4")]
-	public class Settings : GLib.Object {
+	public sealed class Settings : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Settings ();
 		public static unowned Clutter.Settings get_default ();
@@ -6924,7 +6968,7 @@ namespace Clutter {
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_snap_constraint_get_type ()")]
 	[Version (since = "1.6")]
-	public class SnapConstraint : Clutter.Constraint {
+	public sealed class SnapConstraint : Clutter.Constraint {
 		[CCode (has_construct_function = false, type = "ClutterConstraint*")]
 		public SnapConstraint (Clutter.Actor? source, Clutter.SnapEdge from_edge, Clutter.SnapEdge to_edge, float offset);
 		public void get_edges (out Clutter.SnapEdge from_edge, out Clutter.SnapEdge to_edge);
@@ -7143,8 +7187,10 @@ namespace Clutter {
 	public class SwipeAction : Clutter.GestureAction {
 		[CCode (has_construct_function = false, type = "ClutterAction*")]
 		public SwipeAction ();
+#if !HAS_MUTTER46
 		[Version (deprecated = true, deprecated_since = "1.14", since = "1.8")]
 		public virtual signal void swept (Clutter.Actor actor, Clutter.SwipeDirection direction);
+#endif
 		[Version (since = "1.14")]
 #if HAS_MUTTER46
 		public virtual signal bool swipe (Clutter.Actor actor, Clutter.SwipeDirection direction);
@@ -7590,7 +7636,7 @@ namespace Clutter {
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_transition_group_get_type ()")]
 	[Version (since = "1.12")]
 #if HAS_MUTTER46
-	public class TransitionGroup : Clutter.Transition {
+	public sealed class TransitionGroup : Clutter.Transition {
 #else
 	public class TransitionGroup : Clutter.Transition, Clutter.Scriptable {
 #endif
@@ -7784,7 +7830,9 @@ namespace Clutter {
 		public uint8 green;
 		public uint8 blue;
 		public uint8 alpha;
+#if !HAS_MUTTER46
 		public Clutter.Color add (Clutter.Color b);
+#endif
 		[Version (since = "1.12")]
 		public static Clutter.Color? alloc ();
 		[Version (since = "0.2")]
@@ -7815,8 +7863,10 @@ namespace Clutter {
 			color.init_from_string (str);
 			return color;
 		}
+#if !HAS_MUTTER46
 		[Version (since = "1.6")]
 		public static unowned Clutter.Color? get_static (Clutter.StaticColor color);
+#endif
 		[Version (since = "1.0")]
 		public uint hash ();
 		[Version (since = "1.12")]
@@ -7830,11 +7880,15 @@ namespace Clutter {
 		public bool init_from_string (string str);
 		[Version (since = "1.6")]
 		public Clutter.Color interpolate (Clutter.Color final, double progress);
+#if !HAS_MUTTER46
 		public Clutter.Color lighten ();
+#endif
 		[CCode (cname = "clutter_color_from_string")]
 		public bool parse_string (string str);
+#if !HAS_MUTTER46
 		public Clutter.Color shade (double factor);
 		public Clutter.Color subtract (Clutter.Color b);
+#endif
 		public void to_hls (out float hue, out float luminance, out float saturation);
 		public uint32 to_pixel ();
 		[Version (since = "0.2")]
@@ -8221,12 +8275,14 @@ namespace Clutter {
 		SHADERS_GLSL
 	}
 #endif
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FLOW_", type_id = "clutter_flow_orientation_get_type ()")]
 	[Version (since = "1.2")]
 	public enum FlowOrientation {
 		HORIZONTAL,
 		VERTICAL
 	}
+#endif
 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_FRAME_INFO_FLAG_", type_id = "clutter_frame_info_flag_get_type ()")]
 	[Flags]
 	public enum FrameInfoFlag {
@@ -8642,6 +8698,7 @@ namespace Clutter {
 		BOTTOM,
 		LEFT
 	}
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_COLOR_", type_id = "clutter_static_color_get_type ()")]
 	[Version (since = "1.6")]
 	public enum StaticColor {
@@ -8691,6 +8748,7 @@ namespace Clutter {
 		ALUMINIUM_6,
 		TRANSPARENT
 	}
+#endif
 	[CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_STEP_MODE_", type_id = "clutter_step_mode_get_type ()")]
 	[Version (since = "1.12")]
 	public enum StepMode {
@@ -8785,11 +8843,13 @@ namespace Clutter {
 	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
 	[Version (since = "1.24")]
 	public delegate Clutter.Actor ActorCreateChildFunc (GLib.Object item);
+#if !HAS_MUTTER46
 	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 4.9)]
 	[Version (since = "1.0")]
 	public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
 	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 1.9)]
 	public delegate void Callback (Clutter.Actor actor);
+#endif
 #if HAS_MUTTER43
 	[CCode (cheader_filename = "clutter/clutter.h", instance_pos = 2.9)]
 	[Version (since = "1.18")]
diff --git a/vapi/mutter-cogl-14.vapi b/vapi/mutter-cogl-14.vapi
index 4c3bbce6d..85b3a88bc 100644
--- a/vapi/mutter-cogl-14.vapi
+++ b/vapi/mutter-cogl-14.vapi
@@ -162,13 +162,13 @@ namespace Cogl {
 		public virtual int get_buffer_age ();
 		public int64 get_frame_counter ();
 		public void hide ();
-		public virtual void queue_damage_region ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.1, type = "const int*")] int[] rectangles);
+		public virtual void queue_damage_region ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.1)] int[] rectangles);
 		public void remove_dirty_callback (Cogl.OnscreenDirtyClosure closure);
 		public void remove_frame_callback (Cogl.FrameClosure closure);
 		public void show ();
 		public void swap_buffers (Cogl.FrameInfo frame_info, void* user_data);
-		public virtual void swap_buffers_with_damage ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.5, type = "const int*")] int[] rectangles, Cogl.FrameInfo info);
-		public virtual void swap_region ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.5, type = "const int*")] int[] rectangles, Cogl.FrameInfo info);
+		public virtual void swap_buffers_with_damage ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.5)] int[] rectangles, Cogl.FrameInfo info);
+		public virtual void swap_region ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.5)] int[] rectangles, Cogl.FrameInfo info);
 	}
 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_onscreen_dirty_closure_get_type ()")]
 	[Compact]
@@ -202,8 +202,6 @@ namespace Cogl {
 		public bool set_blend (string blend_string) throws GLib.Error;
 		public void set_blend_constant (Cogl.Color constant_color);
 		public void set_color (Cogl.Color color);
-		public void set_color4f (float red, float green, float blue, float alpha);
-		public void set_color4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
 		public void set_cull_face_mode (Cogl.PipelineCullFaceMode cull_face_mode);
 		public void set_front_face_winding (Cogl.Winding front_winding);
 		public bool set_layer_combine (int layer_index, string blend_string) throws GLib.Error;
@@ -299,6 +297,10 @@ namespace Cogl {
 	[Compact]
 	public class Scanout {
 	}
+	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
+	[Compact]
+	public class ScanoutBuffer {
+	}
 	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_shader_get_type ()")]
 	public class Shader : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -358,8 +360,6 @@ namespace Cogl {
 	public sealed class Texture2D : Cogl.Texture {
 		[CCode (has_construct_function = false)]
 		protected Texture2D ();
-		public void egl_image_external_alloc_finish (void* user_data, GLib.DestroyNotify destroy);
-		public void egl_image_external_bind ();
 		[CCode (has_construct_function = false, type = "CoglTexture*")]
 		public Texture2D.from_bitmap (Cogl.Bitmap bitmap);
 		[CCode (has_construct_function = false, type = "CoglTexture*")]
@@ -376,10 +376,6 @@ namespace Cogl {
 	[Compact]
 	public class TimestampQuery {
 	}
-	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-	[Compact]
-	public class TraceContext {
-	}
 	[CCode (cheader_filename = "cogl/cogl.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "cogl_color_get_type ()")]
 	public struct Color {
 		[CCode (has_construct_function = false, type = "CoglColor*")]
@@ -448,12 +444,6 @@ namespace Cogl {
 		public Cogl.Color color;
 	}
 	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
-	public struct TraceHead {
-		public uint64 begin_time;
-		public weak string name;
-		public weak string description;
-	}
-	[CCode (cheader_filename = "cogl/cogl.h", has_type_id = false)]
 	[Version (since = "1.6")]
 	public struct VertexP2 {
 		public float x;
@@ -861,8 +851,6 @@ namespace Cogl {
 	public delegate void OnscreenDirtyCallback (Cogl.Onscreen onscreen, Cogl.OnscreenDirtyInfo info);
 	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 2.9)]
 	public delegate bool PipelineLayerCallback (Cogl.Pipeline pipeline, int layer_index);
-	[CCode (cheader_filename = "cogl/cogl.h", instance_pos = 1.9)]
-	public delegate bool Texture2DEGLImageExternalAlloc (Cogl.Texture2D tex_2d) throws GLib.Error;
 	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_AFIRST_BIT")]
 	public const int AFIRST_BIT;
 	[CCode (cheader_filename = "cogl/cogl.h", cname = "COGL_A_BIT")]
@@ -896,19 +884,13 @@ namespace Cogl {
 	[Version (replacement = "PixelFormat.to_string")]
 	public static unowned string pixel_format_to_string (Cogl.PixelFormat format);
 	[CCode (cheader_filename = "cogl/cogl.h")]
-	public static void set_tracing_disabled_on_thread (GLib.MainContext main_context);
+	public static void set_tracing_disabled_on_thread (void* data);
 	[CCode (cheader_filename = "cogl/cogl.h")]
-	public static void set_tracing_enabled_on_thread (GLib.MainContext main_context, string group);
+	public static void set_tracing_enabled_on_thread (void* data, string group);
 	[CCode (cheader_filename = "cogl/cogl.h")]
 	public static bool start_tracing_with_fd (int fd) throws GLib.Error;
 	[CCode (cheader_filename = "cogl/cogl.h")]
 	public static bool start_tracing_with_path (string filename) throws GLib.Error;
 	[CCode (cheader_filename = "cogl/cogl.h")]
 	public static void stop_tracing ();
-	[CCode (cheader_filename = "cogl/cogl.h")]
-	public static void trace_describe (Cogl.TraceHead head, string description);
-	[CCode (cheader_filename = "cogl/cogl.h")]
-	public static void trace_end (Cogl.TraceHead head);
-	[CCode (cheader_filename = "cogl/cogl.h")]
-	public static void trace_mark (string name, string description);
 }
diff --git a/vapi/mutter-mtk-13.vapi b/vapi/mutter-mtk-13.vapi
index c92d3cd23..e9f393e57 100644
--- a/vapi/mutter-mtk-13.vapi
+++ b/vapi/mutter-mtk-13.vapi
@@ -6,12 +6,14 @@ namespace Mtk {
 	[CCode (cheader_filename = "mtk/mtk.h", ref_function = "mtk_region_ref", type_id = "mtk_region_get_type ()", unref_function = "mtk_region_unref")]
 	[Compact]
 	public class Region {
+		public Mtk.Region apply_matrix_transform_expand (Graphene.Matrix transform);
 		public bool contains_point (int x, int y);
 		public Mtk.RegionOverlap contains_rectangle (Mtk.Rectangle rect);
 		public Mtk.Region copy ();
 		public static Mtk.Region create ();
 		public static Mtk.Region create_rectangle (Mtk.Rectangle rect);
 		public static Mtk.Region create_rectangles (Mtk.Rectangle rects, int n_rects);
+		public Mtk.Region crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height);
 		public bool equal (Mtk.Region other);
 		public Mtk.Rectangle? get_extents ();
 		public Mtk.Rectangle? get_rectangle (int nth);
@@ -20,6 +22,7 @@ namespace Mtk {
 		public bool is_empty ();
 		public int num_rectangles ();
 		public unowned Mtk.Region @ref ();
+		public Mtk.Region scale (int scale);
 		public void subtract (Mtk.Region other);
 		public void subtract_rectangle (Mtk.Rectangle rect);
 		public void translate (int dx, int dy);
@@ -34,23 +37,58 @@ namespace Mtk {
 		public int y;
 		public int width;
 		public int height;
+#if HAS_MUTTER46
+		[CCode (cname = "MTK_RECTANGLE_MAX_STACK_RECTS")]
+		public const int MAX_STACK_RECTS;
+#endif
 		[CCode (has_construct_function = false, type = "MtkRectangle*")]
 		public Rectangle (int x, int y, int width, int height);
 		public int area ();
 		public bool contains_rect (Mtk.Rectangle inner_rect);
 		public Mtk.Rectangle? copy ();
 		public bool could_fit_rect (Mtk.Rectangle inner_rect);
+#if HAS_MUTTER46
+		public void crop_and_scale (Graphene.Rect src_rect, int dst_width, int dst_height, Mtk.Rectangle dest);
+#endif
 		public bool equal (Mtk.Rectangle src2);
 		public void free ();
 		public static Mtk.Rectangle from_graphene_rect (Graphene.Rect rect, Mtk.RoundingStrategy rounding_strategy);
 		public bool horiz_overlap (Mtk.Rectangle rect2);
 		public bool intersect (Mtk.Rectangle src2, out Mtk.Rectangle dest);
+#if HAS_MUTTER46
+		public bool is_adjacent_to (Mtk.Rectangle other);
+#endif
 		public bool overlap (Mtk.Rectangle rect2);
+#if HAS_MUTTER46
+		public void scale_double (double scale, Mtk.RoundingStrategy rounding_strategy, Mtk.Rectangle dest);
+#endif
 		public Graphene.Rect? to_graphene_rect ();
 		public Mtk.Rectangle union (Mtk.Rectangle rect2);
 		public bool vert_overlap (Mtk.Rectangle rect2);
 	}
 #if HAS_MUTTER46
+	[CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)]
+	public struct RegionBuilder {
+		[CCode (array_length_cname = "n_levels")]
+		public weak Mtk.Region levels[16];
+		public int n_levels;
+		[CCode (cname = "MTK_REGION_BUILDER_MAX_LEVELS")]
+		public const int MAX_LEVELS;
+		public void add_rectangle (int x, int y, int width, int height);
+		public Mtk.Region finish ();
+		public void init ();
+	}
+	[CCode (cheader_filename = "mtk/mtk.h", has_type_id = false)]
+	public struct RegionIterator {
+		public weak Mtk.Region region;
+		public Mtk.Rectangle rectangle;
+		public bool line_start;
+		public bool line_end;
+		public int i;
+		public bool at_end ();
+		public void init (Mtk.Region region);
+		public void next ();
+	}
 	[CCode (cheader_filename = "mtk/mtk.h", cprefix = "MTK_REGION_OVERLAP_", has_type_id = false)]
 	public enum RegionOverlap {
 		OUT,