diff --git a/meson.build b/meson.build
index 39853165..e2198e4f 100644
--- a/meson.build
+++ b/meson.build
@@ -98,18 +98,6 @@ libmutter_dep = []
 
 vala_flags = []
 
-mutter330_dep = dependency('libmutter-3', version: ['>= 3.29.4', '< 3.31'], required: false)
-if mutter330_dep.found()
-    libmutter_dep = dependency('libmutter-3', version: '>= 3.29.4')
-    mutter_dep = [
-        libmutter_dep,
-        dependency('mutter-cogl-3'), dependency('mutter-cogl-pango-3'),
-        dependency('mutter-cogl-path-3'), dependency('mutter-clutter-3')
-    ]
-    add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
-        '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
-endif
-
 mutter332_dep = dependency('libmutter-4', version: ['>= 3.31.2', '< 3.34'], required: false)
 if mutter332_dep.found()
     libmutter_dep = dependency('libmutter-4', version: '>= 3.31.2')
@@ -118,7 +106,7 @@ if mutter332_dep.found()
         dependency('mutter-cogl-4'), dependency('mutter-cogl-pango-4'),
         dependency('mutter-cogl-path-4'), dependency('mutter-clutter-4')
     ]
-    vala_flags = ['--define', 'HAS_MUTTER332']
+    vala_flags = []
     add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
         '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
 endif
@@ -131,7 +119,7 @@ if mutter334_dep.found()
         dependency('mutter-cogl-5'), dependency('mutter-cogl-pango-5'),
         dependency('mutter-cogl-path-5'), dependency('mutter-clutter-5')
     ]
-    vala_flags = ['--define', 'HAS_MUTTER332', '--define', 'HAS_MUTTER334']
+    vala_flags = ['--define', 'HAS_MUTTER334']
     add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
         '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
 endif
@@ -144,7 +132,7 @@ if mutter336_dep.found()
         dependency('mutter-cogl-6'), dependency('mutter-cogl-pango-6'),
         dependency('mutter-cogl-path-6'), dependency('mutter-clutter-6')
     ]
-    vala_flags = ['--define', 'HAS_MUTTER332', '--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336']
+    vala_flags = ['--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336']
     add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
         '-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
 endif
@@ -157,7 +145,7 @@ if mutter338_dep.found()
 		dependency('mutter-cogl-7'), dependency('mutter-cogl-pango-7'),
 		dependency('mutter-clutter-7')
 	]
-	vala_flags = ['--define', 'HAS_MUTTER332', '--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336', '--define', 'HAS_MUTTER338']
+	vala_flags = ['--define', 'HAS_MUTTER334', '--define', 'HAS_MUTTER336', '--define', 'HAS_MUTTER338']
 	add_project_arguments(['-DCLUTTER_ENABLE_COMPOSITOR_API', '-DCLUTTER_ENABLE_EXPERIMENTAL_API',
 		'-DCOGL_ENABLE_EXPERIMENTAL_API', '-DCOGL_ENABLE_EXPERIMENTAL_2_0_API'], language: 'c')
 endif
diff --git a/src/Background/SystemBackground.vala b/src/Background/SystemBackground.vala
index 064155a6..c41e2b8e 100644
--- a/src/Background/SystemBackground.vala
+++ b/src/Background/SystemBackground.vala
@@ -16,26 +16,16 @@
 //
 
 namespace Gala {
-#if HAS_MUTTER332
     public class SystemBackground : GLib.Object {
-#else
-    public class SystemBackground : Meta.BackgroundActor {
-#endif
         const Clutter.Color DEFAULT_BACKGROUND_COLOR = { 0x2e, 0x34, 0x36, 0xff };
 
         static Meta.Background? system_background = null;
-#if HAS_MUTTER332
-    public Meta.BackgroundActor background_actor { get; construct; }
-#endif
+        public Meta.BackgroundActor background_actor { get; construct; }
 
         public signal void loaded ();
 
         public SystemBackground (Meta.Display display) {
-#if HAS_MUTTER332
             Object (background_actor: new Meta.BackgroundActor (display, 0));
-#else
-            Object (meta_display: display, monitor: 0);
-#endif
         }
 
         construct {
@@ -47,21 +37,15 @@ namespace Gala {
             }
 
             if (system_background == null) {
-#if HAS_MUTTER332
                 system_background = new Meta.Background (background_actor.meta_display);
-#else
-                system_background = new Meta.Background (meta_display);
-#endif
                 system_background.set_color (DEFAULT_BACKGROUND_COLOR);
                 system_background.set_file (background_file, GDesktop.BackgroundStyle.WALLPAPER);
             }
 
 #if HAS_MUTTER338
             ((Meta.BackgroundContent)background_actor.content).background = system_background;
-#elif HAS_MUTTER332
-            background_actor.background = system_background;
 #else
-            background = system_background;
+            background_actor.background = system_background;
 #endif
 
             var cache = Meta.BackgroundImageCache.get_default ();
diff --git a/src/DBusAccelerator.vala b/src/DBusAccelerator.vala
index 7afc6379..087747df 100644
--- a/src/DBusAccelerator.vala
+++ b/src/DBusAccelerator.vala
@@ -19,9 +19,7 @@ namespace Gala {
     public struct Accelerator {
         public string name;
         public uint flags;
-#if HAS_MUTTER332
         public Meta.KeyBindingFlags grab_flags;
-#endif
     }
 
     [DBus (name="org.gnome.Shell")]
@@ -68,19 +66,11 @@ namespace Gala {
             }
         }
 
-#if HAS_MUTTER332
         public uint grab_accelerator (string accelerator, uint flags, Meta.KeyBindingFlags grab_flags) throws DBusError, IOError {
-#else
-        public uint grab_accelerator (string accelerator, uint flags) throws DBusError, IOError {
-#endif
             uint? action = grabbed_accelerators[accelerator];
 
             if (action == null) {
-#if HAS_MUTTER332
                 action = wm.get_display ().grab_accelerator (accelerator, grab_flags);
-#else
-                action = wm.get_display ().grab_accelerator (accelerator);
-#endif
                 if (action > 0) {
                     grabbed_accelerators[accelerator] = action;
                 }
@@ -93,11 +83,7 @@ namespace Gala {
             uint[] actions = {};
 
             foreach (unowned Accelerator? accelerator in accelerators) {
-#if HAS_MUTTER332
                 actions += grab_accelerator (accelerator.name, accelerator.flags, accelerator.grab_flags);
-#else
-                actions += grab_accelerator (accelerator.name, accelerator.flags);
-#endif
             }
 
             return actions;
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index 79d31950..27ee2f39 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -113,10 +113,6 @@ namespace Gala {
             info = Meta.PluginInfo () {name = "Gala", version = Config.VERSION, author = "Gala Developers",
                 license = "GPLv3", description = "A nice elementary window manager"};
 
-#if !HAS_MUTTER332
-            Meta.Prefs.set_ignore_request_hide_titlebar (true);
-#endif
-
             animations_settings = new GLib.Settings (Config.SCHEMA + ".animations");
             animations_settings.bind ("enable-animations", this, "enable-animations", GLib.SettingsBindFlags.GET);
             behavior_settings = new GLib.Settings (Config.SCHEMA + ".behavior");
@@ -195,15 +191,9 @@ namespace Gala {
 
             var system_background = new SystemBackground (display);
 
-#if HAS_MUTTER332
             system_background.background_actor.add_constraint (new Clutter.BindConstraint (stage,
                 Clutter.BindCoordinate.ALL, 0));
             stage.insert_child_below (system_background.background_actor, null);
-#else
-            system_background.add_constraint (new Clutter.BindConstraint (stage,
-                Clutter.BindCoordinate.ALL, 0));
-            stage.insert_child_below (system_background, null);
-#endif
 
             ui_group = new Clutter.Actor ();
             ui_group.reactive = true;
diff --git a/vapi/Clutter-3-custom.vala b/vapi/Clutter-3-custom.vala
deleted file mode 100644
index 7350fd90..00000000
--- a/vapi/Clutter-3-custom.vala
+++ /dev/null
@@ -1,42 +0,0 @@
-namespace Clutter {
-
-	public struct Color {
-		[CCode (cname = "clutter_color_from_hls")]
-		public Color.from_hls (float hue, float luminance, float saturation);
-		[CCode (cname = "clutter_color_from_pixel")]
-		public Color.from_pixel (uint32 pixel);
-		[CCode (cname = "clutter_color_from_string")]
-		public Color.from_string (string str);
-		[CCode (cname = "clutter_color_from_string")]
-		public bool parse_string (string str);
-	}
-
-	public interface Container : GLib.Object {
-		public void add (params Clutter.Actor[] actors);
-		[CCode (cname = "clutter_container_class_find_child_property")]
-		public class unowned GLib.ParamSpec find_child_property (string property_name);
-		[CCode (cname = "clutter_container_class_list_child_properties")]
-		public class unowned GLib.ParamSpec[] list_child_properties ();
-	}
-
-	public struct Units {
-		[CCode (cname = "clutter_units_from_cm")]
-		public Units.from_cm (float cm);
-		[CCode (cname = "clutter_units_from_em")]
-		public Units.from_em (float em);
-		[CCode (cname = "clutter_units_from_em_for_font")]
-		public Units.from_em_for_font (string font_name, float em);
-		[CCode (cname = "clutter_units_from_mm")]
-		public Units.from_mm (float mm);
-		[CCode (cname = "clutter_units_from_pixels")]
-		public Units.from_pixels (int px);
-		[CCode (cname = "clutter_units_from_pt")]
-		public Units.from_pt (float pt);
-		[CCode (cname = "clutter_units_from_string")]
-		public Units.from_string (string str);
-	}
-
-	[CCode (cheader_filename = "clutter/clutter.h", has_copy_function = false, has_destroy_function = false, has_type_id = false)]
-	public struct Capture {
-	}
-}
diff --git a/vapi/Clutter-3.metadata b/vapi/Clutter-3.metadata
deleted file mode 100644
index ee10bc2e..00000000
--- a/vapi/Clutter-3.metadata
+++ /dev/null
@@ -1,237 +0,0 @@
-// Non mini-object
-ActorBox struct
-Color struct
-Fog struct
-Geometry struct
-Knot struct
-Margin struct
-PaintVolume struct
-PathNode struct
-Perspective struct
-Point struct
-Rect struct
-Size struct
-Units struct
-Vertex struct
-
-*.ref unowned
-
-init.argv unowned
-init_with_args
-	.argv unowned
-Actor
-	.apply_transform.matrix ref
-	.get_abs_allocation_vertices.verts out=false
-	.get_allocation_vertices.verts out=false
-Canvas
-	.new symbol_type="constructor"
-Event.type#method name="get_type"
-Image
-	.new symbol_type="constructor"
-
-// ???
-Actor.has_pointer#method name="get_has_pointer"
-InitError errordomain=false
-redraw skip
-
-// Not all backing symbols are deprecated
-Actor.pick deprecated=false
-
-// Nullable return values
-Actor
-	.get_parent nullable
-value_get_color nullable
-
-// method/virtual-method/signal don't match
-Actor
-	.event#method name="emit_event"
-	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
-	.get_paint_volume#virtual_method.volume out
-	.queue_redraw#signal skip
-	.queue_redraw#virtual_method skip
-Container
-	.add_actor skip=false
-	.class_* skip
-Text
-	.activate#method name="try_activate"
-	.insert_text#signal skip
-TextBuffer.get_text#virtual_method name="get_text_with_length"
-
-// virtual/abstract distinction
-Container
-	.lower virtual
-	.raise virtual
-	.*_child_meta#virtual_method virtual
-	.foreach_with_internals#virtual_method virtual
-
-// Default values
-Container
-	.lower.sibling nullable default=null
-	.raise.sibling nullable default=null
-Stage.read_pixels
-	.width default=-1
-	.height default=-1
-Text
-	.position_to_coords.line_height default=null
-
-// Reparented funcs methods can't be instance methods
-feature_available skip
-feature_get_all skip
-FeatureFlags.texture_npot skip
-
-// Skipped by g-i for unknown reasons
-LayoutManager
-	.create_child_meta skip=false
-Model
-	.insert_row skip=false
-
-// Variadic arguments
-Actor
-	.animate skip=false
-	.animate_with_alpha skip=false
-	.animate_with_timeline skip=false
-Animator
-	.set skip=false
-Box
-	.pack skip=false
-	.pack_after skip=false
-	.pack_at skip=false
-	.pack_before skip=false
-Container
-	.add_valist skip=false
-	.child_get skip=false
-	.child_set skip=false
-	.remove skip=false
-	.remove_valist skip=false
-Interval
-	.new skip=false
-	.get_interval skip=false
-	.set_final skip=false
-	.set_initial skip=false
-	.set_interval skip=false
-LayoutManager
-	.child_get skip=false
-	.child_set skip=false
-ListModel
-	.new skip=false
-Model
-	.append skip=false
-	.insert skip=false
-	.prepend skip=false
-ModelIter
-	.get skip=false
-	.set skip=false
-Script
-	.get_objects skip=false
-
-// Changing error domains
-Texture
-	.new_from_file throws="Clutter.TextureError"
-
-// Skipped upstream for unknown reasons
-Alpha.register_func skip=false
-TimeoutPool skip=false
-Interval.register_progress_func skip=false
-frame_source_* skip=false
-get_option_group skip=false
-get_option_group_without_init skip=false
-threads_add_frame_source skip=false
-threads_add_frame_source_full skip=false
-threads_add_idle skip=false
-threads_add_idle_full skip=false
-threads_set_lock_functions skip=false
-threads_add_timeout skip=false
-threads_add_timeout_full skip=false
-
-// struct/class confusion
-ActorBox
-	.new skip
-	.from_vertices skip
-Units.from_* skip
-Color
-	.new skip
-Margin
-	.new skip
-Size
-	.init skip
-Vertex.new skip
-
-// Class methods
-container_class_find_child_property skip
-container_class_list_child_properties skip
-
-// Move symbols
-get_actor_by_gid parent="Clutter.Actor" name="get_by_gid"
-get_input_device_for_id parent="Clutter.InputDevice" name="get_for_id"
-color_from_* skip
-units_from_* skip
-
-// Struct return values
-color_get_static nullable
-
-// Upstream
-Effect
-	.get_paint_volume.volume out
-Event
-	.get_position.position out
-Text
-	.cursor_event.geometry out
-
-// Remove for clutter-2.0
-/////////////////////////
-
-Stage
- 	.event name="emit_event"
- 	.capture.captures out array_length_idx=3 type="Clutter.Capture[]"
-
-Capture
-  .image type="Cairo.ImageSurface"
-
-// *Event should be compact classes derived from Clutter.Event
-Event.type skip=false
-AnyEvent struct=false base_type="Clutter.Event"
-ButtonEvent struct=false base_type="Clutter.Event"
-CrossingEvent struct=false base_type="Clutter.Event"
-KeyEvent struct=false base_type="Clutter.Event"
-MotionEvent struct=false base_type="Clutter.Event"
-ScrollEvent struct=false base_type="Clutter.Event"
-StageStateEvent struct=false base_type="Clutter.Event"
-TouchEvent struct=false base_type="Clutter.Event"
-TouchpadPinchEvent struct=false base_type="Clutter.Event"
-TouchpadSwipeEvent struct=false base_type="Clutter.Event"
-
-// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
-*#constant skip
-COGL skip=false
-CURRENT_TIME skip=false
-FLAVOUR skip=false
-*VERSION* skip=false
-PATH_RELATIVE skip=false
-PRIORITY_REDRAW skip=false
-
-// Clutter devs don't like us creating nested namespaces
-frame_source_* name="frame_source_(.+)" parent="Clutter.FrameSource"
-value_* name="value_(.+)" parent="Clutter.Value"
-threads_* name="threads_(.+)" parent="Clutter.Threads"
-threads_add_frame_source name="add" parent="Clutter.Threads.FrameSource"
-threads_add_frame_source_full name="add_full" parent="Clutter.Threads.FrameSource"
-threads_add_idle name="add" parent="Clutter.Threads.Idle"
-threads_add_idle_full name="add_full" parent="Clutter.Threads.Idle"
-threads_add_timeout name="add" parent="Clutter.Threads.Timeout"
-threads_add_timeout_full name="add_full" parent="Clutter.Threads.Timeout"
-util_next_p2 name="next_power_of_2" parent="Clutter.Util"
-
-// Backwards compatibility
-Color.alloc symbol_type="function"
-Point.alloc symbol_type="function"
-Rect.alloc symbol_type="function"
-Size.alloc symbol_type="function"
-Vertex.alloc symbol_type="function"
-
-BinAlignment deprecated=false deprecated_since=null
-BinAlignment.* deprecated
-BinAlignment.start deprecated=false
-BinLayout.new.*_align default=Clutter.BinAlignment.START
-
-// Possibly keep
-KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
diff --git a/vapi/Cogl-3-custom.vala b/vapi/Cogl-3-custom.vala
deleted file mode 100644
index 392f3db2..00000000
--- a/vapi/Cogl-3-custom.vala
+++ /dev/null
@@ -1,79 +0,0 @@
-namespace Cogl {
-	[BooleanType]
-	[CCode (cheader_filename = "cogl/cogl.h")]
-	[SimpleType]
-	public struct Bool : bool {
-	}
-
-	public struct Color {
-		[Version (since = "1.4")]
-		[CCode (cname="cogl_color_init_from_4f")]
-		public Color.from_4f (float red, float green, float blue, float alpha);
-		[Version (since = "1.4")]
-		[CCode (cname="cogl_color_init_from_4fv")]
-		public Color.from_4fv (float color_array);
-		[Version (since = "1.4")]
-		[CCode (cname="cogl_color_init_from_4ub")]
-		public Color.from_4ub (uint8 red, uint8 green, uint8 blue, uint8 alpha);
-		[Version (since = "1.16")]
-		[CCode (cname="cogl_color_init_from_hsl")]
-		public Color.from_hsl (float hue, float saturation, float luminance);
-	}
-
-	[Compact]
-	public class Bitmap : Cogl.Handle {
-	}
-
-	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_quaternion_get_gtype ()", copy_function = "cogl_quaternion_copy", free_function = "cogl_quaternion_free")]
-	[Compact]
-	public class Quaternion {
-	}
-
-	[Compact]
-	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_offscreen_get_gtype ()", ref_function = "cogl_offscreen_ref", unref_function = "cogl_offscreen_unref")]
-	public class Offscreen : Cogl.Handle {
-	}
-
-	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_vertex_buffer_ref", unref_function = "cogl_vertex_buffer_unref")]
-	public class VertexBuffer : Cogl.Handle {
-	}
-
-	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_shader_ref", unref_function = "cogl_shader_unref")]
-	public class Shader : Cogl.Handle {
-	}
-
-	[Compact]
-	[CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")]
-	public class Program : Cogl.Handle {
-	}
-
-	[Compact]
-	[CCode (cheader_filename = "cogl/cogl.h", type_id = "cogl_handle_get_gtype ()", ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")]
-	public class Handle {
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_bitmap")]
-		[Version (since = "1.0")]
-		public Cogl.Bool is_bitmap ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_material")]
-		[Version (deprecated = true, deprecated_since = "1.16")]
-		public Cogl.Bool is_material ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_offscreen")]
-		public Cogl.Bool is_offscreen ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_program")]
-		[Version (deprecated = true, deprecated_since = "1.16")]
-		public Cogl.Bool is_program (Cogl.Handle handle);
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_shader")]
-		[Version (deprecated = true, deprecated_since = "1.16")]
-		public Cogl.Bool is_shader ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_texture")]
-		public Cogl.Bool is_texture ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_vertex_buffer")]
-		[Version (deprecated = true, deprecated_since = "1.16", since = "1.0")]
-		public Cogl.Bool is_vertex_buffer ();
-		[CCode (cheader_filename = "cogl/cogl.h", cname="cogl_is_vertex_buffer_indices")]
-		[Version (deprecated = true, deprecated_since = "1.16", since = "1.4")]
-		public Cogl.Bool is_vertex_buffer_indices ();
-	}
-
-}
diff --git a/vapi/Cogl-3.metadata b/vapi/Cogl-3.metadata
deleted file mode 100644
index c9150c65..00000000
--- a/vapi/Cogl-3.metadata
+++ /dev/null
@@ -1,102 +0,0 @@
-Color struct
-Bool skip
-Quaternion skip=false
-
-Material base_type="Cogl.Handle"
-MaterialLayer base_type="Cogl.Handle"
-
-_ColorSizeCheck skip
-_MatrixSizeCheck skip
-_TextureVertexSizeCheck skip
-
-Offscreen.ref skip
-Offscreen.unref skip
-
-Color
-  .init_* skip
-color_init_from_hsl skip
-color_equal.v1 type="Cogl.Color"
-color_equal.v2 type="Cogl.Color"
-color_equal symbol_type=method
-
-texture_new_* name="texture_new_(.+)" parent="Cogl.Texture"
-Texture
-  .get_data.data type="uint8[]"
-  .new_from_data.data type="uint8[]"
-  .set_data.data type="uint8[]"
-  .set_region.data type="uint8[]"
-
-Matrix
-  .transform_points.points_in type="uint8[]"
-  .transform_points.stride_out out
-  .transform_points.points_out out type="uint8[]"
-  .project_points.points_in type="uint8[]"
-  .project_points.stride_out out
-  .project_points.points_out out type="uint8[]"
-
-matrix_equal.v1 type="Cogl.Matrix"
-matrix_equal.v2 type="Cogl.Matrix"
-matrix_equal symbol_type=method
-
-polygon.vertices array array_length_idx=1
-
-vertex_buffer_* name="vertex_buffer_(.+)" parent="Cogl.VertexBuffer"
-//vertex_buffer_* symbol_type="method" instance_idx=0
-vertex_buffer_add symbol_type="method" instance_idx=0
-vertex_buffer_delete symbol_type="method" instance_idx=0
-vertex_buffer_disable symbol_type="method" instance_idx=0
-vertex_buffer_draw symbol_type="method" instance_idx=0
-vertex_buffer_draw_elements symbol_type="method" instance_idx=0
-vertex_buffer_enable symbol_type="method" instance_idx=0
-vertex_buffer_get_n_vertices symbol_type="method" instance_idx=0
-vertex_buffer_indices_get_type symbol_type="method" instance_idx=0
-vertex_buffer_submit symbol_type="method" instance_idx=0
-vertex_buffer_unref skip
-vertex_buffer_ref skip
-
-shader_* name="shader_(.+)" parent="Cogl.Shader"
-shader_* symbol_type="method" instance_idx=0
-shader_unref skip
-shader_ref skip
-
-program_* name="program_(.+)" parent="Cogl.Program"
-program_attach_shader symbol_type="method" instance_idx=0
-program_get_uniform_location symbol_type="method" instance_idx=0
-program_link symbol_type="method" instance_idx=0
-program_set_uniform_1f symbol_type="method" instance_idx=0
-program_set_uniform_1i symbol_type="method" instance_idx=0
-program_set_uniform_float symbol_type="method" instance_idx=0
-program_set_uniform_int symbol_type="method" instance_idx=0
-program_set_uniform_matrix symbol_type="method" instance_idx=0
-program_use symbol_type="method" instance_idx=0
-
-program_unref skip
-program_ref skip
-
-is_bitmap parent="Cogl.Handle"
-is_material parent="Cogl.Handle"
-is_offscreen parent="Cogl.Handle"
-is_program parent="Cogl.Handle"
-is_shader parent="Cogl.Handle"
-is_texture parent="Cogl.Handle"
-is_vertex_buffer parent="Cogl.Handle"
-is_vertex_buffer_indices parent="Cogl.Handle"
-
-create_program type="unowned Cogl.Program" name="create" parent="Cogl.Program"
-create_shader type="unowned Cogl.Shader" name="create" parent="Cogl.Shader"
-
-get_source type="unowned Cogl.Material"
-push_source.material type="Cogl.Material"
-set_source.material type="Cogl.Material"
-
-Bitmap.error_quark parent="Cogl.BitmapError" name="quark"
-Texture.error_quark parent="Cogl.TextureError" name="quark"
-texture_error_quark skip
-
-BitmapError errordomain
-BlendStringError errordomain
-RendererError errordomain
-SystemError errordomain
-TextureError errordomain
-
-FuncPtr skip
diff --git a/vapi/Meta-3.metadata b/vapi/Meta-3.metadata
deleted file mode 100644
index 386b2b78..00000000
--- a/vapi/Meta-3.metadata
+++ /dev/null
@@ -1,186 +0,0 @@
-* skip=false
-*.* skip=false
-* cheader_filename="meta/main.h"
-
-Backend cheader_filename="meta/meta-backend.h"
-get_backend parent="Meta.Backend" cheader_filename="meta/meta-backend.h"
-Background cheader_filename="meta/meta-background.h"
-Background.set_file.file nullable
-BackgroundActor cheader_filename="meta/meta-background-actor.h"
-BackgroundGroup cheader_filename="meta/meta-background-group.h"
-BackgroundImage cheader_filename="meta/meta-background-image.h"
-BackgroundImageCache cheader_filename="meta/meta-background-image.h"
-Barrier cheader_filename="meta/barrier.h"
-BarrierDirection cheader_filename="meta/barrier.h"
-BarrierEvent cheader_filename="meta/barrier.h"
-ButtonFunction cheader_filename="meta/common.h"
-ButtonLayout cheader_filename="meta/common.h"
-Compositor cheader_filename="meta/compositor.h"
-Compositor.process_event.event type="X.Event" ref
-Compositor.sync_stack.stack type_arguments="Meta.Window"
-compositor_new 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"
-disable_unredirect_for_display parent="Meta.Display" symbol_type="method" name="disable_unredirect" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-enable_unredirect_for_display parent="Meta.Display" symbol_type="method" name="enable_unredirect" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-
-get_window_actors parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h" type_arguments="Meta.WindowActor"
-get_overlay_window parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-set_stage_input_region parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-empty_stage_input_region parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-focus_stage_window parent="Meta.Display" symbol_type="method" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-
-CompEffect cheader_filename="meta/compositor.h"
-CloseDialog cheader_filename="meta/meta-close-dialog.h"
-CloseDialogResponse cheader_filename="meta/meta-close-dialog.h"
-Cursor cheader_filename="meta/common.h"
-CursorTracker cheader_filename="meta/meta-cursor-tracker.h"
-CursorTracker.get_for_display parent="Meta.Display" symbol_type="method" instance_idx=0 name="get_cursor_tracker"
-CursorTracker.get_pointer.x out
-CursorTracker.get_pointer.y out
-CursorTracker.get_pointer.mods out
-DBusDisplayConfigSkeleton cheader_filename="meta/meta-monitor-manager.h"
-DebugTopic cheader_filename="meta/util.h"
-Direction cheader_filename="meta/common.h"
-Display cheader_filename="meta/display.h"
-DisplayCorner cheader_filename="meta/display.h"
-DisplayDirection cheader_filename="meta/display.h"
-Dnd cheader_filename="meta/meta-dnd.h"
-EdgeType cheader_filename="meta/boxes.h"
-Edge cheader_filename="meta/boxes.h"
-Frame cheader_filename="meta/types.h"
-FrameBorders cheader_filename="meta/common.h"
-FrameFlags cheader_filename="meta/common.h"
-FrameType cheader_filename="meta/common.h"
-GrabOp cheader_filename="meta/common.h"
-Group cheader_filename="meta/group.h"
-Group.property_notify.event type="X.Event" ref
-IdleMonitor cheader_filename="meta/meta-idle-monitor.h"
-IdleMonitorWatchFunc cheader_filename="meta/meta-idle-monitor.h"
-InhibitShortcutsDialog cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
-InhibitShortcutsDialogResponse cheader_filename="meta/meta-inhibit-shortcuts-dialog.h"
-KeyBinding cheader_filename="meta/keybindings.h"
-keybindings_set_custom_handler parent="Meta.KeyBinding" name="set_custom_handler" cheader_filename="meta/keybindings.h"
-KeyBindingAction cheader_filename="meta/prefs.h"
-KeyBindingFlags cheader_filename="meta/prefs.h"
-KeyHandlerFunc cheader_filename="meta/prefs.h"
-KeyHandlerFunc.event type="Clutter.KeyEvent"
-LaterType cheader_filename="meta/util.h"
-LocaleDirection cheader_filename="meta/util.h"
-MaximizeFlags cheader_filename="meta/window.h"
-ModalOptions cheader_filename="meta/meta-plugin.h"
-MonitorManager cheader_filename="meta/meta-monitor-manager.h"
-MonitorSwitchConfigType cheader_filename="meta/meta-monitor-manager.h"
-MotionDirection cheader_filename="meta/common.h"
-PadActionType cheader_filename="meta/display.h"
-Plugin cheader_filename="meta/meta-plugin.h"
-Plugin.xevent_filter.event type="X.Event" ref
-PluginInfo cheader_filename="meta/meta-plugin.h"
-PluginVersion cheader_filename="meta/meta-plugin.h"
-Preference cheader_filename="meta/prefs.h"
-PrefsChangedFunc cheader_filename="meta/prefs.h"
-Rectangle cheader_filename="meta/boxes.h" struct
-RemoteAccessController cheader_filename="meta/meta-remote-access-controller.h"
-RemoteAccessHandle cheader_filename="meta/meta-remote-access-controller.h"
-Settings cheader_filename="meta/meta-settings.h"
-Shadow cheader_filename="meta/meta-shadow-factory.h"
-ShadowFactory cheader_filename="meta/meta-shadow-factory.h"
-ShadowMode cheader_filename="meta/meta-window-actor.h"
-ShadowParams cheader_filename="meta/meta-shadow-factory.h"
-ShapedTexture cheader_filename="meta/meta-shaped-texture.h"
-Side cheader_filename="meta/common.h"
-SizeChange cheader_filename="meta/compositor.h"
-StackLayer cheader_filename="meta/common.h"
-Stage cheader_filename="meta/meta-stage.h"
-Stage.is_focused parent="Meta.Display" symbol_type="method" name="stage_is_focused" instance_idx=0 cheader_filename="meta/compositor-mutter.h"
-Strut cheader_filename="meta/boxes.h"
-TabList cheader_filename="meta/display.h"
-TabShowType cheader_filename="meta/display.h"
-Theme cheader_filename="meta/theme.h"
-theme_get_default cheader_filename="meta/theme.h"
-theme_new cheader_filename="meta/theme.h"
-VirtualModifier cheader_filename="meta/common.h"
-Workspace cheader_filename="meta/workspace.h"
-WorkspaceManager cheader_filename="meta/meta-workspace-manager.h"
-Window cheader_filename="meta/window.h"
-Window.focus#signal name="focused"
-Window.icon type="Cairo.Surface"
-Window.mini_icon type="Cairo.Surface"
-WindowActor cheader_filename="meta/meta-window-actor.h"
-WindowClientType cheader_filename="meta/window.h"
-WindowForeachFunc cheader_filename="meta/window.h"
-WindowGroup cheader_filename="meta/meta-window-group.h"
-WindowMenuType cheader_filename="meta/compositor.h"
-WindowShape cheader_filename="meta/meta-window-shape.h"
-WindowType cheader_filename="meta/window.h"
-X11Display cheader_filename="meta/meta-x11-display.h"
-
-rect skip
-prefs_* parent="Meta.Prefs" name="prefs_(.+)" cheader_filename="meta/prefs.h"
-
-g_utf8_strndup skip
-
-preference_to_string cheader_filename="meta/prefs.h"
-frame_type_to_string cheader_filename="meta/util.h"
-
-CURRENT_TIME cheader_filename="meta/common.h"
-ICON_WIDTH cheader_filename="meta/common.h"
-ICON_HEIGHT cheader_filename="meta/common.h"
-MINI_ICON_WIDTH cheader_filename="meta/common.h"
-MINI_ICON_HEIGHT cheader_filename="meta/common.h"
-DEFAULT_ICON_NAME cheader_filename="meta/common.h"
-PRIORITY_RESIZE cheader_filename="meta/common.h"
-PRIORITY_BEFORE_REDRAW cheader_filename="meta/common.h"
-PRIORITY_REDRAW cheader_filename="meta/common.h"
-PRIORITY_PREFS_NOTIFY cheader_filename="meta/common.h"
-VIRTUAL_CORE_POINTER_ID cheader_filename="meta/common.h"
-VIRTUAL_CORE_KEYBOARD_ID cheader_filename="meta/common.h"
-
-MAJOR_VERSION cheader_filename="meta/meta-version.h"
-MINOR_VERSION cheader_filename="meta/meta-version.h"
-MICRO_VERSION cheader_filename="meta/meta-version.h"
-PLUGIN_API_VERSION cheader_filename="meta/meta-version.h"
-
-add_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
-bug parent="Meta.Util" cheader_filename="meta/util.h"
-debug_spew_real parent="Meta.Util" cheader_filename="meta/util.h"
-external_binding_name_for_action parent="Meta.Util" cheader_filename="meta/util.h"
-fatal parent="Meta.Util" cheader_filename="meta/util.h"
-free_gslist_and_elements skip
-get_locale_direction parent="Meta.Util" cheader_filename="meta/util.h"
-gravity_to_string parent="Meta.Util" cheader_filename="meta/util.h"
-is_debugging parent="Meta.Util" cheader_filename="meta/util.h"
-is_syncing parent="Meta.Util" cheader_filename="meta/util.h"
-is_verbose parent="Meta.Util" cheader_filename="meta/util.h"
-is_wayland_compositor parent="Meta.Util" cheader_filename="meta/util.h"
-later_add parent="Meta.Util" cheader_filename="meta/util.h"
-later_remove parent="Meta.Util" cheader_filename="meta/util.h"
-pop_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
-push_no_msg_prefix parent="Meta.Util" cheader_filename="meta/util.h"
-remove_verbose_topic parent="Meta.Util" cheader_filename="meta/util.h"
-show_dialog parent="Meta.Util" cheader_filename="meta/util.h"
-show_dialog.columns type_arguments="string" nullable default=null
-show_dialog.entries type_arguments="string" nullable default=null
-show_dialog.transient_for default=0
-show_dialog.icon_name nullable default=null
-show_dialog.cancel_text nullable default=null
-show_dialog.ok_text nullable default=null
-show_dialog.display nullable default=null
-show_dialog.timeout nullable default=null
-topic_real parent="Meta.Util" cheader_filename="meta/util.h"
-unsigned_long_equal parent="Meta.Util" name="ulong_equal" cheader_filename="meta/util.h"
-unsigned_long_equal.v1 type="ulong?"
-unsigned_long_equal.v2 type="ulong?"
-unsigned_long_hash parent="Meta.Util" name="ulong_hash" cheader_filename="meta/util.h"
-unsigned_long_hash.v type="ulong?"
-verbose_real parent="Meta.Util" cheader_filename="meta/util.h"
-warning parent="Meta.Util" cheader_filename="meta/util.h"
-set_gnome_wm_keybindings parent="Meta.Util"
-set_wm_name parent="Meta.Util"
-
-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"
-x11_init_gdk_display parent="Meta.X11Display" cheader_filename="meta/meta-x11-display.h"
diff --git a/vapi/libmutter-3.deps b/vapi/libmutter-3.deps
deleted file mode 120000
index 7782137a..00000000
--- a/vapi/libmutter-3.deps
+++ /dev/null
@@ -1 +0,0 @@
-libmutter.deps
\ No newline at end of file
diff --git a/vapi/libmutter-3.vapi b/vapi/libmutter-3.vapi
deleted file mode 120000
index 12f9cc52..00000000
--- a/vapi/libmutter-3.vapi
+++ /dev/null
@@ -1 +0,0 @@
-libmutter.vapi
\ No newline at end of file
diff --git a/vapi/libmutter-4.deps b/vapi/libmutter-4.deps
index cc7cc1c5..7782137a 120000
--- a/vapi/libmutter-4.deps
+++ b/vapi/libmutter-4.deps
@@ -1 +1 @@
-libmutter-3.deps
\ No newline at end of file
+libmutter.deps
\ No newline at end of file
diff --git a/vapi/libmutter-4.vapi b/vapi/libmutter-4.vapi
index e6572283..12f9cc52 120000
--- a/vapi/libmutter-4.vapi
+++ b/vapi/libmutter-4.vapi
@@ -1 +1 @@
-libmutter-3.vapi
\ No newline at end of file
+libmutter.vapi
\ No newline at end of file
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
index 08315da1..69728bee 100644
--- a/vapi/libmutter.vapi
+++ b/vapi/libmutter.vapi
@@ -59,10 +59,6 @@ namespace Meta {
 		public static bool get_gnome_accessibility ();
 		[CCode (cheader_filename = "meta/prefs.h")]
 		public static bool get_gnome_animations ();
-#if !HAS_MUTTER332
-		[CCode (cheader_filename = "meta/prefs.h")]
-		public static bool get_ignore_request_hide_titlebar ();
-#endif
 		[CCode (cheader_filename = "meta/prefs.h")]
 		public static Meta.KeyBindingAction get_keybinding_action (string name);
 		[CCode (cheader_filename = "meta/prefs.h")]
@@ -93,10 +89,6 @@ namespace Meta {
 		public static void remove_listener (Meta.PrefsChangedFunc func);
 		[CCode (cheader_filename = "meta/prefs.h")]
 		public static void set_force_fullscreen (bool whether);
-#if !HAS_MUTTER332
-		[CCode (cheader_filename = "meta/prefs.h")]
-		public static void set_ignore_request_hide_titlebar (bool whether);
-#endif
 		[CCode (cheader_filename = "meta/prefs.h")]
 		public static void set_num_workspaces (int n_workspaces);
 		[CCode (cheader_filename = "meta/prefs.h")]
@@ -353,20 +345,11 @@ namespace Meta {
 		public Meta.Backend backend { owned get; construct; }
 #endif
 		public signal void cursor_changed ();
-#if HAS_MUTTER332
 		public signal void cursor_moved (float x, float y);
-#endif
 #if HAS_MUTTER334
 		public signal void visibility_changed ();
 #endif
 	}
-#if !HAS_MUTTER332
-	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_dbus_display_config_skeleton_get_type ()")]
-	public class DBusDisplayConfigSkeleton : GLib.DBusInterfaceSkeleton, GLib.DBusInterface {
-		[CCode (has_construct_function = false)]
-		protected DBusDisplayConfigSkeleton ();
-	}
-#endif
 	[CCode (cheader_filename = "meta/display.h", type_id = "meta_display_get_type ()")]
 	public class Display : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -405,9 +388,7 @@ namespace Meta {
 		public bool get_monitor_in_fullscreen (int monitor);
 		public int get_monitor_index_for_rect (Meta.Rectangle rect);
 		public int get_monitor_neighbor_index (int which_monitor, Meta.DisplayDirection dir);
-#if HAS_MUTTER332
 		public float get_monitor_scale (int monitor);
-#endif
 		public int get_n_monitors ();
 #if !HAS_MUTTER334
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_overlay_window")]
@@ -419,15 +400,10 @@ namespace Meta {
 		public unowned Meta.Selection get_selection ();
 #endif
 		public void get_size (out int width, out int height);
-#if HAS_MUTTER332
 		public unowned Meta.SoundPlayer get_sound_player ();
 		public unowned Meta.StartupNotification get_startup_notification ();
-#endif
 		[CCode (cheader_filename = "meta/compositor-mutter.h", cname = "meta_get_stage_for_display")]
 		public unowned Clutter.Actor get_stage ();
-#if !HAS_MUTTER332
-		public unowned GLib.SList<void*> get_startup_sequences ();
-#endif
 		public unowned Meta.Window get_tab_current (Meta.TabList type, Meta.Workspace workspace);
 		public GLib.List<weak Meta.Window> get_tab_list (Meta.TabList type, Meta.Workspace? workspace);
 		public unowned Meta.Window get_tab_next (Meta.TabList type, Meta.Workspace workspace, Meta.Window? window, bool backward);
@@ -439,11 +415,7 @@ namespace Meta {
 		public unowned Clutter.Actor get_window_group ();
 		public unowned Meta.WorkspaceManager get_workspace_manager ();
 		public unowned Meta.X11Display get_x11_display ();
-#if HAS_MUTTER332
 		public uint grab_accelerator (string accelerator, Meta.KeyBindingFlags flags);
-#else
-		public uint grab_accelerator (string accelerator);
-#endif
 		public bool is_pointer_emulating_sequence (Clutter.EventSequence? sequence);
 		public bool remove_keybinding (string name);
 		public void request_pad_osd (Clutter.InputDevice pad, bool edition_mode);
@@ -490,9 +462,6 @@ namespace Meta {
 		public signal bool show_resize_popup (bool object, Meta.Rectangle p0, int p1, int p2);
 		public signal bool show_restart_message (string? message);
 		public signal void showing_desktop_changed ();
-#if !HAS_MUTTER332
-		public signal void startup_sequence_changed (void* object);
-#endif
 		public signal void window_created (Meta.Window object);
 		public signal void window_demands_attention (Meta.Window object);
 		public signal void window_entered_monitor (int object, Meta.Window p0);
@@ -556,7 +525,6 @@ namespace Meta {
 		[CCode (cheader_filename = "meta/keybindings.h", cname = "meta_keybindings_set_custom_handler")]
 		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc? handler);
 	}
-#if HAS_MUTTER332
 	[CCode (cheader_filename = "meta/meta-launch-context.h", type_id = "meta_launch_context_get_type ()")]
 	public class LaunchContext : GLib.AppLaunchContext {
 		[CCode (has_construct_function = false)]
@@ -570,13 +538,8 @@ namespace Meta {
 		[NoAccessorMethod]
 		public Meta.Workspace workspace { owned get; set; }
 	}
-#endif
 	[CCode (cheader_filename = "meta/meta-monitor-manager.h", type_id = "meta_monitor_manager_get_type ()")]
-#if HAS_MUTTER332
 	public class MonitorManager : GLib.Object {
-#else
-	public abstract class MonitorManager : Meta.DBusDisplayConfigSkeleton, GLib.DBusInterface {
-#endif
 		[CCode (has_construct_function = false)]
 		protected MonitorManager ();
 		public bool can_switch_config ();
@@ -595,13 +558,9 @@ namespace Meta {
 		public bool panel_orientation_managed { get; }
 #endif
 		public signal void confirm_display_change ();
-#if HAS_MUTTER332
 		public signal void monitors_changed ();
-#endif
 		public signal void monitors_changed_internal ();
-#if HAS_MUTTER332
 		public signal void power_save_mode_changed ();
-#endif
 	}
 	[CCode (cheader_filename = "meta/meta-plugin.h", type_id = "meta_plugin_get_type ()")]
 	public abstract class Plugin : GLib.Object {
@@ -725,11 +684,7 @@ namespace Meta {
 	[Compact]
 	public class Shadow {
 		public void get_bounds (int window_x, int window_y, int window_width, int window_height, Cairo.RectangleInt bounds);
-#if HAS_MUTTER332
 		public void paint (Cogl.Framebuffer framebuffer, int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
-#else
-		public void paint (int window_x, int window_y, int window_width, int window_height, uint8 opacity, Cairo.Region? clip, bool clip_strictly);
-#endif
 		public Meta.Shadow @ref ();
 		public void unref ();
 	}
@@ -761,7 +716,6 @@ namespace Meta {
 #endif
 		public signal void size_changed ();
 	}
-#if HAS_MUTTER332
 	[CCode (cheader_filename = "meta/meta-sound-player.h", type_id = "meta_sound_player_get_type ()")]
 	public class SoundPlayer : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -769,16 +723,12 @@ namespace Meta {
 		public void play_from_file (GLib.File file, string description, GLib.Cancellable? cancellable = null);
 		public void play_from_theme (string name, string description, GLib.Cancellable? cancellable = null);
 	}
-#endif
 	[CCode (cheader_filename = "meta/meta-stage.h", type_id = "meta_stage_get_type ()")]
 	public class Stage : Clutter.Stage, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false)]
 		protected Stage ();
-#if HAS_MUTTER332
 		public signal void actors_painted ();
-#endif
 	}
-#if HAS_MUTTER332
 	[CCode (cheader_filename = "meta/meta-startup-notification.h", type_id = "meta_startup_notification_get_type ()")]
 	public class StartupNotification : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -811,7 +761,6 @@ namespace Meta {
 		[HasEmitter]
 		public signal void complete ();
 	}
-#endif
 	[CCode (cheader_filename = "meta/theme.h", has_type_id = false)]
 	[Compact]
 	public class Theme {
@@ -859,9 +808,7 @@ namespace Meta {
 		public Meta.Rectangle frame_rect_to_client_rect (Meta.Rectangle frame_rect);
 		public Meta.Rectangle get_buffer_rect ();
 		public unowned string get_client_machine ();
-#if HAS_MUTTER332
 		public Meta.WindowClientType get_client_type ();
-#endif
 		public unowned GLib.Object get_compositor_private ();
 		public unowned string get_description ();
 		public unowned Meta.Display get_display ();
@@ -878,9 +825,7 @@ namespace Meta {
 		public unowned string get_gtk_unique_bus_name ();
 		public unowned string get_gtk_window_object_path ();
 		public bool get_icon_geometry (out Meta.Rectangle rect);
-#if HAS_MUTTER332
 		public uint64 get_id ();
-#endif
 		public Meta.StackLayer get_layer ();
 		public Meta.MaximizeFlags get_maximized ();
 		public int get_monitor ();
@@ -1005,11 +950,7 @@ namespace Meta {
 		public signal void workspace_changed ();
 	}
 	[CCode (cheader_filename = "meta/meta-window-actor.h", type_id = "meta_window_actor_get_type ()")]
-#if HAS_MUTTER332
 	public abstract class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-#else
-	public class WindowActor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
-#endif
 		[CCode (has_construct_function = false)]
 		protected WindowActor ();
 #if HAS_MUTTER338
@@ -1022,9 +963,6 @@ namespace Meta {
 #if !HAS_MUTTER334
 		public unowned Clutter.Actor get_texture ();
 #endif
-#if !HAS_MUTTER332
-		public X.Window get_x_window ();
-#endif
 #if HAS_MUTTER334
 		public unowned Meta.ShapedTexture get_texture ();
 #endif
@@ -1175,7 +1113,6 @@ namespace Meta {
 	}
 	[CCode (cheader_filename = "meta/common.h", has_type_id = false)]
 	public struct ButtonLayout {
-#if HAS_MUTTER332
 		[CCode (array_length = false)]
 		public weak Meta.ButtonFunction left_buttons[4];
 		[CCode (array_length = false)]
@@ -1184,16 +1121,6 @@ namespace Meta {
 		public weak Meta.ButtonFunction right_buttons[4];
 		[CCode (array_length = false)]
 		public weak bool right_buttons_has_spacer[4];
-#else
-		[CCode (array_length = false)]
-		public weak Meta.ButtonFunction left_buttons[5];
-		[CCode (array_length = false)]
-		public weak bool left_buttons_has_spacer[5];
-		[CCode (array_length = false)]
-		public weak Meta.ButtonFunction right_buttons[5];
-		[CCode (array_length = false)]
-		public weak bool right_buttons_has_spacer[5];
-#endif
 	}
 	[CCode (cheader_filename = "meta/boxes.h", has_type_id = false)]
 	public struct Edge {
@@ -1268,9 +1195,6 @@ namespace Meta {
 		MINIMIZE,
 		MAXIMIZE,
 		CLOSE,
-#if !HAS_MUTTER332
-		APPMENU,
-#endif
 		LAST
 	}
 	[CCode (cheader_filename = "meta/meta-close-dialog.h", cprefix = "META_CLOSE_DIALOG_RESPONSE_", type_id = "meta_close_dialog_response_get_type ()")]
@@ -1391,9 +1315,6 @@ namespace Meta {
 	public enum FrameFlags {
 		ALLOWS_DELETE,
 		ALLOWS_MENU,
-#if !HAS_MUTTER332
-		ALLOWS_APPMENU,
-#endif
 		ALLOWS_MINIMIZE,
 		ALLOWS_MAXIMIZE,
 		ALLOWS_VERTICAL_RESIZE,
@@ -1405,9 +1326,6 @@ namespace Meta {
 		ALLOWS_SHADE,
 		ALLOWS_MOVE,
 		FULLSCREEN,
-#if !HAS_MUTTER332
-		IS_FLASHING,
-#endif
 		ABOVE,
 		TILED_LEFT,
 		TILED_RIGHT
diff --git a/vapi/meson.build b/vapi/meson.build
index 4f38408b..fb9caae7 100644
--- a/vapi/meson.build
+++ b/vapi/meson.build
@@ -6,70 +6,6 @@ vapigen_args = [
 	'--vapidir=@0@'.format(meson.current_source_dir()),
 ]
 
-if mutter330_dep.found()
-	cogl_target = custom_target('mutter-cogl-3',
-		command: [
-			vapigen,
-			mutter_typelib_dir / 'Cogl-3.gir',
-			'--library=mutter-cogl-3',
-			'--pkg=gobject-2.0',
-			vapigen_args,
-			files('Cogl-3-custom.vala')
-		],
-		output: 'mutter-cogl-3.vapi'
-	)
-
-	cogl_pango_target = custom_target('mutter-cogl-pango-3',
-		command: [
-			vapigen,
-			mutter_typelib_dir / 'CoglPango-3.gir',
-			'--library=mutter-cogl-pango-3',
-			'--pkg=mutter-cogl-3',
-			'--pkg=pangocairo',
-			vapigen_args
-		],
-		depends: cogl_target,
-		output: 'mutter-cogl-pango-3.vapi'
-	)
-
-	clutter_target = custom_target('mutter-clutter-3',
-		command: [
-			vapigen,
-			mutter_typelib_dir / 'Clutter-3.gir',
-			'--library=mutter-clutter-3',
-			'--pkg=mutter-cogl-3',
-			'--pkg=mutter-cogl-pango-3',
-			'--pkg=atk',
-			'--pkg=gio-2.0',
-			'--pkg=json-glib-1.0',
-			'--pkg=pangocairo',
-			vapigen_args,
-			files('Clutter-3-custom.vala')
-		],
-		depends: [ cogl_target, cogl_pango_target ],
-		output: 'mutter-clutter-3.vapi'
-	)
-
-	libmutter_target = custom_target('libmutter-3',
-		command: [
-			vapigen,
-			mutter_typelib_dir / 'Meta-3.gir',
-			'--library=libmutter-3',
-			'--pkg=mutter-cogl-3',
-			'--pkg=mutter-cogl-pango-3',
-			'--pkg=mutter-clutter-3',
-			'--pkg=atk',
-			'--pkg=gio-2.0',
-			'--pkg=json-glib-1.0',
-			'--pkg=pangocairo',
-			'--pkg=gtk+-3.0',
-			'--pkg=x11',
-			vapigen_args
-		],
-		depends: [ cogl_target, cogl_pango_target, clutter_target ],
-		output: 'libmutter-3.vapi'
-	)
-endif
 if mutter332_dep.found()
 	cogl_target = custom_target('mutter-cogl-4',
 		command: [
diff --git a/vapi/mutter-clutter-3.deps b/vapi/mutter-clutter-3.deps
deleted file mode 100644
index 687b7637..00000000
--- a/vapi/mutter-clutter-3.deps
+++ /dev/null
@@ -1,5 +0,0 @@
-atk
-cairo
-pango
-json-glib-1.0
-mutter-cogl-3
diff --git a/vapi/mutter-clutter-3.vapi b/vapi/mutter-clutter-3.vapi
deleted file mode 120000
index e1b7159f..00000000
--- a/vapi/mutter-clutter-3.vapi
+++ /dev/null
@@ -1 +0,0 @@
-mutter-clutter.vapi
\ No newline at end of file
diff --git a/vapi/mutter-clutter-4.vapi b/vapi/mutter-clutter-4.vapi
index e02bf290..e1b7159f 120000
--- a/vapi/mutter-clutter-4.vapi
+++ b/vapi/mutter-clutter-4.vapi
@@ -1 +1 @@
-mutter-clutter-3.vapi
\ No newline at end of file
+mutter-clutter.vapi
\ No newline at end of file
diff --git a/vapi/mutter-cogl-3.deps b/vapi/mutter-cogl-3.deps
deleted file mode 100644
index 98ccac5b..00000000
--- a/vapi/mutter-cogl-3.deps
+++ /dev/null
@@ -1 +0,0 @@
-pango
diff --git a/vapi/mutter-cogl-3.vapi b/vapi/mutter-cogl-3.vapi
deleted file mode 120000
index 7e33c18b..00000000
--- a/vapi/mutter-cogl-3.vapi
+++ /dev/null
@@ -1 +0,0 @@
-mutter-cogl.vapi
\ No newline at end of file
diff --git a/vapi/mutter-cogl-4.deps b/vapi/mutter-cogl-4.deps
deleted file mode 120000
index 45d34164..00000000
--- a/vapi/mutter-cogl-4.deps
+++ /dev/null
@@ -1 +0,0 @@
-mutter-cogl-3.deps
\ No newline at end of file
diff --git a/vapi/mutter-cogl-4.deps b/vapi/mutter-cogl-4.deps
new file mode 100644
index 00000000..98ccac5b
--- /dev/null
+++ b/vapi/mutter-cogl-4.deps
@@ -0,0 +1 @@
+pango
diff --git a/vapi/mutter-cogl-4.vapi b/vapi/mutter-cogl-4.vapi
index 9bba5c49..7e33c18b 120000
--- a/vapi/mutter-cogl-4.vapi
+++ b/vapi/mutter-cogl-4.vapi
@@ -1 +1 @@
-mutter-cogl-3.vapi
\ No newline at end of file
+mutter-cogl.vapi
\ No newline at end of file
diff --git a/vapi/mutter-cogl-pango-3.vapi b/vapi/mutter-cogl-pango-3.vapi
deleted file mode 100644
index e69de29b..00000000
diff --git a/vapi/mutter-cogl-path-3.vapi b/vapi/mutter-cogl-path-3.vapi
deleted file mode 100644
index 2d9d14b5..00000000
--- a/vapi/mutter-cogl-path-3.vapi
+++ /dev/null
@@ -1,34 +0,0 @@
-[CCode (gir_namespace = "CoglPath", gir_version = "3")]
-namespace Cogl {
-	[CCode (cheader_filename = "cogl-path/cogl-path.h", copy_function = "cogl_path_copy", ref_function = "cogl_object_ref", unref_function = "cogl_object_unref", type_id = "cogl_path_get_gtype")]
-	[Compact]
-	public class Path {
-		public void arc (float center_x, float center_y, float radius_x, float radius_y, float angle_1, float angle_2);
-		public void close ();
-		public Cogl.Path copy ();
-		public void curve_to (float x_1, float y_1, float x_2, float y_2, float x_3, float y_3);
-		public void ellipse (float center_x, float center_y, float radius_x, float radius_y);
-		public void fill ();
-		public void fill_preserve ();
-		public Cogl.PathFillRule get_fill_rule ();
-		public void line (float x_1, float y_1, float x_2, float y_2);
-		public void line_to (float x, float y);
-		public void move_to (float x, float y);
-		public Path ();
-		public void polygon ([CCode (array_length = false)] float[] coords, int num_points);
-		public void polyline ([CCode (array_length = false)] float[] coords, int num_points);
-		public void rectangle (float x_1, float y_1, float x_2, float y_2);
-		public void rel_curve_to (float x_1, float y_1, float x_2, float y_2, float x_3, float y_3);
-		public void rel_line_to (float x, float y);
-		public void rel_move_to (float x, float y);
-		public void round_rectangle (float x_1, float y_1, float x_2, float y_2, float radius, float arc_step);
-		public void set_fill_rule (Cogl.PathFillRule fill_rule);
-		public void stroke ();
-		public void stroke_preserve ();
-	}
-	[CCode (cheader_filename = "cogl-path/cogl-path.h", cprefix = "COGL_PATH_FILL_RULE_", has_type_id = false)]
-	public enum PathFillRule {
-		NON_ZERO,
-		EVEN_ODD
-	}
-}