diff --git a/vapi/gdesktopenums-3.0.vapi b/vapi/gdesktopenums-3.0.vapi
index d95363c9..3f9026c6 100644
--- a/vapi/gdesktopenums-3.0.vapi
+++ b/vapi/gdesktopenums-3.0.vapi
@@ -2,13 +2,13 @@
 
 [CCode (cprefix = "GDesktop", gir_namespace = "GDesktopEnums", gir_version = "3.0", lower_case_cprefix = "g_desktop_")]
 namespace GDesktop {
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_BACKGROUND_SHADING_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_BACKGROUND_SHADING_")]
 	public enum BackgroundShading {
 		SOLID,
 		VERTICAL,
 		HORIZONTAL
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_BACKGROUND_STYLE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_BACKGROUND_STYLE_")]
 	public enum BackgroundStyle {
 		NONE,
 		WALLPAPER,
@@ -18,30 +18,30 @@ namespace GDesktop {
 		ZOOM,
 		SPANNED
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_CLOCK_FORMAT_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_CLOCK_FORMAT_")]
 	public enum ClockFormat {
 		@24H,
 		@12H
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_FOCUS_MODE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_FOCUS_MODE_")]
 	public enum FocusMode {
 		CLICK,
 		SLOPPY,
 		MOUSE
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_FOCUS_NEW_WINDOWS_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_FOCUS_NEW_WINDOWS_")]
 	public enum FocusNewWindows {
 		SMART,
 		STRICT
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_MAGNIFIER_MOUSE_TRACKING_MODE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_MAGNIFIER_MOUSE_TRACKING_MODE_")]
 	public enum MagnifierMouseTrackingMode {
 		NONE,
 		CENTERED,
 		PROPORTIONAL,
 		PUSH
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_MAGNIFIER_SCREEN_POSITION_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_MAGNIFIER_SCREEN_POSITION_")]
 	public enum MagnifierScreenPosition {
 		NONE,
 		FULL_SCREEN,
@@ -50,31 +50,31 @@ namespace GDesktop {
 		LEFT_HALF,
 		RIGHT_HALF
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_MOUSE_DWELL_DIRECTION_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_MOUSE_DWELL_DIRECTION_")]
 	public enum MouseDwellDirection {
 		LEFT,
 		RIGHT,
 		UP,
 		DOWN
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_MOUSE_DWELL_MODE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_MOUSE_DWELL_MODE_")]
 	public enum MouseDwellMode {
 		WINDOW,
 		GESTURE
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_PROXY_MODE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_PROXY_MODE_")]
 	public enum ProxyMode {
 		NONE,
 		MANUAL,
 		AUTO
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_SCREENSAVER_MODE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_SCREENSAVER_MODE_")]
 	public enum ScreensaverMode {
 		BLANK_ONLY,
 		RANDOM,
 		SINGLE
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_TITLEBAR_ACTION_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_TITLEBAR_ACTION_")]
 	public enum TitlebarAction {
 		TOGGLE_SHADE,
 		TOGGLE_MAXIMIZE,
@@ -85,19 +85,19 @@ namespace GDesktop {
 		LOWER,
 		MENU
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_TOOLBAR_ICON_SIZE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_TOOLBAR_ICON_SIZE_")]
 	public enum ToolbarIconSize {
 		SMALL,
 		LARGE
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_TOOLBAR_STYLE_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_TOOLBAR_STYLE_")]
 	public enum ToolbarStyle {
 		BOTH,
 		BOTH_HORIZ,
 		ICONS,
 		TEXT
 	}
-	[CCode (cheader_filename = "GDesktopEnums-3.0.h", cprefix = "G_DESKTOP_VISUAL_BELL_")]
+	[CCode (cheader_filename = "gsettings-desktop-schemas/gdesktop-enums.h", cprefix = "G_DESKTOP_VISUAL_BELL_")]
 	public enum VisualBellType {
 		FULLSCREEN_FLASH,
 		FRAME_FLASH
diff --git a/vapi/libmutter.vapi b/vapi/libmutter.vapi
index adcb3bee..1d060840 100644
--- a/vapi/libmutter.vapi
+++ b/vapi/libmutter.vapi
@@ -285,9 +285,9 @@ namespace Meta {
 		public uint get_mask ();
 		public Meta.VirtualModifier get_modifiers ();
 		public unowned string get_name ();
-		[CCode (cheader_filename = "meta/main.h", cname = "meta_keybindings_set_custom_handler")]
+		[CCode (cheader_filename = "meta/keybindings.h", cname = "meta_keybindings_set_custom_handler")]
 		public static bool set_custom_handler (string name, owned Meta.KeyHandlerFunc handler);
-		[CCode (cheader_filename = "meta/main.h", cname = "meta_keybindings_switch_window")]
+		[CCode (cheader_filename = "meta/keybindings.h", cname = "meta_keybindings_switch_window")]
 		public static void switch_window (Meta.Display display, Meta.Screen screen, Meta.Window event_window, X.Event event, Meta.KeyBinding binding);
 	}
 	[CCode (cheader_filename = "meta/main.h")]
@@ -1091,13 +1091,13 @@ namespace Meta {
 		DND,
 		OVERRIDE_OTHER
 	}
-	[CCode (cheader_filename = "meta/main.h", instance_pos = 5.9)]
+	[CCode (cheader_filename = "meta/prefs.h", instance_pos = 5.9)]
 	public delegate void KeyHandlerFunc (Meta.Display display, Meta.Screen screen, Meta.Window? window, void* event, Meta.KeyBinding binding);
-	[CCode (cheader_filename = "meta/main.h", has_target = false)]
+	[CCode (cheader_filename = "meta/prefs.h", has_target = false)]
 	public delegate void PrefsChangedFunc (Meta.Preference pref, void* data);
-	[CCode (cheader_filename = "meta/main.h", has_target = false)]
+	[CCode (cheader_filename = "meta/window.h", has_target = false)]
 	public delegate bool WindowForeachFunc (Meta.Window window, void* data);
-	[CCode (cheader_filename = "meta/main.h", has_target = false)]
+	[CCode (cheader_filename = "meta/common.h", has_target = false)]
 	public delegate void WindowMenuFunc (Meta.WindowMenu menu, X.Display xdisplay, X.Window client_xwindow, uint32 timestamp, Meta.MenuOp op, int workspace, void* data);
 	[CCode (cheader_filename = "meta/main.h", cname = "META_DEFAULT_ICON_NAME")]
 	public const string DEFAULT_ICON_NAME;
diff --git a/vapi/xfixes-4.0.vapi b/vapi/xfixes-4.0.vapi
index 36263b8e..a58afdca 100644
--- a/vapi/xfixes-4.0.vapi
+++ b/vapi/xfixes-4.0.vapi
@@ -2,7 +2,7 @@
 
 [CCode (cprefix = "X", gir_namespace = "xfixes", gir_version = "4.0", lower_case_cprefix = "X_")]
 namespace X {
-	[CCode (cheader_filename = "xfixes-4.0.h", cname = "XserverRegion", has_type_id = false)]
+	[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XserverRegion", has_type_id = false)]
 	public struct XserverRegion {
 	}
 }