vapi: Update GIR-based bindings

9 files changed, 102 insertions, 196 deletions

diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 412dc6e15..fcb44e5c5 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -135,11 +135,11 @@ namespace Atk {
 		[NoAccessorMethod]
 		[Version (deprecated = true)]
 		public double accessible_value { get; set; }
-		public virtual signal void active_descendant_changed (void* child);
-		public virtual signal void children_changed (uint change_index, void* changed_child);
+		public virtual signal void active_descendant_changed (Atk.Object child);
+		public virtual signal void children_changed (uint change_index, Atk.Object changed_child);
 		[Version (deprecated = true, deprecated_since = "2.9.4")]
 		public virtual signal void focus_event (bool focus_in);
-		public virtual signal void property_change (void* values);
+		public virtual signal void property_change (Atk.PropertyValues values);
 		public virtual signal void state_change (string name, bool state_set);
 		public virtual signal void visible_data_changed ();
 	}
@@ -389,9 +389,9 @@ namespace Atk {
 		public abstract void get_image_size (out int width, out int height);
 		public abstract bool set_image_description (string description);
 	}
-	[CCode (cheader_filename = "atk/atk.h")]
+	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_implementor_get_type ()")]
 	public interface Implementor : GLib.Object {
-		public abstract unowned Atk.Object ref_accessible ();
+		public abstract Atk.Object ref_accessible ();
 	}
 	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_selection_get_type ()")]
 	public interface Selection : GLib.Object {
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 2cc8caf47..cb8f9c32a 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -5152,6 +5152,8 @@ namespace Clutter {
 		[NoAccessorMethod]
 		[Version (since = "1.10")]
 		public bool background_color_set { get; }
+		[Version (since = "1.12")]
+		public Clutter.Matrix child_transform { get; set; }
 		[NoAccessorMethod]
 		[Version (since = "1.12")]
 		public bool child_transform_set { get; }
@@ -5304,6 +5306,8 @@ namespace Clutter {
 		public Clutter.Size size { owned get; set; }
 		[Version (since = "1.0")]
 		public Clutter.TextDirection text_direction { get; set; }
+		[Version (since = "1.12")]
+		public Clutter.Matrix transform { get; set; }
 		[NoAccessorMethod]
 		[Version (since = "1.12")]
 		public bool transform_set { get; }
@@ -8311,18 +8315,13 @@ namespace Clutter {
 		public bool equal (Clutter.Knot knot_b);
 		public void free ();
 	}
-	[CCode (cheader_filename = "clutter/clutter.h", type_id = "COGL_TYPE_MATRIX")]
+	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_matrix_get_type ()")]
+	[Version (since = "1.12")]
 	public struct Matrix : Cogl.Matrix {
-		[Version (since = "1.12")]
 		public static Clutter.Matrix? alloc ();
-		[Version (since = "1.12")]
 		public void free ();
-		public static GLib.Type get_type ();
-		[Version (since = "1.12")]
 		public unowned Clutter.Matrix? init_from_array ([CCode (array_length = false)] float values[16]);
-		[Version (since = "1.12")]
 		public unowned Clutter.Matrix? init_from_matrix (Clutter.Matrix b);
-		[Version (since = "1.12")]
 		public unowned Clutter.Matrix? init_identity ();
 	}
 	[CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_path_node_get_type ()")]
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index 6e8262ed2..b5182b946 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -191,8 +191,9 @@ namespace Soup {
 		protected AuthDomain ();
 		[NoWrapper]
 		public virtual string accepts (Soup.Message msg, string header);
+		[CCode (cname = "soup_auth_domain_accepts")]
+		public string? accepts_authorization (Soup.Message msg);
 		public void add_path (string path);
-		[CCode (vfunc_name = "challenge")]
 		public virtual string challenge (Soup.Message msg);
 		public virtual bool check_password (Soup.Message msg, string username, string password);
 		public bool covers (Soup.Message msg);
@@ -202,11 +203,11 @@ namespace Soup {
 		public void set_generic_auth_callback (owned Soup.AuthDomainGenericAuthCallback auth_callback);
 		public bool try_generic_auth_callback (Soup.Message msg, string username);
 		[NoAccessorMethod]
-		public void* filter { get; set; }
+		public Soup.AuthDomainFilter filter { owned get; set; }
 		[NoAccessorMethod]
 		public void* filter_data { get; set; }
 		[NoAccessorMethod]
-		public void* generic_auth_callback { get; set; }
+		public Soup.AuthDomainGenericAuthCallback generic_auth_callback { owned get; set; }
 		[NoAccessorMethod]
 		public void* generic_auth_data { get; set; }
 		[NoAccessorMethod]
@@ -217,9 +218,9 @@ namespace Soup {
 	public class AuthDomainBasic : Soup.AuthDomain {
 		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
 		public AuthDomainBasic (string optname1, ...);
-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback);
+		public void set_auth_callback (owned Soup.AuthDomainBasicAuthCallback callback);
 		[NoAccessorMethod]
-		public void* auth_callback { get; set; }
+		public Soup.AuthDomainBasicAuthCallback auth_callback { owned get; set; }
 		[NoAccessorMethod]
 		public void* auth_data { get; set; }
 	}
@@ -228,9 +229,9 @@ namespace Soup {
 		[CCode (has_construct_function = false, type = "SoupAuthDomain*")]
 		public AuthDomainDigest (string optname1, ...);
 		public static string encode_password (string username, string realm, string password);
-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback);
+		public void set_auth_callback (owned Soup.AuthDomainDigestAuthCallback callback);
 		[NoAccessorMethod]
-		public void* auth_callback { get; set; }
+		public Soup.AuthDomainDigestAuthCallback auth_callback { owned get; set; }
 		[NoAccessorMethod]
 		public void* auth_data { get; set; }
 	}
@@ -1157,9 +1158,9 @@ namespace Soup {
 		public abstract void get_passwords_sync (Soup.Message msg, Soup.Auth auth, GLib.Cancellable? cancellable = null);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyResolverInterface", type_id = "soup_proxy_resolver_get_type ()")]
-	[Version (replacement = "Soup.ProxyURIResolver")]
+	[Version (deprecated = true, deprecated_since = "2.28", replacement = "ProxyURIResolver")]
 	public interface ProxyResolver : Soup.SessionFeature, GLib.Object {
-		public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, Soup.ProxyResolverCallback callback);
+		public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, [CCode (scope = "async")] Soup.ProxyResolverCallback callback);
 		public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable? cancellable, out unowned Soup.Address addr);
 	}
 	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyURIResolverInterface", type_id = "soup_proxy_uri_resolver_get_type ()")]
@@ -1270,6 +1271,73 @@ namespace Soup {
 		@1_0,
 		@1_1
 	}
+	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_KNOWN_STATUS_CODE_", type_id = "soup_known_status_code_get_type ()")]
+	[Version (deprecated = true, deprecated_since = "2.44", replacement = "Status")]
+	public enum KnownStatusCode {
+		NONE,
+		CANCELLED,
+		CANT_RESOLVE,
+		CANT_RESOLVE_PROXY,
+		CANT_CONNECT,
+		CANT_CONNECT_PROXY,
+		SSL_FAILED,
+		IO_ERROR,
+		MALFORMED,
+		TRY_AGAIN,
+		TOO_MANY_REDIRECTS,
+		TLS_FAILED,
+		CONTINUE,
+		SWITCHING_PROTOCOLS,
+		PROCESSING,
+		OK,
+		CREATED,
+		ACCEPTED,
+		NON_AUTHORITATIVE,
+		NO_CONTENT,
+		RESET_CONTENT,
+		PARTIAL_CONTENT,
+		MULTI_STATUS,
+		MULTIPLE_CHOICES,
+		MOVED_PERMANENTLY,
+		FOUND,
+		MOVED_TEMPORARILY,
+		SEE_OTHER,
+		NOT_MODIFIED,
+		USE_PROXY,
+		NOT_APPEARING_IN_THIS_PROTOCOL,
+		TEMPORARY_REDIRECT,
+		BAD_REQUEST,
+		UNAUTHORIZED,
+		PAYMENT_REQUIRED,
+		FORBIDDEN,
+		NOT_FOUND,
+		METHOD_NOT_ALLOWED,
+		NOT_ACCEPTABLE,
+		PROXY_AUTHENTICATION_REQUIRED,
+		PROXY_UNAUTHORIZED,
+		REQUEST_TIMEOUT,
+		CONFLICT,
+		GONE,
+		LENGTH_REQUIRED,
+		PRECONDITION_FAILED,
+		REQUEST_ENTITY_TOO_LARGE,
+		REQUEST_URI_TOO_LONG,
+		UNSUPPORTED_MEDIA_TYPE,
+		REQUESTED_RANGE_NOT_SATISFIABLE,
+		INVALID_RANGE,
+		EXPECTATION_FAILED,
+		UNPROCESSABLE_ENTITY,
+		LOCKED,
+		FAILED_DEPENDENCY,
+		INTERNAL_SERVER_ERROR,
+		NOT_IMPLEMENTED,
+		BAD_GATEWAY,
+		SERVICE_UNAVAILABLE,
+		GATEWAY_TIMEOUT,
+		HTTP_VERSION_NOT_SUPPORTED,
+		INSUFFICIENT_STORAGE,
+		NOT_EXTENDED
+	}
 	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_LOGGER_LOG_", type_id = "soup_logger_log_level_get_type ()")]
 	public enum LoggerLogLevel {
 		NONE,
@@ -1455,14 +1523,6 @@ namespace Soup {
 		UNSUPPORTED_URI_SCHEME;
 		public static GLib.Quark quark ();
 	}
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public errordomain SSLError {
-		HANDSHAKE_NEEDS_READ,
-		HANDSHAKE_NEEDS_WRITE,
-		CERTIFICATE,
-		HANDSHAKE_FAILED;
-		public static GLib.Quark quark ();
-	}
 	[CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TLD_ERROR_")]
 	[Version (since = "2.40")]
 	public errordomain TLDError {
@@ -1476,9 +1536,9 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
 	public delegate void AddressCallback (Soup.Address addr, uint status);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 4.9)]
-	public delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username, string password);
+	public delegate bool AuthDomainBasicAuthCallback (Soup.AuthDomainBasic domain, Soup.Message msg, string username, string password);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 3.9)]
-	public delegate string? AuthDomainDigestAuthCallback (Soup.AuthDomain domain, Soup.Message msg, string username);
+	public delegate string? AuthDomainDigestAuthCallback (Soup.AuthDomainDigest domain, Soup.Message msg, string username);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 2.9)]
 	public delegate bool AuthDomainFilter (Soup.AuthDomain domain, Soup.Message msg);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 3.9)]
@@ -1494,8 +1554,9 @@ namespace Soup {
 	public delegate void MessageHeadersForeachFunc (string name, string value);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 4.9)]
 	public delegate void PasswordManagerCallback (Soup.PasswordManager password_manager, Soup.Message msg, Soup.Auth auth, bool retrying);
-	[CCode (cheader_filename = "libsoup/soup.h")]
-	public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4);
+	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 4.9)]
+	[Version (deprecated = true, deprecated_since = "2.28")]
+	public delegate void ProxyResolverCallback (Soup.ProxyResolver proxy_resolver, Soup.Message msg, uint arg, Soup.Address addr);
 	[CCode (cheader_filename = "libsoup/soup.h", has_target = false)]
 	public delegate void ProxyURIResolverCallback (Soup.ProxyURIResolver resolver, uint status, Soup.URI proxy_uri);
 	[CCode (cheader_filename = "libsoup/soup.h", instance_pos = 5.9)]
@@ -1529,14 +1590,10 @@ namespace Soup {
 	public const string AUTH_DOMAIN_BASIC_AUTH_CALLBACK;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA")]
 	public const string AUTH_DOMAIN_BASIC_AUTH_DATA;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_BASIC_H")]
-	public const int AUTH_DOMAIN_BASIC_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK")]
 	public const string AUTH_DOMAIN_DIGEST_AUTH_CALLBACK;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA")]
 	public const string AUTH_DOMAIN_DIGEST_AUTH_DATA;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_DIGEST_H")]
-	public const int AUTH_DOMAIN_DIGEST_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_FILTER")]
 	public const string AUTH_DOMAIN_FILTER;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_FILTER_DATA")]
@@ -1545,30 +1602,22 @@ namespace Soup {
 	public const string AUTH_DOMAIN_GENERIC_AUTH_CALLBACK;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_GENERIC_AUTH_DATA")]
 	public const string AUTH_DOMAIN_GENERIC_AUTH_DATA;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_H")]
-	public const int AUTH_DOMAIN_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_PROXY")]
 	public const string AUTH_DOMAIN_PROXY;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_REALM")]
 	public const string AUTH_DOMAIN_REALM;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_DOMAIN_REMOVE_PATH")]
 	public const string AUTH_DOMAIN_REMOVE_PATH;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_H")]
-	public const int AUTH_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_HOST")]
 	public const string AUTH_HOST;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_IS_AUTHENTICATED")]
 	public const string AUTH_IS_AUTHENTICATED;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_IS_FOR_PROXY")]
 	public const string AUTH_IS_FOR_PROXY;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_MANAGER_H")]
-	public const int AUTH_MANAGER_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_REALM")]
 	public const string AUTH_REALM;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_AUTH_SCHEME_NAME")]
 	public const string AUTH_SCHEME_NAME;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CACHE_H")]
-	public const int CACHE_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_HTTP_CTL")]
 	public const int CHAR_HTTP_CTL;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_HTTP_SEPARATOR")]
@@ -1579,27 +1628,15 @@ namespace Soup {
 	public const int CHAR_URI_PERCENT_ENCODED;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CHAR_URI_SUB_DELIMS")]
 	public const int CHAR_URI_SUB_DELIMS;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CONTENT_DECODER_H")]
-	public const int CONTENT_DECODER_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_CONTENT_SNIFFER_H")]
-	public const int CONTENT_SNIFFER_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_H")]
-	public const int COOKIE_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_ACCEPT_POLICY")]
 	[Version (since = "2.30")]
 	public const string COOKIE_JAR_ACCEPT_POLICY;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_DB_FILENAME")]
 	public const string COOKIE_JAR_DB_FILENAME;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_DB_H")]
-	public const int COOKIE_JAR_DB_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_H")]
-	public const int COOKIE_JAR_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_READ_ONLY")]
 	public const string COOKIE_JAR_READ_ONLY;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_TEXT_FILENAME")]
 	public const string COOKIE_JAR_TEXT_FILENAME;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_JAR_TEXT_H")]
-	public const int COOKIE_JAR_TEXT_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_DAY")]
 	[Version (since = "2.24")]
 	public const int COOKIE_MAX_AGE_ONE_DAY;
@@ -1612,20 +1649,12 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_COOKIE_MAX_AGE_ONE_YEAR")]
 	[Version (since = "2.24")]
 	public const int COOKIE_MAX_AGE_ONE_YEAR;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_DATE_H")]
-	public const int DATE_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_H")]
-	public const int FORM_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_MIME_TYPE_MULTIPART")]
 	[Version (since = "2.26")]
 	public const string FORM_MIME_TYPE_MULTIPART;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_FORM_MIME_TYPE_URLENCODED")]
 	[Version (since = "2.26")]
 	public const string FORM_MIME_TYPE_URLENCODED;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_HEADERS_H")]
-	public const int HEADERS_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_LOGGER_H")]
-	public const int LOGGER_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_LOGGER_LEVEL")]
 	[Version (since = "2.56")]
 	public const string LOGGER_LEVEL;
@@ -1635,17 +1664,11 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MAJOR_VERSION")]
 	[Version (since = "2.42")]
 	public const int MAJOR_VERSION;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_BODY_H")]
-	public const int MESSAGE_BODY_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_FIRST_PARTY")]
 	[Version (since = "2.30")]
 	public const string MESSAGE_FIRST_PARTY;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_FLAGS")]
 	public const string MESSAGE_FLAGS;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_H")]
-	public const int MESSAGE_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_HEADERS_H")]
-	public const int MESSAGE_HEADERS_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_HTTP_VERSION")]
 	public const string MESSAGE_HTTP_VERSION;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_METHOD")]
@@ -1681,36 +1704,12 @@ namespace Soup {
 	public const string MESSAGE_TLS_ERRORS;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MESSAGE_URI")]
 	public const string MESSAGE_URI;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_METHOD_H")]
-	public const int METHOD_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MICRO_VERSION")]
 	[Version (since = "2.42")]
 	public const int MICRO_VERSION;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MINOR_VERSION")]
 	[Version (since = "2.42")]
 	public const int MINOR_VERSION;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MISC_H")]
-	public const int MISC_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MULTIPART_H")]
-	public const int MULTIPART_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_MULTIPART_INPUT_STREAM_H")]
-	public const int MULTIPART_INPUT_STREAM_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PASSWORD_MANAGER_H")]
-	public const int PASSWORD_MANAGER_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PROXY_RESOLVER_DEFAULT_H")]
-	public const int PROXY_RESOLVER_DEFAULT_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_PROXY_URI_RESOLVER_H")]
-	public const int PROXY_URI_RESOLVER_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUESTER_H")]
-	public const int REQUESTER_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_DATA_H")]
-	public const int REQUEST_DATA_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_FILE_H")]
-	public const int REQUEST_FILE_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_H")]
-	public const int REQUEST_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_HTTP_H")]
-	public const int REQUEST_HTTP_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_REQUEST_SESSION")]
 	[Version (since = "2.42")]
 	public const string REQUEST_SESSION;
@@ -1720,8 +1719,6 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_ASYNC_CONTEXT")]
 	[Version (deprecated = true)]
 	public const string SERVER_ASYNC_CONTEXT;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_H")]
-	public const int SERVER_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SERVER_HTTPS_ALIASES")]
 	[Version (since = "2.44")]
 	public const string SERVER_HTTPS_ALIASES;
@@ -1755,12 +1752,6 @@ namespace Soup {
 	public const string SESSION_ACCEPT_LANGUAGE_AUTO;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ASYNC_CONTEXT")]
 	public const string SESSION_ASYNC_CONTEXT;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_ASYNC_H")]
-	public const int SESSION_ASYNC_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_FEATURE_H")]
-	public const int SESSION_FEATURE_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_H")]
-	public const int SESSION_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_HTTPS_ALIASES")]
 	[Version (since = "2.38")]
 	public const string SESSION_HTTPS_ALIASES;
@@ -1789,8 +1780,6 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE")]
 	[Version (since = "2.38")]
 	public const string SESSION_SSL_USE_SYSTEM_CA_FILE;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_SYNC_H")]
-	public const int SESSION_SYNC_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_TIMEOUT")]
 	public const string SESSION_TIMEOUT;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SESSION_TLS_DATABASE")]
@@ -1810,8 +1799,6 @@ namespace Soup {
 	public const string SOCKET_ASYNC_CONTEXT;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_FLAG_NONBLOCKING")]
 	public const string SOCKET_FLAG_NONBLOCKING;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_H")]
-	public const int SOCKET_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_IS_SERVER")]
 	public const string SOCKET_IS_SERVER;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_LOCAL_ADDRESS")]
@@ -1837,21 +1824,9 @@ namespace Soup {
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_SOCKET_USE_THREAD_CONTEXT")]
 	[Version (since = "2.38")]
 	public const string SOCKET_USE_THREAD_CONTEXT;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_STATUS_H")]
-	public const int STATUS_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_TYPES_H")]
-	public const int TYPES_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_URI_H")]
-	public const int URI_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_VALUE_UTILS_H")]
-	public const int VALUE_UTILS_H;
 	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_VERSION_MIN_REQUIRED")]
 	[Version (since = "2.42")]
 	public const int VERSION_MIN_REQUIRED;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_XMLRPC_H")]
-	public const int XMLRPC_H;
-	[CCode (cheader_filename = "libsoup/soup.h", cname = "SOUP_XMLRPC_OLD_H")]
-	public const int XMLRPC_OLD_H;
 	[CCode (cheader_filename = "libsoup/soup.h")]
 	[Version (since = "2.24")]
 	public static unowned GLib.TimeoutSource add_completion (GLib.MainContext? async_context, GLib.SourceFunc function);
diff --git a/vapi/metadata/Atk-1.0-custom.vala b/vapi/metadata/Atk-1.0-custom.vala
index e07985c79..f82bc919e 100644
--- a/vapi/metadata/Atk-1.0-custom.vala
+++ b/vapi/metadata/Atk-1.0-custom.vala
@@ -2,9 +2,6 @@ namespace Atk {
 	[Compact]
 	public class AttributeSet : GLib.SList<Atk.Attribute?> {
 	}
-	public interface Implementor : GLib.Object {
-		public abstract unowned Atk.Object ref_accessible ();
-	}
 	public class Registry : GLib.Object {
 		[Version (deprecated = true)]
 		public weak GLib.HashTable<GLib.Type,Atk.ObjectFactory> factory_singleton_cache;
diff --git a/vapi/metadata/Atk-1.0.metadata b/vapi/metadata/Atk-1.0.metadata
index 262853ce7..b3c34c242 100644
--- a/vapi/metadata/Atk-1.0.metadata
+++ b/vapi/metadata/Atk-1.0.metadata
@@ -6,13 +6,6 @@ attribute_set_free skip
 KeyEventStruct.string name="str"
 Rectangle struct
 
-Document
-	.get_attribute_value vfunc_name="get_document_attribute_value"
-	.get_attributes vfunc_name="get_document_attributes"
-	.get_document_locale skip
-	.get_locale vfunc_name="get_document_locale"
-	.set_attribute_value vfunc_name="set_document_attribute"
-
 // Move static methods into classes (mostly Util)
 add_focus_tracker parent="Atk.Util"
 add_global_event_listener parent="Atk.Util"
@@ -55,6 +48,3 @@ Component.add_focus_handler skip=false
 // Ownership of fields
 TextRange.content unowned=false
 Attribute.* unowned=false
-
-// Should be fixed upstream
-Implementor* skip // g-ir-scanner doesn't realize this is an interface
diff --git a/vapi/metadata/Clutter-1.0-custom.vala b/vapi/metadata/Clutter-1.0-custom.vala
index 2b5dec290..9b965bf2f 100644
--- a/vapi/metadata/Clutter-1.0-custom.vala
+++ b/vapi/metadata/Clutter-1.0-custom.vala
@@ -5,6 +5,9 @@ namespace Clutter {
 		public ActorBox.from_vertices (Clutter.Vertex[] verts);
 	}
 
+	public struct Matrix : Cogl.Matrix {
+	}
+
 	public class Backend : GLib.Object {
 		[NoWrapper]
 		public virtual void add_options (GLib.OptionGroup group);
diff --git a/vapi/metadata/Clutter-1.0.metadata b/vapi/metadata/Clutter-1.0.metadata
index 264a44a1a..8c5b5a553 100644
--- a/vapi/metadata/Clutter-1.0.metadata
+++ b/vapi/metadata/Clutter-1.0.metadata
@@ -4,6 +4,7 @@ Color struct
 Fog struct
 Geometry struct
 Knot struct
+Matrix struct
 PathNode struct
 Perspective struct
 Units struct
diff --git a/vapi/metadata/Soup-2.4-custom.vala b/vapi/metadata/Soup-2.4-custom.vala
index 4a183df1d..ed10f5249 100644
--- a/vapi/metadata/Soup-2.4-custom.vala
+++ b/vapi/metadata/Soup-2.4-custom.vala
@@ -1,42 +1,8 @@
 namespace Soup {
-	[CCode (type_id = "soup_auth_domain_basic_get_type ()", cheader_filename = "libsoup/soup.h")]
-	public class AuthDomainBasic : Soup.AuthDomain {
-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainBasicAuthCallback callback);
-	}
-
-	[CCode (type_id = "soup_auth_domain_digest_get_type ()", cheader_filename = "libsoup/soup.h")]
-	public class AuthDomainDigest : Soup.AuthDomain {
-		public static void set_auth_callback (Soup.AuthDomain domain, owned Soup.AuthDomainDigestAuthCallback callback);
-	}
-
 	[Compact]
 	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_buffer_get_type ()", cheader_filename = "libsoup/soup.h")]
 	public class Buffer {
 		[CCode (has_construct_function = false)]
 		public Buffer.subbuffer (Soup.Buffer parent, size_t offset, size_t length);
 	}
-
-	[Version (replacement = "Soup.ProxyURIResolver")]
-	[CCode (cheader_filename = "libsoup/soup.h", type_cname = "SoupProxyResolverInterface", type_id = "soup_proxy_resolver_get_type ()")]
-	public interface ProxyResolver : Soup.SessionFeature, GLib.Object {
-		public abstract void get_proxy_async (Soup.Message msg, GLib.MainContext async_context, GLib.Cancellable? cancellable, Soup.ProxyResolverCallback callback);
-		public abstract uint get_proxy_sync (Soup.Message msg, GLib.Cancellable? cancellable, out unowned Soup.Address addr);
-	}
-
-	public errordomain SSLError {
-		HANDSHAKE_NEEDS_READ,
-		HANDSHAKE_NEEDS_WRITE,
-		CERTIFICATE,
-		HANDSHAKE_FAILED;
-		public static GLib.Quark quark ();
-	}
-
-	[Compact]
-	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "soup_uri_get_type ()", cheader_filename = "libsoup/soup.h")]
-	public class URI {
-		[CCode (has_construct_function = false)]
-		public URI.with_base (Soup.URI @base, string uri_string);
-	}
-
-	public delegate void ProxyResolverCallback (Soup.ProxyResolver p1, Soup.Message p2, uint p3, Soup.Address p4);
 }
diff --git a/vapi/metadata/Soup-2.4.metadata b/vapi/metadata/Soup-2.4.metadata
index 8ffb65995..c0056ec82 100644
--- a/vapi/metadata/Soup-2.4.metadata
+++ b/vapi/metadata/Soup-2.4.metadata
@@ -12,39 +12,25 @@ xmlrpc_set_response.type skip
 HTTPVersion.http_* name="http_(.+)"
 
 // Backwards compatibility
-KnownStatusCode skip
 Requester deprecated_since="2.42" replacement="Session"
-Requester
-  .request* skip=false unowned=false
+KnownStatusCode deprecated_since="2.44" replacement="Status"
+ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
 
 // Report upstream
-Soup cheader_filename="libsoup/soup.h"
 add_* skip=false type="unowned GLib.TimeoutSource"
 AuthDomain
-	.accepts#method skip
-	.challenge#virtual_method vfunc_name="challenge"
-	.basic_set_auth_callback skip
-	.digest_set_auth_callback skip
+	.accepts#method name="accepts_authorization"
 AuthDomainBasic.new skip=false
 AuthDomainDigest.new skip=false
-Buffer.new.data type="uint8[]" array_length_idx=2
-Buffer.new_with_owner.data type="uint8[]" array_length_idx=1
 Buffer.new_subbuffer skip
-Buffer.new_with_owner.owner_dnotify nullable
-CookieJar.all_cookies type_arguments="Cookie"
-ContentSniffer.sniff.params type_arguments="string,string" nullable out unowned=false
+ContentSniffer.sniff.params nullable
 form_* skip=false
-header_parse_list type_arguments="string"
-header_parse_quality_list type_arguments="string"
-	.unacceptable out type_arguments="string"
 Message
 	.add_header_handler skip=false
 	.add_status_code_handler skip=false
 	.request_*#property skip
 	.response_*#property skip
 	.set_request.req_body type="uint8[]" array_length_idx=3
-MessageHeaders
-	.get_ranges.ranges out type="Soup.Range[]" array_length_idx=2
 Server
 	.new skip=false
 	.async_context type="GLib.MainContext"
@@ -56,14 +42,8 @@ Session*.new_with_options skip=false
 Socket
 	.async_context type="GLib.MainContext"
 	.new skip=false
-	.read.buffer type="uint8[]" array_length_idx=1
-	.read_until.buffer type="uint8[]" array_length_idx=1
-	.read_until.nread out
-	.write.buffer type="uint8[]" array_length_idx=1
 URI
-	.new_with_base skip
 	.set_query_from_fields skip=false
-uri_encode.escape_extra nullable
 // uri_host_*.* type="Soup.URI"
 ProxyURIResolverCallback.user_data skip
 xmlrpc_* skip=false
@@ -72,11 +52,6 @@ xmlrpc_extract_method_response throws="Soup.XMLRPC.Fault"
 	.error skip
 	.type skip
 value_* skip=false
-ProxyURIResolver
-  .get_proxy_uri_async skip=false
-  .get_proxy_uri_async.callback owned scope="async"
-  .get_proxy_uri_async.async_context nullable
-  .get_proxy_uri_sync.proxy_uri out unowned=false
 
 // Not enough GIR information
 Buffer.data type="uint8[]" array_length_field="length"
@@ -96,4 +71,4 @@ xmlrpc_build_fault printf_format
 Buffer
   .new deprecated_since="2.32" replacement="Buffer.take"
 MessageBody
-  .append deprecated_since="2.32" replacement="MessageBody.append_take"
\ No newline at end of file
+  .append deprecated_since="2.32" replacement="MessageBody.append_take"