[vala/nm-bindings] bindings: Add NetworkManager bindings for libnm-utils and libnm-glib



commit 0964c1971a4842e163f21e34b83b449ff91a01c4
Author: Alberto Ruiz <alberto ruiz canonical com>
Date:   Mon Jun 4 15:56:32 2012 +0100

    bindings: Add NetworkManager bindings for libnm-utils and libnm-glib
    
    Adds NetworkManager and NMClient bindings
    
    Fixed cheader_filename for a couple of constants
    
    Add missing constants
    
    Added metadata for appropriate headers instead of NMClient-1.0.h
    
    Fixed cheader_filename metadata attributes for NMClient-

 vapi/Makefile.am                                   |   19 +-
 vapi/dbus-glib-1.vapi                              |    2 +-
 vapi/libnm-glib.deps                               |    2 +
 vapi/{nmclient-1.0.vapi => libnm-glib.vapi}        |  408 +++++-----
 vapi/libnm-utils.deps                              |    2 +
 vapi/{networkmanager-1.0.vapi => libnm-utils.vapi} |  858 ++++++++++----------
 vapi/metadata/NMClient-1.0.metadata                |  193 +++++-
 vapi/metadata/NetworkManager-1.0.metadata          |  442 ++++++++++
 vapi/networkmanager-1.0.deps                       |    1 -
 vapi/nmclient-1.0.deps                             |    2 -
 10 files changed, 1282 insertions(+), 647 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 68d67fb..c4acb11 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -190,9 +190,10 @@ dist_vapi_DATA = \
 	lua.vapi \
 	mx-1.0.deps \
 	mx-1.0.vapi \
-	networkmanager-1.0.vapi \
-	nmclient-1.0.deps \
-	nmclient-1.0.vapi \
+	libnm-utils.deps \
+	libnm-utils.vapi \
+	libnm-glib.deps \
+	libnm-glib.vapi \
 	mysql.vapi \
 	orc-0.4.vapi \
 	pango.deps \
@@ -336,8 +337,8 @@ GIR_BINDINGS = \
 	libsoup-2.4 \
 	libwnck-3.0 \
 	mx-1.0 \
-	networkmanager-1.0 \
-	nmclient-1.0 \
+	libnm-utils \
+	libnm-glib \
 	packagekit-glib2 \
 	pangocairo \
 	poppler-glib \
@@ -576,11 +577,11 @@ loudmouth-1.0:
 
 mx-1.0:
 	$(GENVAPI) --library $(srcdir)/mx-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/Mx-1.0-custom.vala $(GIRDIR)/Mx-1.0.gir
-networkmanager-1.0:
-	$(GENVAPI) --library $(srcdir)/networkmanager-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/NetworkManager-1.0.gir
+libnm-utils:
+	$(GENVAPI) --library $(srcdir)/libnm-utils --metadatadir $(METADATADIR) $(GIRDIR)/NetworkManager-1.0.gir
 
-nmclient-1.0:
-	$(GENVAPI) --library $(srcdir)/nmclient-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/NMClient-1.0.gir
+libnm-glib:
+	$(GENVAPI) --library $(srcdir)/libnm-glib --metadatadir $(METADATADIR) $(GIRDIR)/NMClient-1.0.gir
 
 packagekit-glib2:
 	$(GENVAPI) --library $(srcdir)/packagekit-glib2 --metadatadir $(METADATADIR) --pkg gio-2.0 $(GIRDIR)/PackageKitGlib-1.0.gir
diff --git a/vapi/dbus-glib-1.vapi b/vapi/dbus-glib-1.vapi
index 5502fe2..4ddf77a 100644
--- a/vapi/dbus-glib-1.vapi
+++ b/vapi/dbus-glib-1.vapi
@@ -21,7 +21,7 @@
  *  Michael 'Mickey' Lauer <mlauer vanille-media de>
  */
 
-[CCode (cheader_filename = "dbus/dbus-glib-lowlevel.h,dbus/dbus-glib.h")]
+[CCode (cheader_filename = "dbus/dbus-glib-lowlevel.h,dbus/dbus-glib.h", gir_namespace = "DBusGLib")]
 namespace DBus {
 	public const string SERVICE_DBUS;
 	public const string PATH_DBUS;
diff --git a/vapi/libnm-glib.deps b/vapi/libnm-glib.deps
new file mode 100644
index 0000000..4bd331e
--- /dev/null
+++ b/vapi/libnm-glib.deps
@@ -0,0 +1,2 @@
+libnm-utils
+gio-2.0
diff --git a/vapi/nmclient-1.0.vapi b/vapi/libnm-glib.vapi
similarity index 69%
rename from vapi/nmclient-1.0.vapi
rename to vapi/libnm-glib.vapi
index 8340084..0d69ea2 100644
--- a/vapi/nmclient-1.0.vapi
+++ b/vapi/libnm-glib.vapi
@@ -1,11 +1,11 @@
-/* nmclient-1.0.vapi generated by lt-vapigen, do not modify. */
+/* libnm-glib.vapi generated by lt-vapigen, do not modify. */
 
 [CCode (cprefix = "NM", gir_namespace = "NMClient", gir_version = "1.0", lower_case_cprefix = "nm__")]
 namespace NM {
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_access_point_get_type ()")]
+	[CCode (cheader_filename = "nm-access-point.h", type_id = "nm_access_point_get_type ()")]
 	public class AccessPoint : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_access_point_new", has_construct_function = false, type = "GObject*")]
-		public AccessPoint (DBusGLib.Connection connection, string path);
+		public AccessPoint (DBus.Connection connection, string path);
 		[CCode (cname = "nm_access_point_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
 		[CCode (cname = "nm_access_point_filter_connections")]
@@ -52,10 +52,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint wpa_flags { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_active_connection_get_type ()")]
+	[CCode (cheader_filename = "nm-active-connection.h", type_id = "nm_active_connection_get_type ()")]
 	public class ActiveConnection : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_active_connection_new", has_construct_function = false, type = "GObject*")]
-		public ActiveConnection (DBusGLib.Connection connection, string path);
+		public ActiveConnection (DBus.Connection connection, string path);
 		[CCode (cname = "nm_active_connection_get_connection")]
 		public unowned string get_connection ();
 		[CCode (cname = "nm_active_connection_get_default")]
@@ -89,7 +89,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string uuid { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_client_get_type ()")]
+	[CCode (cheader_filename = "nm-client.h", type_id = "nm_client_get_type ()")]
 	public class Client : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_client_new", has_construct_function = false)]
 		public Client ();
@@ -167,28 +167,28 @@ namespace NM {
 		public virtual signal void device_removed (NM.Device device);
 		public virtual signal void permission_changed (uint permission, uint result);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", lower_case_csuffix = "dhcp4_config", type_id = "nm_dhcp4_config_get_type ()")]
+	[CCode (cheader_filename = "nm-dhcp4-config.h", lower_case_csuffix = "dhcp4_config", type_id = "nm_dhcp4_config_get_type ()")]
 	public class DHCP4Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_dhcp4_config_new", has_construct_function = false, type = "GObject*")]
-		public DHCP4Config (DBusGLib.Connection connection, string object_path);
+		public DHCP4Config (DBus.Connection connection, string object_path);
 		[CCode (cname = "nm_dhcp4_config_get_one_option")]
 		public unowned string get_one_option (string option);
 		[CCode (cname = "nm_dhcp4_config_get_options")]
 		public unowned GLib.HashTable<string,GLib.Value?> get_options ();
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", lower_case_csuffix = "dhcp6_config", type_id = "nm_dhcp6_config_get_type ()")]
+	[CCode (cheader_filename = "nm-dhcp6-config.h", lower_case_csuffix = "dhcp6_config", type_id = "nm_dhcp6_config_get_type ()")]
 	public class DHCP6Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_dhcp6_config_new", has_construct_function = false, type = "GObject*")]
-		public DHCP6Config (DBusGLib.Connection connection, string object_path);
+		public DHCP6Config (DBus.Connection connection, string object_path);
 		[CCode (cname = "nm_dhcp6_config_get_one_option")]
 		public unowned string get_one_option (string option);
 		[CCode (cname = "nm_dhcp6_config_get_options")]
 		public unowned GLib.HashTable<string,GLib.Value?> get_options ();
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_get_type ()")]
+	[CCode (cheader_filename = "nm-device.h", type_id = "nm_device_get_type ()")]
 	public class Device : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_new", has_construct_function = false, type = "GObject*")]
-		public Device (DBusGLib.Connection connection, string path);
+		public Device (DBus.Connection connection, string path);
 		public virtual bool connection_compatible (NM.Connection connection) throws GLib.Error;
 		[CCode (cname = "nm_device_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
@@ -270,19 +270,19 @@ namespace NM {
 		public string vendor { owned get; }
 		public virtual signal void state_changed (uint new_state, uint old_state, uint reason);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_adsl_get_type ()")]
+	[CCode (cheader_filename = "nm-device-adsl.h", type_id = "nm_device_adsl_get_type ()")]
 	public class DeviceAdsl : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_adsl_new", has_construct_function = false, type = "GObject*")]
-		public DeviceAdsl (DBusGLib.Connection connection, string path);
+		public DeviceAdsl (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_adsl_get_carrier")]
 		public bool get_carrier ();
 		[NoAccessorMethod]
 		public bool carrier { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_bond_get_type ()")]
+	[CCode (cheader_filename = "nm-device-bond.h", type_id = "nm_device_bond_get_type ()")]
 	public class DeviceBond : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_bond_new", has_construct_function = false, type = "GObject*")]
-		public DeviceBond (DBusGLib.Connection connection, string path);
+		public DeviceBond (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_bond_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_bond_get_hw_address")]
@@ -292,10 +292,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public string hw_address { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_bt_get_type ()")]
+	[CCode (cheader_filename = "nm-device-bt.h", type_id = "nm_device_bt_get_type ()")]
 	public class DeviceBt : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_bt_new", has_construct_function = false, type = "GObject*")]
-		public DeviceBt (DBusGLib.Connection connection, string path);
+		public DeviceBt (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_bt_get_capabilities")]
 		public NM.BluetoothCapabilities get_capabilities ();
 		[CCode (cname = "nm_device_bt_get_hw_address")]
@@ -309,10 +309,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public string name { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_ethernet_get_type ()")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", type_id = "nm_device_ethernet_get_type ()")]
 	public class DeviceEthernet : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_ethernet_new", has_construct_function = false, type = "GObject*")]
-		public DeviceEthernet (DBusGLib.Connection connection, string path);
+		public DeviceEthernet (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_ethernet_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_ethernet_get_hw_address")]
@@ -330,10 +330,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint speed { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_infiniband_get_type ()")]
+	[CCode (cheader_filename = "nm-device-infiniband.h", type_id = "nm_device_infiniband_get_type ()")]
 	public class DeviceInfiniband : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_infiniband_new", has_construct_function = false, type = "GObject*")]
-		public DeviceInfiniband (DBusGLib.Connection connection, string path);
+		public DeviceInfiniband (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_infiniband_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_infiniband_get_hw_address")]
@@ -343,7 +343,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string hw_address { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_modem_get_type ()")]
+	[CCode (cheader_filename = "nm-device-modem.h", type_id = "nm_device_modem_get_type ()")]
 	public class DeviceModem : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (has_construct_function = false)]
 		protected DeviceModem ();
@@ -356,10 +356,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint modem_capabilities { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_olpc_mesh_get_type ()")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", type_id = "nm_device_olpc_mesh_get_type ()")]
 	public class DeviceOlpcMesh : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_olpc_mesh_new", has_construct_function = false, type = "GObject*")]
-		public DeviceOlpcMesh (DBusGLib.Connection connection, string path);
+		public DeviceOlpcMesh (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_olpc_mesh_get_active_channel")]
 		public uint32 get_active_channel ();
 		[CCode (cname = "nm_device_olpc_mesh_get_companion")]
@@ -373,10 +373,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public string hw_address { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_vlan_get_type ()")]
+	[CCode (cheader_filename = "nm-device-vlan.h", type_id = "nm_device_vlan_get_type ()")]
 	public class DeviceVlan : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_vlan_new", has_construct_function = false, type = "GObject*")]
-		public DeviceVlan (DBusGLib.Connection connection, string path);
+		public DeviceVlan (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_vlan_get_carrier")]
 		public bool get_carrier ();
 		[CCode (cname = "nm_device_vlan_get_hw_address")]
@@ -390,10 +390,10 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint vlan_id { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_wifi_get_type ()")]
+	[CCode (cheader_filename = "nm-device-wifi.h", type_id = "nm_device_wifi_get_type ()")]
 	public class DeviceWifi : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_wifi_new", has_construct_function = false, type = "GObject*")]
-		public DeviceWifi (DBusGLib.Connection connection, string path);
+		public DeviceWifi (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_wifi_get_access_point_by_path")]
 		public unowned NM.AccessPoint get_access_point_by_path (string path);
 		[CCode (cname = "nm_device_wifi_get_access_points")]
@@ -425,10 +425,10 @@ namespace NM {
 		public virtual signal void access_point_added (GLib.Object ap);
 		public virtual signal void access_point_removed (GLib.Object ap);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_device_wimax_get_type ()")]
+	[CCode (cheader_filename = "nm-device-wimax.h", type_id = "nm_device_wimax_get_type ()")]
 	public class DeviceWimax : NM.Device, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_device_wimax_new", has_construct_function = false, type = "GObject*")]
-		public DeviceWimax (DBusGLib.Connection connection, string path);
+		public DeviceWimax (DBus.Connection connection, string path);
 		[CCode (cname = "nm_device_wimax_get_active_nsp")]
 		public NM.WimaxNsp get_active_nsp ();
 		[CCode (cname = "nm_device_wimax_get_bsid")]
@@ -464,10 +464,10 @@ namespace NM {
 		public virtual signal void nsp_added (GLib.Object nsp);
 		public virtual signal void nsp_removed (GLib.Object nsp);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_ip4_config_get_type ()")]
+	[CCode (cheader_filename = "nm-ip4-config.h", type_id = "nm_ip4_config_get_type ()")]
 	public class IP4Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_ip4_config_new", has_construct_function = false, type = "GObject*")]
-		public IP4Config (DBusGLib.Connection connection, string object_path);
+		public IP4Config (DBus.Connection connection, string object_path);
 		[CCode (cname = "nm_ip4_config_get_addresses")]
 		public unowned GLib.SList<NM.IP4Address> get_addresses ();
 		[CCode (cname = "nm_ip4_config_get_domains")]
@@ -489,18 +489,18 @@ namespace NM {
 		[NoAccessorMethod]
 		public NM.UintArray wins_servers { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_array_get_type ()")]
 	[Compact]
 	public class IP6AddressArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_object_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_object_array_get_type ()")]
 	[Compact]
 	public class IP6AddressObjectArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_ip6_config_get_type ()")]
+	[CCode (cheader_filename = "nm-ip6-config.h", type_id = "nm_ip6_config_get_type ()")]
 	public class IP6Config : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_ip6_config_new", has_construct_function = false, type = "GObject*")]
-		public IP6Config (DBusGLib.Connection connection, string object_path);
+		public IP6Config (DBus.Connection connection, string object_path);
 		[CCode (cname = "nm_ip6_config_get_addresses")]
 		public unowned GLib.SList<NM.IP6Address> get_addresses ();
 		[CCode (cname = "nm_ip6_config_get_domains")]
@@ -516,30 +516,30 @@ namespace NM {
 		[NoAccessorMethod]
 		public NM.IP6RouteObjectArray routes { owned get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_object_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_object_array_get_type ()")]
 	[Compact]
 	public class IP6RouteObjectArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_object_get_type ()")]
+	[CCode (cheader_filename = "nm-object.h", type_id = "nm_object_get_type ()")]
 	public abstract class Object : GLib.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (has_construct_function = false)]
 		protected Object ();
 		[CCode (cname = "nm_object_get_connection")]
-		public DBusGLib.Connection get_connection ();
+		public unowned DBus.Connection get_connection ();
 		[CCode (cname = "nm_object_get_path")]
 		public unowned string get_path ();
 		[NoAccessorMethod]
 		public string dbus_path { owned get; construct; }
 		public virtual signal void object_creation_failed (void* error, void* failed_path);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_object_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_object_array_get_type ()")]
 	[Compact]
 	public class ObjectArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_remote_connection_get_type ()")]
+	[CCode (cheader_filename = "nm-remote-connection.h", type_id = "nm_remote_connection_get_type ()")]
 	public class RemoteConnection : NM.Connection, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_remote_connection_new", has_construct_function = false)]
-		public RemoteConnection (DBusGLib.Connection bus, string path);
+		public RemoteConnection (DBus.Connection bus, string path);
 		[CCode (cname = "nm_remote_connection_commit_changes")]
 		public void commit_changes (NM.RemoteConnectionCommitFunc? callback);
 		[CCode (cname = "nm_remote_connection_delete")]
@@ -550,10 +550,10 @@ namespace NM {
 		public virtual signal void updated ();
 		public signal void visible (bool object);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_remote_settings_get_type ()")]
+	[CCode (cheader_filename = "nm-remote-settings.h", type_id = "nm_remote_settings_get_type ()")]
 	public class RemoteSettings : GLib.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_remote_settings_new", has_construct_function = false)]
-		public RemoteSettings (DBusGLib.Connection? bus);
+		public RemoteSettings (DBus.Connection? bus);
 		[CCode (cname = "nm_remote_settings_add_connection")]
 		public bool add_connection (NM.Connection connection, NM.RemoteSettingsAddConnectionFunc callback);
 		[CCode (cname = "nm_remote_settings_new_finish", has_construct_function = false)]
@@ -575,7 +575,7 @@ namespace NM {
 		public virtual signal void connections_read ();
 		public virtual signal void new_connection (GLib.Object connection);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_secret_agent_get_type ()")]
+	[CCode (cheader_filename = "nm-secret-agent.h", type_id = "nm_secret_agent_get_type ()")]
 	public abstract class SecretAgent : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected SecretAgent ();
@@ -601,22 +601,22 @@ namespace NM {
 		public bool registered { get; }
 		public virtual signal void registration_result (void* error);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ssid_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ssid_get_type ()")]
 	[Compact]
 	public class Ssid {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_string_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_string_array_get_type ()")]
 	[Compact]
 	public class StringArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_uint_array_get_type ()")]
+	[CCode (cheader_filename = "nm-types.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_uint_array_get_type ()")]
 	[Compact]
 	public class UintArray {
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_vpn_connection_get_type ()")]
+	[CCode (cheader_filename = "nm-vpn-connection.h", type_id = "nm_vpn_connection_get_type ()")]
 	public class VPNConnection : NM.ActiveConnection, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_vpn_connection_new", has_construct_function = false, type = "GObject*")]
-		public VPNConnection (DBusGLib.Connection connection, string path);
+		public VPNConnection (DBus.Connection connection, string path);
 		[CCode (cname = "nm_vpn_connection_get_banner")]
 		public unowned string get_banner ();
 		[CCode (cname = "nm_vpn_connection_get_vpn_state")]
@@ -627,10 +627,10 @@ namespace NM {
 		public uint vpn_state { get; }
 		public virtual signal void vpn_state_changed (uint state, uint reason);
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", type_id = "nm_wimax_nsp_get_type ()")]
+	[CCode (cheader_filename = "nm-wimax-nsp.h", type_id = "nm_wimax_nsp_get_type ()")]
 	public class WimaxNsp : NM.Object, GLib.AsyncInitable, GLib.Initable {
 		[CCode (cname = "nm_wimax_nsp_new", has_construct_function = false, type = "GObject*")]
-		public WimaxNsp (DBusGLib.Connection connection, string path);
+		public WimaxNsp (DBus.Connection connection, string path);
 		[CCode (cname = "nm_wimax_nsp_connection_valid")]
 		public bool connection_valid (NM.Connection connection);
 		[CCode (cname = "nm_wimax_nsp_filter_connections")]
@@ -648,7 +648,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint signal_quality { get; }
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_CLIENT_PERMISSION_")]
+	[CCode (cheader_filename = "nm-client.h", cprefix = "NM_CLIENT_PERMISSION_")]
 	public enum ClientPermission {
 		NONE,
 		ENABLE_DISABLE_NETWORK,
@@ -664,14 +664,14 @@ namespace NM {
 		SETTINGS_MODIFY_HOSTNAME,
 		LAST
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_CLIENT_PERMISSION_RESULT_")]
+	[CCode (cheader_filename = "nm-client.h", cprefix = "NM_CLIENT_PERMISSION_RESULT_")]
 	public enum ClientPermissionResult {
 		UNKNOWN,
 		YES,
 		AUTH,
 		NO
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_ADSL_ERROR_")]
+	[CCode (cheader_filename = "nm-device-adsl.h", cprefix = "NM_DEVICE_ADSL_ERROR_")]
 	public enum DeviceAdslError {
 		[CCode (cname = "NM_DEVICE_ADSL_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -680,7 +680,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_ADSL_ERROR_INVALID_ADSL_CONNECTION")]
 		INVALIDADSLCONNECTION
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_BOND_ERROR_")]
+	[CCode (cheader_filename = "nm-device-bond.h", cprefix = "NM_DEVICE_BOND_ERROR_")]
 	public enum DeviceBondError {
 		[CCode (cname = "NM_DEVICE_BOND_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -691,7 +691,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_BOND_ERROR_INTERFACE_MISMATCH")]
 		INTERFACEMISMATCH
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_BT_ERROR_")]
+	[CCode (cheader_filename = "nm-device-bt.h", cprefix = "NM_DEVICE_BT_ERROR_")]
 	public enum DeviceBtError {
 		[CCode (cname = "NM_DEVICE_BT_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -706,7 +706,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_BT_ERROR_MISSING_DEVICE_CAPS")]
 		MISSINGDEVICECAPS
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_ETHERNET_ERROR_")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cprefix = "NM_DEVICE_ETHERNET_ERROR_")]
 	public enum DeviceEthernetError {
 		[CCode (cname = "NM_DEVICE_ETHERNET_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -719,7 +719,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_ETHERNET_ERROR_MAC_MISMATCH")]
 		MACMISMATCH
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_INFINIBAND_ERROR_")]
+	[CCode (cheader_filename = "nm-device-infiniband.h", cprefix = "NM_DEVICE_INFINIBAND_ERROR_")]
 	public enum DeviceInfinibandError {
 		[CCode (cname = "NM_DEVICE_INFINIBAND_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -732,7 +732,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_INFINIBAND_ERROR_MAC_MISMATCH")]
 		MACMISMATCH
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_MODEM_ERROR_")]
+	[CCode (cheader_filename = "nm-device-modem.h", cprefix = "NM_DEVICE_MODEM_ERROR_")]
 	public enum DeviceModemError {
 		[CCode (cname = "NM_DEVICE_MODEM_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -743,7 +743,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_MODEM_ERROR_MISSING_DEVICE_CAPS")]
 		MISSINGDEVICECAPS
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_OLPC_MESH_ERROR_")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cprefix = "NM_DEVICE_OLPC_MESH_ERROR_")]
 	public enum DeviceOlpcMeshError {
 		[CCode (cname = "NM_DEVICE_OLPC_MESH_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -752,7 +752,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_OLPC_MESH_ERROR_INVALID_OLPC_MESH_CONNECTION")]
 		INVALIDOLPCMESHCONNECTION
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_VLAN_ERROR_")]
+	[CCode (cheader_filename = "nm-device-vlan.h", cprefix = "NM_DEVICE_VLAN_ERROR_")]
 	public enum DeviceVlanError {
 		[CCode (cname = "NM_DEVICE_VLAN_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -765,7 +765,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_VLAN_ERROR_INTERFACE_MISMATCH")]
 		INTERFACEMISMATCH
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_WIFI_ERROR_")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cprefix = "NM_DEVICE_WIFI_ERROR_")]
 	public enum DeviceWifiError {
 		[CCode (cname = "NM_DEVICE_WIFI_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -782,7 +782,7 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_WIFI_ERROR_MISSING_DEVICE_RSN_CAPS")]
 		MISSINGDEVICERSNCAPS
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_DEVICE_WIMAX_ERROR_")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cprefix = "NM_DEVICE_WIMAX_ERROR_")]
 	public enum DeviceWimaxError {
 		[CCode (cname = "NM_DEVICE_WIMAX_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -795,12 +795,12 @@ namespace NM {
 		[CCode (cname = "NM_DEVICE_WIMAX_ERROR_MAC_MISMATCH")]
 		MACMISMATCH
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_OBJECT_ERROR_")]
+	[CCode (cheader_filename = "nm-object.h", cprefix = "NM_OBJECT_ERROR_")]
 	public enum ObjectError {
 		UNKNOWN,
 		OBJECT_CREATION_FAILURE
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_REMOTE_SETTINGS_ERROR_")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cprefix = "NM_REMOTE_SETTINGS_ERROR_")]
 	public enum RemoteSettingsError {
 		[CCode (cname = "NM_REMOTE_SETTINGS_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -809,7 +809,7 @@ namespace NM {
 		[CCode (cname = "NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE")]
 		CONNECTIONUNAVAILABLE
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_SECRET_AGENT_ERROR_")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cprefix = "NM_SECRET_AGENT_ERROR_")]
 	public enum SecretAgentError {
 		[CCode (cname = "NM_SECRET_AGENT_ERROR_NOT_AUTHORIZED")]
 		NOTAUTHORIZED,
@@ -824,285 +824,285 @@ namespace NM {
 		[CCode (cname = "NM_SECRET_AGENT_ERROR_NO_SECRETS")]
 		NOSECRETS
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_SECRET_AGENT_GET_SECRETS_FLAG_")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cprefix = "NM_SECRET_AGENT_GET_SECRETS_FLAG_")]
 	public enum SecretAgentGetSecretsFlags {
 		NONE,
 		ALLOW_INTERACTION,
 		REQUEST_NEW
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", cprefix = "NM_WIMAX_NSP_NETWORK_TYPE_")]
+	[CCode (cheader_filename = "nm-wimax-nsp.h", cprefix = "NM_WIMAX_NSP_NETWORK_TYPE_")]
 	public enum WimaxNspNetworkType {
 		UNKNOWN,
 		HOME,
 		PARTNER,
 		ROAMING_PARTNER
 	}
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-client.h", instance_pos = 3.9)]
 	public delegate void ClientActivateFn (NM.Client client, NM.ActiveConnection active_connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 4.9)]
+	[CCode (cheader_filename = "nm-client.h", instance_pos = 4.9)]
 	public delegate void ClientAddActivateFn (NM.Client client, NM.ActiveConnection connection, string new_connection_path, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 2.9)]
+	[CCode (cheader_filename = "nm-device.h", instance_pos = 2.9)]
 	public delegate void DeviceDeactivateFn (NM.Device device, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 2.9)]
+	[CCode (cheader_filename = "nm-remote-connection.h", instance_pos = 2.9)]
 	public delegate void RemoteConnectionCommitFunc (NM.RemoteConnection connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 2.9)]
+	[CCode (cheader_filename = "nm-remote-connection.h", instance_pos = 2.9)]
 	public delegate void RemoteConnectionDeleteFunc (NM.RemoteConnection connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-remote-connection.h", instance_pos = 3.9)]
 	public delegate void RemoteConnectionGetSecretsFunc (NM.RemoteConnection connection, GLib.HashTable<void*,void*> secrets, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-remote-settings.h", instance_pos = 3.9)]
 	public delegate void RemoteSettingsAddConnectionFunc (NM.RemoteSettings settings, NM.RemoteConnection connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 2.9)]
+	[CCode (cheader_filename = "nm-remote-settings.h", instance_pos = 2.9)]
 	public delegate void RemoteSettingsSaveHostnameFunc (NM.RemoteSettings settings, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-secret-agent.h", instance_pos = 3.9)]
 	public delegate void SecretAgentDeleteSecretsFunc (NM.SecretAgent agent, NM.Connection connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 4.9)]
+	[CCode (cheader_filename = "nm-secret-agent.h", instance_pos = 4.9)]
 	public delegate void SecretAgentGetSecretsFunc (NM.SecretAgent agent, NM.Connection connection, GLib.HashTable<string,GLib.HashTable<void*,void*>> secrets, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-secret-agent.h", instance_pos = 3.9)]
 	public delegate void SecretAgentSaveSecretsFunc (NM.SecretAgent agent, NM.Connection connection, GLib.Error error);
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_BSSID")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_BSSID")]
 	public const string ACCESS_POINT_BSSID;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_FLAGS")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FLAGS")]
 	public const string ACCESS_POINT_FLAGS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_FREQUENCY")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_FREQUENCY")]
 	public const string ACCESS_POINT_FREQUENCY;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_HW_ADDRESS")]
 	public const string ACCESS_POINT_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_MAX_BITRATE")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MAX_BITRATE")]
 	public const string ACCESS_POINT_MAX_BITRATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_MODE")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_MODE")]
 	public const string ACCESS_POINT_MODE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_RSN_FLAGS")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_RSN_FLAGS")]
 	public const string ACCESS_POINT_RSN_FLAGS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_SSID")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_SSID")]
 	public const string ACCESS_POINT_SSID;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_STRENGTH")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_STRENGTH")]
 	public const string ACCESS_POINT_STRENGTH;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACCESS_POINT_WPA_FLAGS")]
+	[CCode (cheader_filename = "nm-access-point.h", cname = "NM_ACCESS_POINT_WPA_FLAGS")]
 	public const string ACCESS_POINT_WPA_FLAGS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_CONNECTION")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_CONNECTION")]
 	public const string ACTIVE_CONNECTION_CONNECTION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT")]
 	public const string ACTIVE_CONNECTION_DEFAULT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT6")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEFAULT6")]
 	public const string ACTIVE_CONNECTION_DEFAULT6;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_DEVICES")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_DEVICES")]
 	public const string ACTIVE_CONNECTION_DEVICES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_MASTER")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_MASTER")]
 	public const string ACTIVE_CONNECTION_MASTER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT")]
 	public const string ACTIVE_CONNECTION_SPECIFIC_OBJECT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_STATE")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_STATE")]
 	public const string ACTIVE_CONNECTION_STATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_ACTIVE_CONNECTION_UUID")]
+	[CCode (cheader_filename = "nm-active-connection.h", cname = "NM_ACTIVE_CONNECTION_UUID")]
 	public const string ACTIVE_CONNECTION_UUID;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_ACTIVE_CONNECTIONS")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_ACTIVE_CONNECTIONS")]
 	public const string CLIENT_ACTIVE_CONNECTIONS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_MANAGER_RUNNING")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_MANAGER_RUNNING")]
 	public const string CLIENT_MANAGER_RUNNING;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_NETWORKING_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_NETWORKING_ENABLED")]
 	public const string CLIENT_NETWORKING_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_STATE")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_STATE")]
 	public const string CLIENT_STATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_VERSION")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_VERSION")]
 	public const string CLIENT_VERSION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WIMAX_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_ENABLED")]
 	public const string CLIENT_WIMAX_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WIMAX_HARDWARE_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIMAX_HARDWARE_ENABLED")]
 	public const string CLIENT_WIMAX_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WIRELESS_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_ENABLED")]
 	public const string CLIENT_WIRELESS_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WIRELESS_HARDWARE_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WIRELESS_HARDWARE_ENABLED")]
 	public const string CLIENT_WIRELESS_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WWAN_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_ENABLED")]
 	public const string CLIENT_WWAN_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_CLIENT_WWAN_HARDWARE_ENABLED")]
+	[CCode (cheader_filename = "nm-client.h", cname = "NM_CLIENT_WWAN_HARDWARE_ENABLED")]
 	public const string CLIENT_WWAN_HARDWARE_ENABLED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ACTIVE_CONNECTION")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_ACTIVE_CONNECTION")]
 	public const string DEVICE_ACTIVE_CONNECTION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ADSL_CARRIER")]
+	[CCode (cheader_filename = "nm-device-adsl.h", cname = "NM_DEVICE_ADSL_CARRIER")]
 	public const string DEVICE_ADSL_CARRIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_AUTOCONNECT")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_AUTOCONNECT")]
 	public const string DEVICE_AUTOCONNECT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_BOND_CARRIER")]
+	[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_CARRIER")]
 	public const string DEVICE_BOND_CARRIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_BOND_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-bond.h", cname = "NM_DEVICE_BOND_HW_ADDRESS")]
 	public const string DEVICE_BOND_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_BT_CAPABILITIES")]
+	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_CAPABILITIES")]
 	public const string DEVICE_BT_CAPABILITIES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_BT_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_HW_ADDRESS")]
 	public const string DEVICE_BT_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_BT_NAME")]
+	[CCode (cheader_filename = "nm-device-bt.h", cname = "NM_DEVICE_BT_NAME")]
 	public const string DEVICE_BT_NAME;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_CAPABILITIES")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_CAPABILITIES")]
 	public const string DEVICE_CAPABILITIES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_DEVICE_TYPE")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DEVICE_TYPE")]
 	public const string DEVICE_DEVICE_TYPE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_DHCP4_CONFIG")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP4_CONFIG")]
 	public const string DEVICE_DHCP4_CONFIG;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_DHCP6_CONFIG")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DHCP6_CONFIG")]
 	public const string DEVICE_DHCP6_CONFIG;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_DRIVER")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_DRIVER")]
 	public const string DEVICE_DRIVER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ETHERNET_CARRIER")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_CARRIER")]
 	public const string DEVICE_ETHERNET_CARRIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ETHERNET_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_HW_ADDRESS")]
 	public const string DEVICE_ETHERNET_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_PERMANENT_HW_ADDRESS")]
 	public const string DEVICE_ETHERNET_PERMANENT_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_ETHERNET_SPEED")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "NM_DEVICE_ETHERNET_SPEED")]
 	public const string DEVICE_ETHERNET_SPEED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_FIRMWARE_MISSING")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_FIRMWARE_MISSING")]
 	public const string DEVICE_FIRMWARE_MISSING;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_INFINIBAND_CARRIER")]
+	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_CARRIER")]
 	public const string DEVICE_INFINIBAND_CARRIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_INFINIBAND_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "NM_DEVICE_INFINIBAND_HW_ADDRESS")]
 	public const string DEVICE_INFINIBAND_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_INTERFACE")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_INTERFACE")]
 	public const string DEVICE_INTERFACE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_IP4_CONFIG")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP4_CONFIG")]
 	public const string DEVICE_IP4_CONFIG;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_IP6_CONFIG")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP6_CONFIG")]
 	public const string DEVICE_IP6_CONFIG;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_IP_INTERFACE")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_IP_INTERFACE")]
 	public const string DEVICE_IP_INTERFACE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_MANAGED")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_MANAGED")]
 	public const string DEVICE_MANAGED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_MODEM_CURRENT_CAPABILITIES")]
+	[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_CURRENT_CAPABILITIES")]
 	public const string DEVICE_MODEM_CURRENT_CAPABILITIES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_MODEM_MODEM_CAPABILITIES")]
+	[CCode (cheader_filename = "nm-device-modem.h", cname = "NM_DEVICE_MODEM_MODEM_CAPABILITIES")]
 	public const string DEVICE_MODEM_MODEM_CAPABILITIES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_ACTIVE_CHANNEL")]
 	public const string DEVICE_OLPC_MESH_ACTIVE_CHANNEL;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_OLPC_MESH_COMPANION")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_COMPANION")]
 	public const string DEVICE_OLPC_MESH_COMPANION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_OLPC_MESH_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "NM_DEVICE_OLPC_MESH_HW_ADDRESS")]
 	public const string DEVICE_OLPC_MESH_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_PRODUCT")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_PRODUCT")]
 	public const string DEVICE_PRODUCT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_STATE")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE")]
 	public const string DEVICE_STATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_STATE_REASON")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_STATE_REASON")]
 	public const string DEVICE_STATE_REASON;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_UDI")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_UDI")]
 	public const string DEVICE_UDI;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_VENDOR")]
+	[CCode (cheader_filename = "nm-device.h", cname = "NM_DEVICE_VENDOR")]
 	public const string DEVICE_VENDOR;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_VLAN_CARRIER")]
+	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_CARRIER")]
 	public const string DEVICE_VLAN_CARRIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_VLAN_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_HW_ADDRESS")]
 	public const string DEVICE_VLAN_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_VLAN_VLAN_ID")]
+	[CCode (cheader_filename = "nm-device-vlan.h", cname = "NM_DEVICE_VLAN_VLAN_ID")]
 	public const string DEVICE_VLAN_VLAN_ID;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT")]
 	public const string DEVICE_WIFI_ACTIVE_ACCESS_POINT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_BITRATE")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_BITRATE")]
 	public const string DEVICE_WIFI_BITRATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_CAPABILITIES")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_CAPABILITIES")]
 	public const string DEVICE_WIFI_CAPABILITIES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_HW_ADDRESS")]
 	public const string DEVICE_WIFI_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_MODE")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_MODE")]
 	public const string DEVICE_WIFI_MODE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS")]
 	public const string DEVICE_WIFI_PERMANENT_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_ACTIVE_NSP")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_ACTIVE_NSP")]
 	public const string DEVICE_WIMAX_ACTIVE_NSP;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_BSID")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_BSID")]
 	public const string DEVICE_WIMAX_BSID;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_CENTER_FREQUENCY")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CENTER_FREQUENCY")]
 	public const string DEVICE_WIMAX_CENTER_FREQUENCY;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_CINR")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_CINR")]
 	public const string DEVICE_WIMAX_CINR;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_HW_ADDRESS")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_HW_ADDRESS")]
 	public const string DEVICE_WIMAX_HW_ADDRESS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_RSSI")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_RSSI")]
 	public const string DEVICE_WIMAX_RSSI;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DEVICE_WIMAX_TX_POWER")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "NM_DEVICE_WIMAX_TX_POWER")]
 	public const string DEVICE_WIMAX_TX_POWER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DHCP4_CONFIG_OPTIONS")]
+	[CCode (cheader_filename = "nm-dhcp4-config.h", cname = "NM_DHCP4_CONFIG_OPTIONS")]
 	public const string DHCP4_CONFIG_OPTIONS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_DHCP6_CONFIG_OPTIONS")]
+	[CCode (cheader_filename = "nm-dhcp6-config.h", cname = "NM_DHCP6_CONFIG_OPTIONS")]
 	public const string DHCP6_CONFIG_OPTIONS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP4_CONFIG_ADDRESSES")]
+	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ADDRESSES")]
 	public const string IP4_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP4_CONFIG_DOMAINS")]
+	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_DOMAINS")]
 	public const string IP4_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP4_CONFIG_NAMESERVERS")]
+	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_NAMESERVERS")]
 	public const string IP4_CONFIG_NAMESERVERS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP4_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_ROUTES")]
 	public const string IP4_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP4_CONFIG_WINS_SERVERS")]
+	[CCode (cheader_filename = "nm-ip4-config.h", cname = "NM_IP4_CONFIG_WINS_SERVERS")]
 	public const string IP4_CONFIG_WINS_SERVERS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP6_CONFIG_ADDRESSES")]
+	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ADDRESSES")]
 	public const string IP6_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP6_CONFIG_DOMAINS")]
+	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_DOMAINS")]
 	public const string IP6_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP6_CONFIG_NAMESERVERS")]
+	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_NAMESERVERS")]
 	public const string IP6_CONFIG_NAMESERVERS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_IP6_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "nm-ip6-config.h", cname = "NM_IP6_CONFIG_ROUTES")]
 	public const string IP6_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_OBJECT_DBUS_CONNECTION")]
+	[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_CONNECTION")]
 	public const string OBJECT_DBUS_CONNECTION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_OBJECT_DBUS_PATH")]
+	[CCode (cheader_filename = "nm-object.h", cname = "NM_OBJECT_DBUS_PATH")]
 	public const string OBJECT_DBUS_PATH;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_CONNECTION_REMOVED")]
+	[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_REMOVED")]
 	public const string REMOTE_CONNECTION_REMOVED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_CONNECTION_UPDATED")]
+	[CCode (cheader_filename = "nm-remote-connection.h", cname = "NM_REMOTE_CONNECTION_UPDATED")]
 	public const string REMOTE_CONNECTION_UPDATED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_BUS")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_BUS")]
 	public const string REMOTE_SETTINGS_BUS;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_CAN_MODIFY")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CAN_MODIFY")]
 	public const string REMOTE_SETTINGS_CAN_MODIFY;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_CONNECTIONS_READ")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_CONNECTIONS_READ")]
 	public const string REMOTE_SETTINGS_CONNECTIONS_READ;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_HOSTNAME")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_HOSTNAME")]
 	public const string REMOTE_SETTINGS_HOSTNAME;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_NEW_CONNECTION")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_NEW_CONNECTION")]
 	public const string REMOTE_SETTINGS_NEW_CONNECTION;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_REMOTE_SETTINGS_SERVICE_RUNNING")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "NM_REMOTE_SETTINGS_SERVICE_RUNNING")]
 	public const string REMOTE_SETTINGS_SERVICE_RUNNING;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_SECRET_AGENT_AUTO_REGISTER")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_AUTO_REGISTER")]
 	public const string SECRET_AGENT_AUTO_REGISTER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_SECRET_AGENT_IDENTIFIER")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_IDENTIFIER")]
 	public const string SECRET_AGENT_IDENTIFIER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_SECRET_AGENT_REGISTERED")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTERED")]
 	public const string SECRET_AGENT_REGISTERED;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_SECRET_AGENT_REGISTRATION_RESULT")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cname = "NM_SECRET_AGENT_REGISTRATION_RESULT")]
 	public const string SECRET_AGENT_REGISTRATION_RESULT;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_VPN_CONNECTION_BANNER")]
+	[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_BANNER")]
 	public const string VPN_CONNECTION_BANNER;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_VPN_CONNECTION_VPN_STATE")]
+	[CCode (cheader_filename = "nm-vpn-connection.h", cname = "NM_VPN_CONNECTION_VPN_STATE")]
 	public const string VPN_CONNECTION_VPN_STATE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_WIMAX_NSP_NAME")]
+	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NAME")]
 	public const string WIMAX_NSP_NAME;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_WIMAX_NSP_NETWORK_TYPE")]
+	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_NETWORK_TYPE")]
 	public const string WIMAX_NSP_NETWORK_TYPE;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "NM_WIMAX_NSP_SIGNAL_QUALITY")]
+	[CCode (cheader_filename = "nm-wimax-nsp.h", cname = "NM_WIMAX_NSP_SIGNAL_QUALITY")]
 	public const string WIMAX_NSP_SIGNAL_QUALITY;
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_adsl_error_quark")]
+	[CCode (cheader_filename = "nm-device-adsl.h", cname = "nm_device_adsl_error_quark")]
 	public static GLib.Quark device_adsl_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_bond_error_quark")]
+	[CCode (cheader_filename = "nm-device-bond.h", cname = "nm_device_bond_error_quark")]
 	public static GLib.Quark device_bond_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_bt_error_quark")]
+	[CCode (cheader_filename = "nm-device-bt.h", cname = "nm_device_bt_error_quark")]
 	public static GLib.Quark device_bt_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_ethernet_error_quark")]
+	[CCode (cheader_filename = "nm-device-ethernet.h", cname = "nm_device_ethernet_error_quark")]
 	public static GLib.Quark device_ethernet_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_infiniband_error_quark")]
+	[CCode (cheader_filename = "nm-device-infiniband.h", cname = "nm_device_infiniband_error_quark")]
 	public static GLib.Quark device_infiniband_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_modem_error_quark")]
+	[CCode (cheader_filename = "nm-device-modem.h", cname = "nm_device_modem_error_quark")]
 	public static GLib.Quark device_modem_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_olpc_mesh_error_quark")]
+	[CCode (cheader_filename = "nm-device-olpc-mesh.h", cname = "nm_device_olpc_mesh_error_quark")]
 	public static GLib.Quark device_olpc_mesh_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_vlan_error_quark")]
+	[CCode (cheader_filename = "nm-device-vlan.h", cname = "nm_device_vlan_error_quark")]
 	public static GLib.Quark device_vlan_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_wifi_error_quark")]
+	[CCode (cheader_filename = "nm-device-wifi.h", cname = "nm_device_wifi_error_quark")]
 	public static GLib.Quark device_wifi_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_device_wimax_error_quark")]
+	[CCode (cheader_filename = "nm-device-wimax.h", cname = "nm_device_wimax_error_quark")]
 	public static GLib.Quark device_wimax_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_object_error_quark")]
+	[CCode (cheader_filename = "nm-object.h", cname = "nm_object_error_quark")]
 	public static GLib.Quark object_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_remote_settings_error_quark")]
+	[CCode (cheader_filename = "nm-remote-settings.h", cname = "nm_remote_settings_error_quark")]
 	public static GLib.Quark remote_settings_error_quark ();
-	[CCode (cheader_filename = "NMClient-1.0.h", cname = "nm_secret_agent_error_quark")]
+	[CCode (cheader_filename = "nm-secret-agent.h", cname = "nm_secret_agent_error_quark")]
 	public static GLib.Quark secret_agent_error_quark ();
 }
diff --git a/vapi/libnm-utils.deps b/vapi/libnm-utils.deps
new file mode 100644
index 0000000..4527bad
--- /dev/null
+++ b/vapi/libnm-utils.deps
@@ -0,0 +1,2 @@
+gio-2.0
+dbus-glib-1
diff --git a/vapi/networkmanager-1.0.vapi b/vapi/libnm-utils.vapi
similarity index 67%
rename from vapi/networkmanager-1.0.vapi
rename to vapi/libnm-utils.vapi
index cbc7357..6a0c605 100644
--- a/vapi/networkmanager-1.0.vapi
+++ b/vapi/libnm-utils.vapi
@@ -1,8 +1,8 @@
-/* networkmanager-1.0.vapi generated by lt-vapigen, do not modify. */
+/* libnm-utils.vapi generated by lt-vapigen, do not modify. */
 
 [CCode (cprefix = "NM", gir_namespace = "NetworkManager", gir_version = "1.0", lower_case_cprefix = "nm__")]
 namespace NM {
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_connection_get_type ()")]
+	[CCode (cheader_filename = "nm-connection.h", type_id = "nm_connection_get_type ()")]
 	public class Connection : GLib.Object {
 		[CCode (cname = "nm_connection_new", has_construct_function = false)]
 		public Connection ();
@@ -103,7 +103,7 @@ namespace NM {
 		public signal void secrets_cleared ();
 		public virtual signal void secrets_updated (string setting);
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_address_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_address_get_type ()")]
 	[Compact]
 	public class IP4Address {
 		[CCode (cname = "nm_ip4_address_new", has_construct_function = false)]
@@ -129,7 +129,7 @@ namespace NM {
 		[CCode (cname = "nm_ip4_address_unref")]
 		public void unref ();
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_route_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip4_route_get_type ()")]
 	[Compact]
 	public class IP4Route {
 		[CCode (cname = "nm_ip4_route_new", has_construct_function = false)]
@@ -159,7 +159,7 @@ namespace NM {
 		[CCode (cname = "nm_ip4_route_unref")]
 		public void unref ();
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_address_get_type ()")]
 	[Compact]
 	public class IP6Address {
 		[CCode (cname = "nm_ip6_address_new", has_construct_function = false)]
@@ -185,7 +185,7 @@ namespace NM {
 		[CCode (cname = "nm_ip6_address_unref")]
 		public void unref ();
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nm_ip6_route_get_type ()")]
 	[Compact]
 	public class IP6Route {
 		[CCode (cname = "nm_ip6_route_new", has_construct_function = false)]
@@ -215,7 +215,7 @@ namespace NM {
 		[CCode (cname = "nm_ip6_route_unref")]
 		public void unref ();
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_get_type ()")]
+	[CCode (cheader_filename = "nm-setting.h", type_id = "nm_setting_get_type ()")]
 	public abstract class Setting : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected Setting ();
@@ -255,7 +255,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string name { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", lower_case_csuffix = "setting_802_1x", type_id = "nm_setting_802_1x_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", lower_case_csuffix = "setting_802_1x", type_id = "nm_setting_802_1x_get_type ()")]
 	public class Setting8021x : NM.Setting {
 		[CCode (cname = "nm_setting_802_1x_new", has_construct_function = false, type = "NMSetting*")]
 		public Setting8021x ();
@@ -428,7 +428,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public bool system_ca_certs { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_adsl_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", type_id = "nm_setting_adsl_get_type ()")]
 	public class SettingAdsl : NM.Setting {
 		[CCode (cname = "nm_setting_adsl_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingAdsl ();
@@ -461,7 +461,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint vpi { get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_bluetooth_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", type_id = "nm_setting_bluetooth_get_type ()")]
 	public class SettingBluetooth : NM.Setting {
 		[CCode (cname = "nm_setting_bluetooth_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingBluetooth ();
@@ -472,7 +472,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string type { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_bond_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-bond.h", type_id = "nm_setting_bond_get_type ()")]
 	public class SettingBond : NM.Setting {
 		[CCode (cname = "nm_setting_bond_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingBond ();
@@ -493,7 +493,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string interface_name { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_cdma_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", type_id = "nm_setting_cdma_get_type ()")]
 	public class SettingCdma : NM.Setting {
 		[CCode (cname = "nm_setting_cdma_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingCdma ();
@@ -514,7 +514,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string username { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_connection_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-connection.h", type_id = "nm_setting_connection_get_type ()")]
 	public class SettingConnection : NM.Setting {
 		[CCode (cname = "nm_setting_connection_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingConnection ();
@@ -567,7 +567,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string zone { owned get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_gsm_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", type_id = "nm_setting_gsm_get_type ()")]
 	public class SettingGsm : NM.Setting {
 		[CCode (cname = "nm_setting_gsm_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingGsm ();
@@ -616,7 +616,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string username { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_ip4_config_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", type_id = "nm_setting_ip4_config_get_type ()")]
 	public class SettingIP4Config : NM.Setting {
 		[CCode (cname = "nm_setting_ip4_config_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingIP4Config ();
@@ -693,7 +693,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public bool never_default { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_ip6_config_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", type_id = "nm_setting_ip6_config_get_type ()")]
 	public class SettingIP6Config : NM.Setting {
 		[CCode (cname = "nm_setting_ip6_config_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingIP6Config ();
@@ -762,7 +762,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public bool never_default { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_infiniband_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", type_id = "nm_setting_infiniband_get_type ()")]
 	public class SettingInfiniband : NM.Setting {
 		[CCode (cname = "nm_setting_infiniband_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingInfiniband ();
@@ -777,7 +777,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string transport_mode { owned get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_olpc_mesh_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", type_id = "nm_setting_olpc_mesh_get_type ()")]
 	public class SettingOlpcMesh : NM.Setting {
 		[CCode (cname = "nm_setting_olpc_mesh_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingOlpcMesh ();
@@ -790,7 +790,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint channel { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_ppp_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", type_id = "nm_setting_ppp_get_type ()")]
 	public class SettingPPP : NM.Setting {
 		[CCode (cname = "nm_setting_ppp_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingPPP ();
@@ -867,7 +867,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public bool require_mppe_128 { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_pppoe_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", type_id = "nm_setting_pppoe_get_type ()")]
 	public class SettingPPPOE : NM.Setting {
 		[CCode (cname = "nm_setting_pppoe_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingPPPOE ();
@@ -888,7 +888,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string username { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_serial_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-serial.h", type_id = "nm_setting_serial_get_type ()")]
 	public class SettingSerial : NM.Setting {
 		[CCode (cname = "nm_setting_serial_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingSerial ();
@@ -913,7 +913,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint stopbits { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_vpn_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", type_id = "nm_setting_vpn_get_type ()")]
 	public class SettingVPN : NM.Setting {
 		[CCode (cname = "nm_setting_vpn_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingVPN ();
@@ -946,7 +946,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string user_name { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_vlan_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", type_id = "nm_setting_vlan_get_type ()")]
 	public class SettingVlan : NM.Setting {
 		[CCode (cname = "nm_setting_vlan_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingVlan ();
@@ -979,7 +979,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string parent { owned get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_wimax_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", type_id = "nm_setting_wimax_get_type ()")]
 	public class SettingWimax : NM.Setting {
 		[CCode (cname = "nm_setting_wimax_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingWimax ();
@@ -990,7 +990,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public string network_name { owned get; set; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_wired_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-wired.h", type_id = "nm_setting_wired_get_type ()")]
 	public class SettingWired : NM.Setting {
 		[CCode (cname = "nm_setting_wired_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingWired ();
@@ -1037,7 +1037,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint speed { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_wireless_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", type_id = "nm_setting_wireless_get_type ()")]
 	public class SettingWireless : NM.Setting {
 		[CCode (cname = "nm_setting_wireless_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingWireless ();
@@ -1092,7 +1092,7 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint tx_power { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", type_id = "nm_setting_wireless_security_get_type ()")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", type_id = "nm_setting_wireless_security_get_type ()")]
 	public class SettingWirelessSecurity : NM.Setting {
 		[CCode (cname = "nm_setting_wireless_security_new", has_construct_function = false, type = "NMSetting*")]
 		public SettingWirelessSecurity ();
@@ -1179,13 +1179,13 @@ namespace NM {
 		[NoAccessorMethod]
 		public uint wep_tx_keyidx { get; set construct; }
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_802_11_AP_FLAGS_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_802_11_AP_FLAGS_")]
 	[Flags]
 	public enum @80211ApFlags {
 		NONE,
 		PRIVACY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_802_11_AP_SEC_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_802_11_AP_SEC_")]
 	[Flags]
 	public enum @80211ApSecurityFlags {
 		NONE,
@@ -1200,27 +1200,27 @@ namespace NM {
 		KEY_MGMT_PSK,
 		KEY_MGMT_802_1X
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_802_11_MODE_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_802_11_MODE_")]
 	public enum @80211Mode {
 		UNKNOWN,
 		ADHOC,
 		INFRA
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_ACTIVE_CONNECTION_STATE_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_ACTIVE_CONNECTION_STATE_")]
 	public enum ActiveConnectionState {
 		UNKNOWN,
 		ACTIVATING,
 		ACTIVATED,
 		DEACTIVATING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_BT_CAPABILITY_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_BT_CAPABILITY_")]
 	[Flags]
 	public enum BluetoothCapabilities {
 		NONE,
 		DUN,
 		NAP
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_CONNECTION_ERROR_")]
+	[CCode (cheader_filename = "nm-connection.h", cprefix = "NM_CONNECTION_ERROR_")]
 	public enum ConnectionError {
 		[CCode (cname = "NM_CONNECTION_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1231,14 +1231,14 @@ namespace NM {
 		[CCode (cname = "NM_CONNECTION_ERROR_SETTING_NOT_FOUND")]
 		SETTINGNOTFOUND
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_DEVICE_CAP_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_DEVICE_CAP_")]
 	[Flags]
 	public enum DeviceCapabilities {
 		NONE,
 		NM_SUPPORTED,
 		CARRIER_DETECT
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_DEVICE_MODEM_CAPABILITY_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_DEVICE_MODEM_CAPABILITY_")]
 	[Flags]
 	public enum DeviceModemCapabilities {
 		NONE,
@@ -1247,7 +1247,7 @@ namespace NM {
 		GSM_UMTS,
 		LTE
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_DEVICE_STATE_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_DEVICE_STATE_")]
 	public enum DeviceState {
 		UNKNOWN,
 		UNMANAGED,
@@ -1263,7 +1263,7 @@ namespace NM {
 		DEACTIVATING,
 		FAILED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_DEVICE_STATE_REASON_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_DEVICE_STATE_REASON_")]
 	public enum DeviceStateReason {
 		NONE,
 		UNKNOWN,
@@ -1319,7 +1319,7 @@ namespace NM {
 		BR2684_FAILED,
 		LAST
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_DEVICE_TYPE_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_DEVICE_TYPE_")]
 	public enum DeviceType {
 		UNKNOWN,
 		ETHERNET,
@@ -1335,7 +1335,7 @@ namespace NM {
 		VLAN,
 		ADSL
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_WIFI_DEVICE_CAP_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_WIFI_DEVICE_CAP_")]
 	[Flags]
 	public enum DeviceWifiCapabilities {
 		NONE,
@@ -1347,20 +1347,20 @@ namespace NM {
 		RSN,
 		AP
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_802_1X_CK_FORMAT_")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cprefix = "NM_SETTING_802_1X_CK_FORMAT_")]
 	public enum Setting8021xCKFormat {
 		UNKNOWN,
 		X509,
 		RAW_KEY,
 		PKCS12
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_802_1X_CK_SCHEME_")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cprefix = "NM_SETTING_802_1X_CK_SCHEME_")]
 	public enum Setting8021xCKScheme {
 		UNKNOWN,
 		BLOB,
 		PATH
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_802_1X_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cprefix = "NM_SETTING_802_1X_ERROR_")]
 	public enum Setting8021xError {
 		[CCode (cname = "NM_SETTING_802_1X_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1369,7 +1369,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_802_1X_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_ADSL_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cprefix = "NM_SETTING_ADSL_ERROR_")]
 	public enum SettingAdslError {
 		[CCode (cname = "NM_SETTING_ADSL_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1378,7 +1378,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_ADSL_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_BLUETOOTH_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cprefix = "NM_SETTING_BLUETOOTH_ERROR_")]
 	public enum SettingBluetoothError {
 		[CCode (cname = "NM_SETTING_BLUETOOTH_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1389,7 +1389,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND")]
 		TYPESETTINGNOTFOUND
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_BOND_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cprefix = "NM_SETTING_BOND_ERROR_")]
 	public enum SettingBondError {
 		[CCode (cname = "NM_SETTING_BOND_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1402,7 +1402,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_BOND_ERROR_MISSING_OPTION")]
 		MISSINGOPTION
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_CDMA_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cprefix = "NM_SETTING_CDMA_ERROR_")]
 	public enum SettingCdmaError {
 		[CCode (cname = "NM_SETTING_CDMA_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1413,7 +1413,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_CDMA_ERROR_MISSING_SERIAL_SETTING")]
 		MISSINGSERIALSETTING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_COMPARE_FLAG_")]
+	[CCode (cheader_filename = "nm-setting.h", cprefix = "NM_SETTING_COMPARE_FLAG_")]
 	public enum SettingCompareFlags {
 		EXACT,
 		FUZZY,
@@ -1422,7 +1422,7 @@ namespace NM {
 		IGNORE_AGENT_OWNED_SECRETS,
 		IGNORE_NOT_SAVED_SECRETS
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_CONNECTION_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cprefix = "NM_SETTING_CONNECTION_ERROR_")]
 	public enum SettingConnectionError {
 		[CCode (cname = "NM_SETTING_CONNECTION_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1435,13 +1435,13 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED")]
 		IPCONFIGNOTALLOWED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_DIFF_RESULT_")]
+	[CCode (cheader_filename = "nm-setting.h", cprefix = "NM_SETTING_DIFF_RESULT_")]
 	public enum SettingDiffResult {
 		UNKNOWN,
 		IN_A,
 		IN_B
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_ERROR_")]
+	[CCode (cheader_filename = "nm-setting.h", cprefix = "NM_SETTING_ERROR_")]
 	public enum SettingError {
 		[CCode (cname = "NM_SETTING_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1452,7 +1452,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH")]
 		PROPERTYTYPEMISMATCH
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_GSM_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cprefix = "NM_SETTING_GSM_ERROR_")]
 	public enum SettingGsmError {
 		[CCode (cname = "NM_SETTING_GSM_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1463,7 +1463,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING")]
 		MISSINGSERIALSETTING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_GSM_BAND_")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cprefix = "NM_SETTING_GSM_BAND_")]
 	public enum SettingGsmNetworkBand {
 		UNKNOWN,
 		ANY,
@@ -1481,7 +1481,7 @@ namespace NM {
 		U1900,
 		U2600
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_GSM_NETWORK_TYPE_")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cprefix = "NM_SETTING_GSM_NETWORK_TYPE_")]
 	public enum SettingGsmNetworkType {
 		ANY,
 		UMTS_HSPA,
@@ -1489,13 +1489,13 @@ namespace NM {
 		PREFER_UMTS_HSPA,
 		PREFER_GPRS_EDGE
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_HASH_FLAG_")]
+	[CCode (cheader_filename = "nm-setting.h", cprefix = "NM_SETTING_HASH_FLAG_")]
 	public enum SettingHashFlags {
 		ALL,
 		NO_SECRETS,
 		ONLY_SECRETS
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_IP4_CONFIG_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cprefix = "NM_SETTING_IP4_CONFIG_ERROR_")]
 	public enum SettingIP4ConfigError {
 		[CCode (cname = "NM_SETTING_IP4_CONFIG_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1506,7 +1506,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD")]
 		NOTALLOWEDFORMETHOD
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_IP6_CONFIG_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cprefix = "NM_SETTING_IP6_CONFIG_ERROR_")]
 	public enum SettingIP6ConfigError {
 		[CCode (cname = "NM_SETTING_IP6_CONFIG_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1517,14 +1517,14 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD")]
 		NOTALLOWEDFORMETHOD
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_IP6_CONFIG_PRIVACY_")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cprefix = "NM_SETTING_IP6_CONFIG_PRIVACY_")]
 	public enum SettingIP6ConfigPrivacy {
 		UNKNOWN,
 		DISABLED,
 		PREFER_PUBLIC_ADDR,
 		PREFER_TEMP_ADDR
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_INFINIBAND_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cprefix = "NM_SETTING_INFINIBAND_ERROR_")]
 	public enum SettingInfinibandError {
 		[CCode (cname = "NM_SETTING_INFINIBAND_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1533,7 +1533,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_INFINIBAND_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_OLPC_MESH_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cprefix = "NM_SETTING_OLPC_MESH_ERROR_")]
 	public enum SettingOlpcMeshError {
 		[CCode (cname = "NM_SETTING_OLPC_MESH_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1542,7 +1542,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_PPP_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cprefix = "NM_SETTING_PPP_ERROR_")]
 	public enum SettingPPPError {
 		[CCode (cname = "NM_SETTING_PPP_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1553,7 +1553,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED")]
 		REQUIREMPPENOTALLOWED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_PPPOE_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cprefix = "NM_SETTING_PPPOE_ERROR_")]
 	public enum SettingPPPOEError {
 		[CCode (cname = "NM_SETTING_PPPOE_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1564,14 +1564,14 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_PPPOE_ERROR_MISSING_PPP_SETTING")]
 		MISSINGPPPSETTING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_SECRET_FLAG_")]
+	[CCode (cheader_filename = "nm-setting.h", cprefix = "NM_SETTING_SECRET_FLAG_")]
 	public enum SettingSecretFlags {
 		NONE,
 		AGENT_OWNED,
 		NOT_SAVED,
 		NOT_REQUIRED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_SERIAL_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cprefix = "NM_SETTING_SERIAL_ERROR_")]
 	public enum SettingSerialError {
 		[CCode (cname = "NM_SETTING_SERIAL_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1582,7 +1582,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_SERIAL_ERROR_MISSING_PPP_SETTING")]
 		MISSINGPPPSETTING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_VLAN_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cprefix = "NM_SETTING_VLAN_ERROR_")]
 	public enum SettingVlanError {
 		UNKNOWN,
 		[CCode (cname = "NM_SETTING_VLAN_ERROR_INVALID_PROPERTY")]
@@ -1590,7 +1590,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_VLAN_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_VPN_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cprefix = "NM_SETTING_VPN_ERROR_")]
 	public enum SettingVpnError {
 		[CCode (cname = "NM_SETTING_VPN_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1599,7 +1599,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_VPN_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_WIMAX_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", cprefix = "NM_SETTING_WIMAX_ERROR_")]
 	public enum SettingWimaxError {
 		[CCode (cname = "NM_SETTING_WIMAX_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1608,7 +1608,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_WIRED_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cprefix = "NM_SETTING_WIRED_ERROR_")]
 	public enum SettingWiredError {
 		[CCode (cname = "NM_SETTING_WIRED_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1617,7 +1617,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_WIRED_ERROR_MISSING_PROPERTY")]
 		MISSINGPROPERTY
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_WIRELESS_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cprefix = "NM_SETTING_WIRELESS_ERROR_")]
 	public enum SettingWirelessError {
 		[CCode (cname = "NM_SETTING_WIRELESS_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1630,7 +1630,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND")]
 		CHANNELREQUIRESBAND
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_SETTING_WIRELESS_SECURITY_ERROR_")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cprefix = "NM_SETTING_WIRELESS_SECURITY_ERROR_")]
 	public enum SettingWirelessSecurityError {
 		[CCode (cname = "NM_SETTING_WIRELESS_SECURITY_ERROR_UNKNOWN")]
 		UNKNOWNERROR,
@@ -1647,7 +1647,7 @@ namespace NM {
 		[CCode (cname = "NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP")]
 		SHAREDKEYREQUIRESWEP
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_STATE_")]
+	[CCode (cheader_filename = "NetworkManager.h", cprefix = "NM_STATE_")]
 	public enum State {
 		UNKNOWN,
 		ASLEEP,
@@ -1658,7 +1658,7 @@ namespace NM {
 		CONNECTED_SITE,
 		CONNECTED_GLOBAL
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NMU_SEC_")]
+	[CCode (cheader_filename = "nm-utils.h", cprefix = "NMU_SEC_")]
 	public enum UtilsSecurityType {
 		INVALID,
 		NONE,
@@ -1670,7 +1670,7 @@ namespace NM {
 		WPA2_PSK,
 		WPA2_ENTERPRISE
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VPN_CONNECTION_STATE_")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_CONNECTION_STATE_")]
 	public enum VPNConnectionState {
 		UNKNOWN,
 		PREPARE,
@@ -1681,7 +1681,7 @@ namespace NM {
 		FAILED,
 		DISCONNECTED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VPN_CONNECTION_STATE_REASON_")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_CONNECTION_STATE_REASON_")]
 	public enum VPNConnectionStateReason {
 		UNKNOWN,
 		NONE,
@@ -1696,13 +1696,13 @@ namespace NM {
 		LOGIN_FAILED,
 		CONNECTION_REMOVED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VPN_PLUGIN_FAILURE_")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_PLUGIN_FAILURE_")]
 	public enum VPNPluginFailure {
 		LOGIN_FAILED,
 		CONNECT_FAILED,
 		BAD_IP_CONFIG
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VPN_SERVICE_STATE_")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cprefix = "NM_VPN_SERVICE_STATE_")]
 	public enum VPNServiceState {
 		UNKNOWN,
 		INIT,
@@ -1712,724 +1712,724 @@ namespace NM {
 		STOPPING,
 		STOPPED
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VLAN_FLAG_")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cprefix = "NM_VLAN_FLAG_")]
 	public enum VlanFlags {
 		REORDER_HEADERS,
 		GVRP,
 		LOOSE_BINDING
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_VLAN_")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cprefix = "NM_VLAN_")]
 	public enum VlanPriorityMap {
 		INGRESS_MAP,
 		EGRESS_MAP
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cprefix = "NM_WEP_KEY_TYPE_")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cprefix = "NM_WEP_KEY_TYPE_")]
 	public enum WepKeyType {
 		UNKNOWN,
 		KEY,
 		PASSPHRASE,
 		LAST
 	}
-	[CCode (cheader_filename = "NetworkManager-1.0.h", instance_pos = 3.9)]
+	[CCode (cheader_filename = "nm-setting.h", instance_pos = 3.9)]
 	public delegate bool SettingClearSecretsWithFlagsFn (NM.Setting setting, string secret, NM.SettingSecretFlags flags);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", instance_pos = 4.9)]
+	[CCode (cheader_filename = "nm-setting.h", instance_pos = 4.9)]
 	public delegate void SettingValueIterFn (NM.Setting setting, string key, GLib.Value value, GLib.ParamFlags flags);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", instance_pos = 2.9)]
+	[CCode (cheader_filename = "nm-setting-vpn.h", instance_pos = 2.9)]
 	public delegate void VPNIterFunc (string key, string value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_CONNECTION_PATH")]
+	[CCode (cheader_filename = "nm-connection.h", cname = "NM_CONNECTION_PATH")]
 	public const string CONNECTION_PATH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_IFACE_SETTINGS")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS")]
 	public const string DBUS_IFACE_SETTINGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION")]
 	public const string DBUS_IFACE_SETTINGS_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_IFACE_SETTINGS_CONNECTION_SECRETS")]
 	public const string DBUS_IFACE_SETTINGS_CONNECTION_SECRETS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_INTERFACE")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_INTERFACE")]
 	public const string DBUS_INTERFACE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_INTERFACE_VPN")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_INTERFACE_VPN")]
 	public const string DBUS_INTERFACE_VPN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_INTERFACE_VPN_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_INTERFACE_VPN_CONNECTION")]
 	public const string DBUS_INTERFACE_VPN_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_INVALID_VPN_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_INVALID_VPN_CONNECTION")]
 	public const string DBUS_INVALID_VPN_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_NO_ACTIVE_VPN_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_NO_ACTIVE_VPN_CONNECTION")]
 	public const string DBUS_NO_ACTIVE_VPN_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_NO_VPN_CONNECTIONS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_NO_VPN_CONNECTIONS")]
 	public const string DBUS_NO_VPN_CONNECTIONS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH")]
 	public const string DBUS_PATH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_AGENT_MANAGER")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_AGENT_MANAGER")]
 	public const string DBUS_PATH_AGENT_MANAGER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_SECRET_AGENT")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SECRET_AGENT")]
 	public const string DBUS_PATH_SECRET_AGENT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_SETTINGS")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS")]
 	public const string DBUS_PATH_SETTINGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_SETTINGS_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_PATH_SETTINGS_CONNECTION")]
 	public const string DBUS_PATH_SETTINGS_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_VPN")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN")]
 	public const string DBUS_PATH_VPN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_PATH_VPN_CONNECTION")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_PATH_VPN_CONNECTION")]
 	public const string DBUS_PATH_VPN_CONNECTION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_SERVICE")]
+	[CCode (cheader_filename = "NetworkManager.h", cname = "NM_DBUS_SERVICE")]
 	public const string DBUS_SERVICE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_ALREADY_STARTED")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STARTED")]
 	public const string DBUS_VPN_ALREADY_STARTED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_ALREADY_STOPPED")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_ALREADY_STOPPED")]
 	public const string DBUS_VPN_ALREADY_STOPPED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_BAD_ARGUMENTS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_BAD_ARGUMENTS")]
 	public const string DBUS_VPN_BAD_ARGUMENTS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_CONNECT_FAILED")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_CONNECT_FAILED")]
 	public const string DBUS_VPN_SIGNAL_CONNECT_FAILED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_IP4_CONFIG")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP4_CONFIG")]
 	public const string DBUS_VPN_SIGNAL_IP4_CONFIG;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_IP_CONFIG_BAD")]
 	public const string DBUS_VPN_SIGNAL_IP_CONFIG_BAD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LAUNCH_FAILED")]
 	public const string DBUS_VPN_SIGNAL_LAUNCH_FAILED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_BANNER")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_BANNER")]
 	public const string DBUS_VPN_SIGNAL_LOGIN_BANNER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_FAILED")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_LOGIN_FAILED")]
 	public const string DBUS_VPN_SIGNAL_LOGIN_FAILED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_STATE_CHANGE")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_STATE_CHANGE")]
 	public const string DBUS_VPN_SIGNAL_STATE_CHANGE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_SIGNAL_VPN_CONFIG_BAD")]
 	public const string DBUS_VPN_SIGNAL_VPN_CONFIG_BAD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_STARTING_IN_PROGRESS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STARTING_IN_PROGRESS")]
 	public const string DBUS_VPN_STARTING_IN_PROGRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_STOPPING_IN_PROGRESS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_STOPPING_IN_PROGRESS")]
 	public const string DBUS_VPN_STOPPING_IN_PROGRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_DBUS_VPN_WRONG_STATE")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_DBUS_VPN_WRONG_STATE")]
 	public const string DBUS_VPN_WRONG_STATE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_ALTSUBJECT_MATCHES")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_ALTSUBJECT_MATCHES")]
 	public const string SETTING_802_1X_ALTSUBJECT_MATCHES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_ANONYMOUS_IDENTITY")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_ANONYMOUS_IDENTITY")]
 	public const string SETTING_802_1X_ANONYMOUS_IDENTITY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_CA_CERT")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_CA_CERT")]
 	public const string SETTING_802_1X_CA_CERT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_CA_PATH")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_CA_PATH")]
 	public const string SETTING_802_1X_CA_PATH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_CLIENT_CERT")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_CLIENT_CERT")]
 	public const string SETTING_802_1X_CLIENT_CERT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_EAP")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_EAP")]
 	public const string SETTING_802_1X_EAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_IDENTITY")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_IDENTITY")]
 	public const string SETTING_802_1X_IDENTITY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PAC_FILE")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PAC_FILE")]
 	public const string SETTING_802_1X_PAC_FILE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PASSWORD")]
 	public const string SETTING_802_1X_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PASSWORD_FLAGS")]
 	public const string SETTING_802_1X_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PASSWORD_RAW")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PASSWORD_RAW")]
 	public const string SETTING_802_1X_PASSWORD_RAW;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PASSWORD_RAW_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PASSWORD_RAW_FLAGS")]
 	public const string SETTING_802_1X_PASSWORD_RAW_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING")]
 	public const string SETTING_802_1X_PHASE1_FAST_PROVISIONING;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE1_PEAPLABEL")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE1_PEAPLABEL")]
 	public const string SETTING_802_1X_PHASE1_PEAPLABEL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE1_PEAPVER")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE1_PEAPVER")]
 	public const string SETTING_802_1X_PHASE1_PEAPVER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES")]
 	public const string SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_AUTH")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_AUTH")]
 	public const string SETTING_802_1X_PHASE2_AUTH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_AUTHEAP")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_AUTHEAP")]
 	public const string SETTING_802_1X_PHASE2_AUTHEAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_CA_CERT")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_CA_CERT")]
 	public const string SETTING_802_1X_PHASE2_CA_CERT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_CA_PATH")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_CA_PATH")]
 	public const string SETTING_802_1X_PHASE2_CA_PATH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_CLIENT_CERT")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_CLIENT_CERT")]
 	public const string SETTING_802_1X_PHASE2_CLIENT_CERT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY")]
 	public const string SETTING_802_1X_PHASE2_PRIVATE_KEY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD")]
 	public const string SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS")]
 	public const string SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH")]
 	public const string SETTING_802_1X_PHASE2_SUBJECT_MATCH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PIN")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PIN")]
 	public const string SETTING_802_1X_PIN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PIN_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PIN_FLAGS")]
 	public const string SETTING_802_1X_PIN_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY")]
 	public const string SETTING_802_1X_PRIVATE_KEY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD")]
 	public const string SETTING_802_1X_PRIVATE_KEY_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS")]
 	public const string SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_SETTING_NAME")]
 	public const string SETTING_802_1X_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_SUBJECT_MATCH")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_SUBJECT_MATCH")]
 	public const string SETTING_802_1X_SUBJECT_MATCH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_802_1X_SYSTEM_CA_CERTS")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "NM_SETTING_802_1X_SYSTEM_CA_CERTS")]
 	public const string SETTING_802_1X_SYSTEM_CA_CERTS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_ENCAPSULATION")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_ENCAPSULATION")]
 	public const string SETTING_ADSL_ENCAPSULATION;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_ENCAPSULATION_LLC")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_ENCAPSULATION_LLC")]
 	public const string SETTING_ADSL_ENCAPSULATION_LLC;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_ENCAPSULATION_VCMUX")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_ENCAPSULATION_VCMUX")]
 	public const string SETTING_ADSL_ENCAPSULATION_VCMUX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PASSWORD")]
 	public const string SETTING_ADSL_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PASSWORD_FLAGS")]
 	public const string SETTING_ADSL_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PROTOCOL")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PROTOCOL")]
 	public const string SETTING_ADSL_PROTOCOL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PROTOCOL_IPOATM")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PROTOCOL_IPOATM")]
 	public const string SETTING_ADSL_PROTOCOL_IPOATM;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PROTOCOL_PPPOA")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PROTOCOL_PPPOA")]
 	public const string SETTING_ADSL_PROTOCOL_PPPOA;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_PROTOCOL_PPPOE")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_PROTOCOL_PPPOE")]
 	public const string SETTING_ADSL_PROTOCOL_PPPOE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_SETTING_NAME")]
 	public const string SETTING_ADSL_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_USERNAME")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_USERNAME")]
 	public const string SETTING_ADSL_USERNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_VCI")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_VCI")]
 	public const string SETTING_ADSL_VCI;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_ADSL_VPI")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "NM_SETTING_ADSL_VPI")]
 	public const string SETTING_ADSL_VPI;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BLUETOOTH_BDADDR")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_BDADDR")]
 	public const string SETTING_BLUETOOTH_BDADDR;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BLUETOOTH_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_SETTING_NAME")]
 	public const string SETTING_BLUETOOTH_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BLUETOOTH_TYPE")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_TYPE")]
 	public const string SETTING_BLUETOOTH_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BLUETOOTH_TYPE_DUN")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_TYPE_DUN")]
 	public const string SETTING_BLUETOOTH_TYPE_DUN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BLUETOOTH_TYPE_PANU")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "NM_SETTING_BLUETOOTH_TYPE_PANU")]
 	public const string SETTING_BLUETOOTH_TYPE_PANU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_INTERFACE_NAME")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_INTERFACE_NAME")]
 	public const string SETTING_BOND_INTERFACE_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTIONS")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTIONS")]
 	public const string SETTING_BOND_OPTIONS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_ARP_INTERVAL")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_ARP_INTERVAL")]
 	public const string SETTING_BOND_OPTION_ARP_INTERVAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_ARP_IP_TARGET")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_ARP_IP_TARGET")]
 	public const string SETTING_BOND_OPTION_ARP_IP_TARGET;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_DOWNDELAY")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_DOWNDELAY")]
 	public const string SETTING_BOND_OPTION_DOWNDELAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_MIIMON")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_MIIMON")]
 	public const string SETTING_BOND_OPTION_MIIMON;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_MODE")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_MODE")]
 	public const string SETTING_BOND_OPTION_MODE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_OPTION_UPDELAY")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_OPTION_UPDELAY")]
 	public const string SETTING_BOND_OPTION_UPDELAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_BOND_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "NM_SETTING_BOND_SETTING_NAME")]
 	public const string SETTING_BOND_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CDMA_NUMBER")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_NUMBER")]
 	public const string SETTING_CDMA_NUMBER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CDMA_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_PASSWORD")]
 	public const string SETTING_CDMA_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CDMA_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_PASSWORD_FLAGS")]
 	public const string SETTING_CDMA_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CDMA_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_SETTING_NAME")]
 	public const string SETTING_CDMA_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CDMA_USERNAME")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "NM_SETTING_CDMA_USERNAME")]
 	public const string SETTING_CDMA_USERNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_AUTOCONNECT")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_AUTOCONNECT")]
 	public const string SETTING_CONNECTION_AUTOCONNECT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ID")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ID")]
 	public const string SETTING_CONNECTION_ID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_MASTER")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_MASTER")]
 	public const string SETTING_CONNECTION_MASTER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_PERMISSIONS")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_PERMISSIONS")]
 	public const string SETTING_CONNECTION_PERMISSIONS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_READ_ONLY")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_READ_ONLY")]
 	public const string SETTING_CONNECTION_READ_ONLY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_SETTING_NAME")]
 	public const string SETTING_CONNECTION_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_SLAVE_TYPE")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_SLAVE_TYPE")]
 	public const string SETTING_CONNECTION_SLAVE_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_TIMESTAMP")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_TIMESTAMP")]
 	public const string SETTING_CONNECTION_TIMESTAMP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_TYPE")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_TYPE")]
 	public const string SETTING_CONNECTION_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_UUID")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_UUID")]
 	public const string SETTING_CONNECTION_UUID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE")]
 	public const string SETTING_CONNECTION_ZONE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE_BLOCK")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_BLOCK")]
 	public const string SETTING_CONNECTION_ZONE_BLOCK;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE_HOME")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_HOME")]
 	public const string SETTING_CONNECTION_ZONE_HOME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE_PUBLIC")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_PUBLIC")]
 	public const string SETTING_CONNECTION_ZONE_PUBLIC;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE_TRUSTED")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_TRUSTED")]
 	public const string SETTING_CONNECTION_ZONE_TRUSTED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_CONNECTION_ZONE_WORK")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "NM_SETTING_CONNECTION_ZONE_WORK")]
 	public const string SETTING_CONNECTION_ZONE_WORK;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_ALLOWED_BANDS")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_ALLOWED_BANDS")]
 	public const string SETTING_GSM_ALLOWED_BANDS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_APN")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_APN")]
 	public const string SETTING_GSM_APN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_HOME_ONLY")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_HOME_ONLY")]
 	public const string SETTING_GSM_HOME_ONLY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_NETWORK_ID")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_NETWORK_ID")]
 	public const string SETTING_GSM_NETWORK_ID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_NETWORK_TYPE")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_NETWORK_TYPE")]
 	public const string SETTING_GSM_NETWORK_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_NUMBER")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_NUMBER")]
 	public const string SETTING_GSM_NUMBER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_PASSWORD")]
 	public const string SETTING_GSM_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_PASSWORD_FLAGS")]
 	public const string SETTING_GSM_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_PIN")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_PIN")]
 	public const string SETTING_GSM_PIN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_PIN_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_PIN_FLAGS")]
 	public const string SETTING_GSM_PIN_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_SETTING_NAME")]
 	public const string SETTING_GSM_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_GSM_USERNAME")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "NM_SETTING_GSM_USERNAME")]
 	public const string SETTING_GSM_USERNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_INFINIBAND_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "NM_SETTING_INFINIBAND_MAC_ADDRESS")]
 	public const string SETTING_INFINIBAND_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_INFINIBAND_MTU")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "NM_SETTING_INFINIBAND_MTU")]
 	public const string SETTING_INFINIBAND_MTU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_INFINIBAND_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "NM_SETTING_INFINIBAND_SETTING_NAME")]
 	public const string SETTING_INFINIBAND_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_INFINIBAND_TRANSPORT_MODE")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "NM_SETTING_INFINIBAND_TRANSPORT_MODE")]
 	public const string SETTING_INFINIBAND_TRANSPORT_MODE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_ADDRESSES")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_ADDRESSES")]
 	public const string SETTING_IP4_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID")]
 	public const string SETTING_IP4_CONFIG_DHCP_CLIENT_ID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME")]
 	public const string SETTING_IP4_CONFIG_DHCP_HOSTNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME")]
 	public const string SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_DNS")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_DNS")]
 	public const string SETTING_IP4_CONFIG_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_DNS_SEARCH")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_DNS_SEARCH")]
 	public const string SETTING_IP4_CONFIG_DNS_SEARCH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS")]
 	public const string SETTING_IP4_CONFIG_IGNORE_AUTO_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES")]
 	public const string SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_MAY_FAIL")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_MAY_FAIL")]
 	public const string SETTING_IP4_CONFIG_MAY_FAIL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD")]
 	public const string SETTING_IP4_CONFIG_METHOD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_AUTO")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_AUTO")]
 	public const string SETTING_IP4_CONFIG_METHOD_AUTO;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_DISABLED")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_DISABLED")]
 	public const string SETTING_IP4_CONFIG_METHOD_DISABLED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL")]
 	public const string SETTING_IP4_CONFIG_METHOD_LINK_LOCAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_MANUAL")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_MANUAL")]
 	public const string SETTING_IP4_CONFIG_METHOD_MANUAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_SHARED")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_METHOD_SHARED")]
 	public const string SETTING_IP4_CONFIG_METHOD_SHARED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_NEVER_DEFAULT")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_NEVER_DEFAULT")]
 	public const string SETTING_IP4_CONFIG_NEVER_DEFAULT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_ROUTES")]
 	public const string SETTING_IP4_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP4_CONFIG_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "NM_SETTING_IP4_CONFIG_SETTING_NAME")]
 	public const string SETTING_IP4_CONFIG_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_ADDRESSES")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_ADDRESSES")]
 	public const string SETTING_IP6_CONFIG_ADDRESSES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_DNS")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_DNS")]
 	public const string SETTING_IP6_CONFIG_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_DNS_SEARCH")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_DNS_SEARCH")]
 	public const string SETTING_IP6_CONFIG_DNS_SEARCH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS")]
 	public const string SETTING_IP6_CONFIG_IGNORE_AUTO_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES")]
 	public const string SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_IP6_PRIVACY")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_IP6_PRIVACY")]
 	public const string SETTING_IP6_CONFIG_IP6_PRIVACY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_MAY_FAIL")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_MAY_FAIL")]
 	public const string SETTING_IP6_CONFIG_MAY_FAIL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD")]
 	public const string SETTING_IP6_CONFIG_METHOD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_AUTO")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_AUTO")]
 	public const string SETTING_IP6_CONFIG_METHOD_AUTO;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_DHCP")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_DHCP")]
 	public const string SETTING_IP6_CONFIG_METHOD_DHCP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_IGNORE")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_IGNORE")]
 	public const string SETTING_IP6_CONFIG_METHOD_IGNORE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL")]
 	public const string SETTING_IP6_CONFIG_METHOD_LINK_LOCAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_MANUAL")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_MANUAL")]
 	public const string SETTING_IP6_CONFIG_METHOD_MANUAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_SHARED")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_METHOD_SHARED")]
 	public const string SETTING_IP6_CONFIG_METHOD_SHARED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_NEVER_DEFAULT")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_NEVER_DEFAULT")]
 	public const string SETTING_IP6_CONFIG_NEVER_DEFAULT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_ROUTES")]
 	public const string SETTING_IP6_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_IP6_CONFIG_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "NM_SETTING_IP6_CONFIG_SETTING_NAME")]
 	public const string SETTING_IP6_CONFIG_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_NAME")]
 	public const string SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_OLPC_MESH_CHANNEL")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "NM_SETTING_OLPC_MESH_CHANNEL")]
 	public const string SETTING_OLPC_MESH_CHANNEL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS")]
 	public const string SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_OLPC_MESH_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "NM_SETTING_OLPC_MESH_SETTING_NAME")]
 	public const string SETTING_OLPC_MESH_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_OLPC_MESH_SSID")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "NM_SETTING_OLPC_MESH_SSID")]
 	public const string SETTING_OLPC_MESH_SSID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PARAM_FUZZY_IGNORE")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_PARAM_FUZZY_IGNORE")]
 	public const int SETTING_PARAM_FUZZY_IGNORE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PARAM_REQUIRED")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_PARAM_REQUIRED")]
 	public const int SETTING_PARAM_REQUIRED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PARAM_SECRET")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_PARAM_SECRET")]
 	public const int SETTING_PARAM_SECRET;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PARAM_SERIALIZE")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "NM_SETTING_PARAM_SERIALIZE")]
 	public const int SETTING_PARAM_SERIALIZE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPPOE_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_PASSWORD")]
 	public const string SETTING_PPPOE_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPPOE_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_PASSWORD_FLAGS")]
 	public const string SETTING_PPPOE_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPPOE_SERVICE")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_SERVICE")]
 	public const string SETTING_PPPOE_SERVICE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPPOE_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_SETTING_NAME")]
 	public const string SETTING_PPPOE_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPPOE_USERNAME")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "NM_SETTING_PPPOE_USERNAME")]
 	public const string SETTING_PPPOE_USERNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_BAUD")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_BAUD")]
 	public const string SETTING_PPP_BAUD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_CRTSCTS")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_CRTSCTS")]
 	public const string SETTING_PPP_CRTSCTS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_LCP_ECHO_FAILURE")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_LCP_ECHO_FAILURE")]
 	public const string SETTING_PPP_LCP_ECHO_FAILURE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_LCP_ECHO_INTERVAL")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_LCP_ECHO_INTERVAL")]
 	public const string SETTING_PPP_LCP_ECHO_INTERVAL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_MPPE_STATEFUL")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_MPPE_STATEFUL")]
 	public const string SETTING_PPP_MPPE_STATEFUL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_MRU")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_MRU")]
 	public const string SETTING_PPP_MRU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_MTU")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_MTU")]
 	public const string SETTING_PPP_MTU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_NOAUTH")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_NOAUTH")]
 	public const string SETTING_PPP_NOAUTH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_NOBSDCOMP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_NOBSDCOMP")]
 	public const string SETTING_PPP_NOBSDCOMP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_NODEFLATE")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_NODEFLATE")]
 	public const string SETTING_PPP_NODEFLATE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_NO_VJ_COMP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_NO_VJ_COMP")]
 	public const string SETTING_PPP_NO_VJ_COMP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REFUSE_CHAP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REFUSE_CHAP")]
 	public const string SETTING_PPP_REFUSE_CHAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REFUSE_EAP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REFUSE_EAP")]
 	public const string SETTING_PPP_REFUSE_EAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REFUSE_MSCHAP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REFUSE_MSCHAP")]
 	public const string SETTING_PPP_REFUSE_MSCHAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REFUSE_MSCHAPV2")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REFUSE_MSCHAPV2")]
 	public const string SETTING_PPP_REFUSE_MSCHAPV2;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REFUSE_PAP")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REFUSE_PAP")]
 	public const string SETTING_PPP_REFUSE_PAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REQUIRE_MPPE")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REQUIRE_MPPE")]
 	public const string SETTING_PPP_REQUIRE_MPPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_REQUIRE_MPPE_128")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_REQUIRE_MPPE_128")]
 	public const string SETTING_PPP_REQUIRE_MPPE_128;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_PPP_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "NM_SETTING_PPP_SETTING_NAME")]
 	public const string SETTING_PPP_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_BAUD")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_BAUD")]
 	public const string SETTING_SERIAL_BAUD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_BITS")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_BITS")]
 	public const string SETTING_SERIAL_BITS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_PARITY")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_PARITY")]
 	public const string SETTING_SERIAL_PARITY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_SEND_DELAY")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_SEND_DELAY")]
 	public const string SETTING_SERIAL_SEND_DELAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_SETTING_NAME")]
 	public const string SETTING_SERIAL_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_SERIAL_STOPBITS")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "NM_SETTING_SERIAL_STOPBITS")]
 	public const string SETTING_SERIAL_STOPBITS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_EGRESS_PRIORITY_MAP")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_EGRESS_PRIORITY_MAP")]
 	public const string SETTING_VLAN_EGRESS_PRIORITY_MAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_FLAGS")]
 	public const string SETTING_VLAN_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_ID")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_ID")]
 	public const string SETTING_VLAN_ID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_INGRESS_PRIORITY_MAP")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_INGRESS_PRIORITY_MAP")]
 	public const string SETTING_VLAN_INGRESS_PRIORITY_MAP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_INTERFACE_NAME")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_INTERFACE_NAME")]
 	public const string SETTING_VLAN_INTERFACE_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_PARENT")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_PARENT")]
 	public const string SETTING_VLAN_PARENT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VLAN_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "NM_SETTING_VLAN_SETTING_NAME")]
 	public const string SETTING_VLAN_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VPN_DATA")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "NM_SETTING_VPN_DATA")]
 	public const string SETTING_VPN_DATA;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VPN_SECRETS")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "NM_SETTING_VPN_SECRETS")]
 	public const string SETTING_VPN_SECRETS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VPN_SERVICE_TYPE")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "NM_SETTING_VPN_SERVICE_TYPE")]
 	public const string SETTING_VPN_SERVICE_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VPN_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "NM_SETTING_VPN_SETTING_NAME")]
 	public const string SETTING_VPN_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_VPN_USER_NAME")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "NM_SETTING_VPN_USER_NAME")]
 	public const string SETTING_VPN_USER_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIMAX_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", cname = "NM_SETTING_WIMAX_MAC_ADDRESS")]
 	public const string SETTING_WIMAX_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIMAX_NETWORK_NAME")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", cname = "NM_SETTING_WIMAX_NETWORK_NAME")]
 	public const string SETTING_WIMAX_NETWORK_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIMAX_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", cname = "NM_SETTING_WIMAX_SETTING_NAME")]
 	public const string SETTING_WIMAX_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_AUTO_NEGOTIATE")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_AUTO_NEGOTIATE")]
 	public const string SETTING_WIRED_AUTO_NEGOTIATE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_CLONED_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_CLONED_MAC_ADDRESS")]
 	public const string SETTING_WIRED_CLONED_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_DUPLEX")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_DUPLEX")]
 	public const string SETTING_WIRED_DUPLEX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_MAC_ADDRESS")]
 	public const string SETTING_WIRED_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST")]
 	public const string SETTING_WIRED_MAC_ADDRESS_BLACKLIST;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_MTU")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_MTU")]
 	public const string SETTING_WIRED_MTU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_PORT")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_PORT")]
 	public const string SETTING_WIRED_PORT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_S390_NETTYPE")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_S390_NETTYPE")]
 	public const string SETTING_WIRED_S390_NETTYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_S390_OPTIONS")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_S390_OPTIONS")]
 	public const string SETTING_WIRED_S390_OPTIONS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_S390_SUBCHANNELS")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_S390_SUBCHANNELS")]
 	public const string SETTING_WIRED_S390_SUBCHANNELS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_SETTING_NAME")]
 	public const string SETTING_WIRED_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRED_SPEED")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "NM_SETTING_WIRED_SPEED")]
 	public const string SETTING_WIRED_SPEED;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_BAND")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_BAND")]
 	public const string SETTING_WIRELESS_BAND;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_BSSID")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_BSSID")]
 	public const string SETTING_WIRELESS_BSSID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_CHANNEL")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_CHANNEL")]
 	public const string SETTING_WIRELESS_CHANNEL;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS")]
 	public const string SETTING_WIRELESS_CLONED_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_HIDDEN")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_HIDDEN")]
 	public const string SETTING_WIRELESS_HIDDEN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MAC_ADDRESS")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MAC_ADDRESS")]
 	public const string SETTING_WIRELESS_MAC_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST")]
 	public const string SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MODE")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MODE")]
 	public const string SETTING_WIRELESS_MODE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MODE_ADHOC")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MODE_ADHOC")]
 	public const string SETTING_WIRELESS_MODE_ADHOC;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MODE_INFRA")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MODE_INFRA")]
 	public const string SETTING_WIRELESS_MODE_INFRA;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_MTU")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_MTU")]
 	public const string SETTING_WIRELESS_MTU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_RATE")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_RATE")]
 	public const string SETTING_WIRELESS_RATE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SEC")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_SEC")]
 	public const string SETTING_WIRELESS_SEC;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_AUTH_ALG")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_AUTH_ALG")]
 	public const string SETTING_WIRELESS_SECURITY_AUTH_ALG;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_GROUP")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_GROUP")]
 	public const string SETTING_WIRELESS_SECURITY_GROUP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_KEY_MGMT")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_KEY_MGMT")]
 	public const string SETTING_WIRELESS_SECURITY_KEY_MGMT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD")]
 	public const string SETTING_WIRELESS_SECURITY_LEAP_PASSWORD;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS")]
 	public const string SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME")]
 	public const string SETTING_WIRELESS_SECURITY_LEAP_USERNAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_PAIRWISE")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_PAIRWISE")]
 	public const string SETTING_WIRELESS_SECURITY_PAIRWISE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_PROTO")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_PROTO")]
 	public const string SETTING_WIRELESS_SECURITY_PROTO;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_PSK")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_PSK")]
 	public const string SETTING_WIRELESS_SECURITY_PSK;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS")]
 	public const string SETTING_WIRELESS_SECURITY_PSK_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_SETTING_NAME")]
 	public const string SETTING_WIRELESS_SECURITY_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY0")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY0")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY0;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY1")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY1")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY1;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY2")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY2")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY2;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY3")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY3")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY3;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX")]
 	public const string SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SEEN_BSSIDS")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_SEEN_BSSIDS")]
 	public const string SETTING_WIRELESS_SEEN_BSSIDS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SETTING_NAME")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_SETTING_NAME")]
 	public const string SETTING_WIRELESS_SETTING_NAME;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_SSID")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_SSID")]
 	public const string SETTING_WIRELESS_SSID;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_SETTING_WIRELESS_TX_POWER")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "NM_SETTING_WIRELESS_TX_POWER")]
 	public const string SETTING_WIRELESS_TX_POWER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_UTILS_HWADDR_LEN_MAX")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "NM_UTILS_HWADDR_LEN_MAX")]
 	public const int UTILS_HWADDR_LEN_MAX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_DBUS_PLUGIN_INTERFACE")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_DBUS_PLUGIN_INTERFACE")]
 	public const string VPN_DBUS_PLUGIN_INTERFACE;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_DBUS_PLUGIN_PATH")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_DBUS_PLUGIN_PATH")]
 	public const string VPN_DBUS_PLUGIN_PATH;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_BANNER")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_BANNER")]
 	public const string VPN_PLUGIN_CONFIG_BANNER;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_EXT_GATEWAY")]
 	public const string VPN_PLUGIN_CONFIG_EXT_GATEWAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_HAS_IP4")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_HAS_IP4")]
 	public const string VPN_PLUGIN_CONFIG_HAS_IP4;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_HAS_IP6")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_HAS_IP6")]
 	public const string VPN_PLUGIN_CONFIG_HAS_IP6;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_MTU")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_MTU")]
 	public const string VPN_PLUGIN_CONFIG_MTU;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_CONFIG_TUNDEV")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_CONFIG_TUNDEV")]
 	public const string VPN_PLUGIN_CONFIG_TUNDEV;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_ADDRESS")]
 	public const string VPN_PLUGIN_IP4_CONFIG_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DNS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DNS")]
 	public const string VPN_PLUGIN_IP4_CONFIG_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN")]
 	public const string VPN_PLUGIN_IP4_CONFIG_DOMAIN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_DOMAINS")]
 	public const string VPN_PLUGIN_IP4_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY")]
 	public const string VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_MSS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_MSS")]
 	public const string VPN_PLUGIN_IP4_CONFIG_MSS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_NBNS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_NBNS")]
 	public const string VPN_PLUGIN_IP4_CONFIG_NBNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT")]
 	public const string VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_PREFIX")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_PREFIX")]
 	public const string VPN_PLUGIN_IP4_CONFIG_PREFIX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_PTP")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_PTP")]
 	public const string VPN_PLUGIN_IP4_CONFIG_PTP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP4_CONFIG_ROUTES")]
 	public const string VPN_PLUGIN_IP4_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_ADDRESS")]
 	public const string VPN_PLUGIN_IP6_CONFIG_ADDRESS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DNS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DNS")]
 	public const string VPN_PLUGIN_IP6_CONFIG_DNS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DOMAIN")]
 	public const string VPN_PLUGIN_IP6_CONFIG_DOMAIN;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_DOMAINS")]
 	public const string VPN_PLUGIN_IP6_CONFIG_DOMAINS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY")]
 	public const string VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_MSS")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_MSS")]
 	public const string VPN_PLUGIN_IP6_CONFIG_MSS;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT")]
 	public const string VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_PREFIX")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_PREFIX")]
 	public const string VPN_PLUGIN_IP6_CONFIG_PREFIX;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_PTP")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_PTP")]
 	public const string VPN_PLUGIN_IP6_CONFIG_PTP;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_ROUTES")]
+	[CCode (cheader_filename = "NetworkManagerVPN.h", cname = "NM_VPN_PLUGIN_IP6_CONFIG_ROUTES")]
 	public const string VPN_PLUGIN_IP6_CONFIG_ROUTES;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_connection_error_quark")]
+	[CCode (cheader_filename = "nm-connection.h", cname = "nm_connection_error_quark")]
 	public static GLib.Quark connection_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_802_1x_error_quark")]
+	[CCode (cheader_filename = "nm-setting-8021x.h", cname = "nm_setting_802_1x_error_quark")]
 	public static GLib.Quark setting_802_1x_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_adsl_error_quark")]
+	[CCode (cheader_filename = "nm-setting-adsl.h", cname = "nm_setting_adsl_error_quark")]
 	public static GLib.Quark setting_adsl_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_bluetooth_error_quark")]
+	[CCode (cheader_filename = "nm-setting-bluetooth.h", cname = "nm_setting_bluetooth_error_quark")]
 	public static GLib.Quark setting_bluetooth_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_bond_error_quark")]
+	[CCode (cheader_filename = "nm-setting-bond.h", cname = "nm_setting_bond_error_quark")]
 	public static GLib.Quark setting_bond_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_cdma_error_quark")]
+	[CCode (cheader_filename = "nm-setting-cdma.h", cname = "nm_setting_cdma_error_quark")]
 	public static GLib.Quark setting_cdma_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_connection_error_quark")]
+	[CCode (cheader_filename = "nm-setting-connection.h", cname = "nm_setting_connection_error_quark")]
 	public static GLib.Quark setting_connection_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_error_quark")]
+	[CCode (cheader_filename = "nm-setting.h", cname = "nm_setting_error_quark")]
 	public static GLib.Quark setting_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_gsm_error_quark")]
+	[CCode (cheader_filename = "nm-setting-gsm.h", cname = "nm_setting_gsm_error_quark")]
 	public static GLib.Quark setting_gsm_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_infiniband_error_quark")]
+	[CCode (cheader_filename = "nm-setting-infiniband.h", cname = "nm_setting_infiniband_error_quark")]
 	public static GLib.Quark setting_infiniband_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_ip4_config_error_quark")]
+	[CCode (cheader_filename = "nm-setting-ip4-config.h", cname = "nm_setting_ip4_config_error_quark")]
 	public static GLib.Quark setting_ip4_config_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_ip6_config_error_quark")]
+	[CCode (cheader_filename = "nm-setting-ip6-config.h", cname = "nm_setting_ip6_config_error_quark")]
 	public static GLib.Quark setting_ip6_config_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_olpc_mesh_error_quark")]
+	[CCode (cheader_filename = "nm-setting-olpc-mesh.h", cname = "nm_setting_olpc_mesh_error_quark")]
 	public static GLib.Quark setting_olpc_mesh_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_ppp_error_quark")]
+	[CCode (cheader_filename = "nm-setting-ppp.h", cname = "nm_setting_ppp_error_quark")]
 	public static GLib.Quark setting_ppp_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_pppoe_error_quark")]
+	[CCode (cheader_filename = "nm-setting-pppoe.h", cname = "nm_setting_pppoe_error_quark")]
 	public static GLib.Quark setting_pppoe_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_serial_error_quark")]
+	[CCode (cheader_filename = "nm-setting-serial.h", cname = "nm_setting_serial_error_quark")]
 	public static GLib.Quark setting_serial_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_vlan_error_quark")]
+	[CCode (cheader_filename = "nm-setting-vlan.h", cname = "nm_setting_vlan_error_quark")]
 	public static GLib.Quark setting_vlan_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_vpn_error_quark")]
+	[CCode (cheader_filename = "nm-setting-vpn.h", cname = "nm_setting_vpn_error_quark")]
 	public static GLib.Quark setting_vpn_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_wimax_error_quark")]
+	[CCode (cheader_filename = "nm-setting-wimax.h", cname = "nm_setting_wimax_error_quark")]
 	public static GLib.Quark setting_wimax_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_wired_error_quark")]
+	[CCode (cheader_filename = "nm-setting-wired.h", cname = "nm_setting_wired_error_quark")]
 	public static GLib.Quark setting_wired_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_wireless_error_quark")]
+	[CCode (cheader_filename = "nm-setting-wireless.h", cname = "nm_setting_wireless_error_quark")]
 	public static GLib.Quark setting_wireless_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_setting_wireless_security_error_quark")]
+	[CCode (cheader_filename = "nm-setting-wireless-security.h", cname = "nm_setting_wireless_security_error_quark")]
 	public static GLib.Quark setting_wireless_security_error_quark ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_deinit")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_deinit")]
 	public static void utils_deinit ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_escape_ssid")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_escape_ssid")]
 	public static unowned string utils_escape_ssid (uint8 ssid, uint32 len);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_gvalue_hash_dup")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_gvalue_hash_dup")]
 	public static GLib.HashTable<weak string,weak GLib.Value?> utils_gvalue_hash_dup (GLib.HashTable<void*,void*> hash);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_hwaddr_atoba")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_atoba")]
 	public static GLib.ByteArray utils_hwaddr_atoba (string asc, int type);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_hwaddr_aton")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_aton")]
 	public static uint8 utils_hwaddr_aton (string asc, int type, void* buffer);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_hwaddr_len")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_len")]
 	public static int utils_hwaddr_len (int type);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_hwaddr_ntoa")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_ntoa")]
 	public static string utils_hwaddr_ntoa (void* addr, int type);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_hwaddr_type")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_hwaddr_type")]
 	public static int utils_hwaddr_type (int len);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_init")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_init")]
 	public static bool utils_init () throws GLib.Error;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_addresses_from_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_addresses_from_gvalue")]
 	public static GLib.SList<NM.IP4Address> utils_ip4_addresses_from_gvalue (GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_addresses_to_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_addresses_to_gvalue")]
 	public static void utils_ip4_addresses_to_gvalue (GLib.SList<NM.IP4Address> list, GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_get_default_prefix")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_get_default_prefix")]
 	public static uint32 utils_ip4_get_default_prefix (uint32 ip);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_netmask_to_prefix")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_netmask_to_prefix")]
 	public static uint32 utils_ip4_netmask_to_prefix (uint32 netmask);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_prefix_to_netmask")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_prefix_to_netmask")]
 	public static uint32 utils_ip4_prefix_to_netmask (uint32 prefix);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_routes_from_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_routes_from_gvalue")]
 	public static GLib.SList<NM.IP4Route> utils_ip4_routes_from_gvalue (GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip4_routes_to_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip4_routes_to_gvalue")]
 	public static void utils_ip4_routes_to_gvalue (GLib.SList<NM.IP4Route> list, GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip6_addresses_from_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_addresses_from_gvalue")]
 	public static GLib.SList<NM.IP6Address> utils_ip6_addresses_from_gvalue (GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip6_addresses_to_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_addresses_to_gvalue")]
 	public static void utils_ip6_addresses_to_gvalue (GLib.SList<NM.IP6Address> list, GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip6_routes_from_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_routes_from_gvalue")]
 	public static GLib.SList<NM.IP6Route> utils_ip6_routes_from_gvalue (GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ip6_routes_to_gvalue")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ip6_routes_to_gvalue")]
 	public static void utils_ip6_routes_to_gvalue (GLib.SList<NM.IP6Route> list, GLib.Value value);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_is_empty_ssid")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_is_empty_ssid")]
 	public static bool utils_is_empty_ssid (uint8 ssid, int len);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_rsa_key_encrypt")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_rsa_key_encrypt")]
 	public static GLib.ByteArray utils_rsa_key_encrypt (GLib.ByteArray data, string? in_password, out string out_password) throws GLib.Error;
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_same_ssid")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_same_ssid")]
 	public static bool utils_same_ssid (GLib.ByteArray ssid1, GLib.ByteArray ssid2, bool ignore_trailing_null);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_security_valid")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_security_valid")]
 	public static bool utils_security_valid (NM.UtilsSecurityType type, NM.DeviceWifiCapabilities wifi_caps, bool have_ap, bool adhoc, NM.80211ApFlags ap_flags, NM.80211ApSecurityFlags ap_wpa, NM.80211ApSecurityFlags ap_rsn);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_ssid_to_utf8")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_ssid_to_utf8")]
 	public static string utils_ssid_to_utf8 (GLib.ByteArray ssid);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_uuid_generate")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_uuid_generate")]
 	public static string utils_uuid_generate ();
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_uuid_generate_from_string")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_uuid_generate_from_string")]
 	public static string utils_uuid_generate_from_string (string s);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_wifi_channel_to_freq")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_channel_to_freq")]
 	public static uint32 utils_wifi_channel_to_freq (uint32 channel, string band);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_wifi_find_next_channel")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_find_next_channel")]
 	public static uint32 utils_wifi_find_next_channel (uint32 channel, int direction, string band);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_wifi_freq_to_channel")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_freq_to_channel")]
 	public static uint32 utils_wifi_freq_to_channel (uint32 freq);
-	[CCode (cheader_filename = "NetworkManager-1.0.h", cname = "nm_utils_wifi_is_channel_valid")]
+	[CCode (cheader_filename = "nm-utils.h", cname = "nm_utils_wifi_is_channel_valid")]
 	public static bool utils_wifi_is_channel_valid (uint32 channel, string band);
 }
diff --git a/vapi/metadata/NMClient-1.0.metadata b/vapi/metadata/NMClient-1.0.metadata
index 28560bb..e8c513b 100644
--- a/vapi/metadata/NMClient-1.0.metadata
+++ b/vapi/metadata/NMClient-1.0.metadata
@@ -1,3 +1,194 @@
+RemoteSettings.new_async skip
 RemoteConnection.updated#virtual_method skip
 Client.new_async skip
-RemoteSettings.new_async skip
+
+ACCESS_POINT_BSSID cheader_filename="nm-access-point.h"
+ACCESS_POINT_FLAGS cheader_filename="nm-access-point.h"
+ACCESS_POINT_FREQUENCY cheader_filename="nm-access-point.h"
+ACCESS_POINT_HW_ADDRESS cheader_filename="nm-access-point.h"
+ACCESS_POINT_MAX_BITRATE cheader_filename="nm-access-point.h"
+ACCESS_POINT_MODE cheader_filename="nm-access-point.h"
+ACCESS_POINT_RSN_FLAGS cheader_filename="nm-access-point.h"
+ACCESS_POINT_SSID cheader_filename="nm-access-point.h"
+ACCESS_POINT_STRENGTH cheader_filename="nm-access-point.h"
+ACCESS_POINT_WPA_FLAGS cheader_filename="nm-access-point.h"
+ACTIVE_CONNECTION_CONNECTION cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_DEFAULT cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_DEFAULT6 cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_DEVICES cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_MASTER cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_SPECIFIC_OBJECT cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_STATE cheader_filename="nm-active-connection.h"
+ACTIVE_CONNECTION_UUID cheader_filename="nm-active-connection.h"
+CLIENT_ACTIVE_CONNECTIONS cheader_filename="nm-client.h"
+CLIENT_MANAGER_RUNNING cheader_filename="nm-client.h"
+CLIENT_NETWORKING_ENABLED cheader_filename="nm-client.h"
+CLIENT_STATE cheader_filename="nm-client.h"
+CLIENT_VERSION cheader_filename="nm-client.h"
+CLIENT_WIMAX_ENABLED cheader_filename="nm-client.h"
+CLIENT_WIMAX_HARDWARE_ENABLED cheader_filename="nm-client.h"
+CLIENT_WIRELESS_ENABLED cheader_filename="nm-client.h"
+CLIENT_WIRELESS_HARDWARE_ENABLED cheader_filename="nm-client.h"
+CLIENT_WWAN_ENABLED cheader_filename="nm-client.h"
+CLIENT_WWAN_HARDWARE_ENABLED cheader_filename="nm-client.h"
+DEVICE_ACTIVE_CONNECTION cheader_filename="nm-device.h"
+DEVICE_ADSL_CARRIER cheader_filename="nm-device-adsl.h"
+DEVICE_AUTOCONNECT cheader_filename="nm-device.h"
+DEVICE_BOND_CARRIER cheader_filename="nm-device-bond.h"
+DEVICE_BOND_HW_ADDRESS cheader_filename="nm-device-bond.h"
+DEVICE_BT_CAPABILITIES cheader_filename="nm-device-bt.h"
+DEVICE_BT_HW_ADDRESS cheader_filename="nm-device-bt.h"
+DEVICE_BT_NAME cheader_filename="nm-device-bt.h"
+DEVICE_CAPABILITIES cheader_filename="nm-device.h"
+DEVICE_DEVICE_TYPE cheader_filename="nm-device.h"
+DEVICE_DHCP4_CONFIG cheader_filename="nm-device.h"
+DEVICE_DHCP6_CONFIG cheader_filename="nm-device.h"
+DEVICE_DRIVER cheader_filename="nm-device.h"
+DEVICE_ETHERNET_CARRIER cheader_filename="nm-device-ethernet.h"
+DEVICE_ETHERNET_HW_ADDRESS cheader_filename="nm-device-ethernet.h"
+DEVICE_ETHERNET_PERMANENT_HW_ADDRESS cheader_filename="nm-device-ethernet.h"
+DEVICE_ETHERNET_SPEED cheader_filename="nm-device-ethernet.h"
+DEVICE_FIRMWARE_MISSING cheader_filename="nm-device.h"
+DEVICE_INFINIBAND_CARRIER cheader_filename="nm-device-infiniband.h"
+DEVICE_INFINIBAND_HW_ADDRESS cheader_filename="nm-device-infiniband.h"
+DEVICE_INTERFACE cheader_filename="nm-device.h"
+DEVICE_IP4_CONFIG cheader_filename="nm-device.h"
+DEVICE_IP6_CONFIG cheader_filename="nm-device.h"
+DEVICE_IP_INTERFACE cheader_filename="nm-device.h"
+DEVICE_MANAGED cheader_filename="nm-device.h"
+DEVICE_MODEM_CURRENT_CAPABILITIES cheader_filename="nm-device-modem.h"
+DEVICE_MODEM_MODEM_CAPABILITIES cheader_filename="nm-device-modem.h"
+DEVICE_OLPC_MESH_ACTIVE_CHANNEL cheader_filename="nm-device-olpc-mesh.h"
+DEVICE_OLPC_MESH_COMPANION cheader_filename="nm-device-olpc-mesh.h"
+DEVICE_OLPC_MESH_HW_ADDRESS cheader_filename="nm-device-olpc-mesh.h"
+DEVICE_PRODUCT cheader_filename="nm-device.h"
+DEVICE_STATE cheader_filename="nm-device.h"
+DEVICE_STATE_REASON cheader_filename="nm-device.h"
+DEVICE_UDI cheader_filename="nm-device.h"
+DEVICE_VENDOR cheader_filename="nm-device.h"
+DEVICE_VLAN_CARRIER cheader_filename="nm-device-vlan.h"
+DEVICE_VLAN_HW_ADDRESS cheader_filename="nm-device-vlan.h"
+DEVICE_VLAN_VLAN_ID cheader_filename="nm-device-vlan.h"
+DEVICE_WIFI_ACTIVE_ACCESS_POINT cheader_filename="nm-device-wifi.h"
+DEVICE_WIFI_BITRATE cheader_filename="nm-device-wifi.h"
+DEVICE_WIFI_CAPABILITIES cheader_filename="nm-device-wifi.h"
+DEVICE_WIFI_HW_ADDRESS cheader_filename="nm-device-wifi.h"
+DEVICE_WIFI_MODE cheader_filename="nm-device-wifi.h"
+DEVICE_WIFI_PERMANENT_HW_ADDRESS cheader_filename="nm-device-wifi.h"
+DEVICE_WIMAX_ACTIVE_NSP cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_BSID cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_CENTER_FREQUENCY cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_CINR cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_HW_ADDRESS cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_RSSI cheader_filename="nm-device-wimax.h"
+DEVICE_WIMAX_TX_POWER cheader_filename="nm-device-wimax.h"
+DHCP4_CONFIG_OPTIONS cheader_filename="nm-dhcp4-config.h"
+DHCP6_CONFIG_OPTIONS cheader_filename="nm-dhcp6-config.h"
+IP4_CONFIG_ADDRESSES cheader_filename="nm-ip4-config.h"
+IP4_CONFIG_DOMAINS cheader_filename="nm-ip4-config.h"
+IP4_CONFIG_NAMESERVERS cheader_filename="nm-ip4-config.h"
+IP4_CONFIG_ROUTES cheader_filename="nm-ip4-config.h"
+IP4_CONFIG_WINS_SERVERS cheader_filename="nm-ip4-config.h"
+IP6_CONFIG_ADDRESSES cheader_filename="nm-ip6-config.h"
+IP6_CONFIG_DOMAINS cheader_filename="nm-ip6-config.h"
+IP6_CONFIG_NAMESERVERS cheader_filename="nm-ip6-config.h"
+IP6_CONFIG_ROUTES cheader_filename="nm-ip6-config.h"
+OBJECT_DBUS_CONNECTION cheader_filename="nm-object.h"
+OBJECT_DBUS_PATH cheader_filename="nm-object.h"
+REMOTE_CONNECTION_REMOVED cheader_filename="nm-remote-connection.h"
+REMOTE_CONNECTION_UPDATED cheader_filename="nm-remote-connection.h"
+REMOTE_SETTINGS_BUS cheader_filename="nm-remote-settings.h"
+REMOTE_SETTINGS_CAN_MODIFY cheader_filename="nm-remote-settings.h"
+REMOTE_SETTINGS_CONNECTIONS_READ cheader_filename="nm-remote-settings.h"
+REMOTE_SETTINGS_HOSTNAME cheader_filename="nm-remote-settings.h"
+REMOTE_SETTINGS_NEW_CONNECTION cheader_filename="nm-remote-settings.h"
+REMOTE_SETTINGS_SERVICE_RUNNING cheader_filename="nm-remote-settings.h"
+SECRET_AGENT_AUTO_REGISTER cheader_filename="nm-secret-agent.h"
+SECRET_AGENT_IDENTIFIER cheader_filename="nm-secret-agent.h"
+SECRET_AGENT_REGISTERED cheader_filename="nm-secret-agent.h"
+SECRET_AGENT_REGISTRATION_RESULT cheader_filename="nm-secret-agent.h"
+VPN_CONNECTION_BANNER cheader_filename="nm-vpn-connection.h"
+VPN_CONNECTION_VPN_STATE cheader_filename="nm-vpn-connection.h"
+WIMAX_NSP_NAME cheader_filename="nm-wimax-nsp.h"
+WIMAX_NSP_NETWORK_TYPE cheader_filename="nm-wimax-nsp.h"
+WIMAX_NSP_SIGNAL_QUALITY cheader_filename="nm-wimax-nsp.h"
+
+
+AccessPoint cheader_filename="nm-access-point.h"
+ActiveConnection cheader_filename="nm-active-connection.h"
+Client cheader_filename="nm-client.h"
+DHCP4Config cheader_filename="nm-dhcp4-config.h"
+DHCP6Config cheader_filename="nm-dhcp6-config.h"
+Device cheader_filename="nm-device.h"
+DeviceAdsl cheader_filename="nm-device-adsl.h"
+DeviceBond cheader_filename="nm-device-bond.h"
+DeviceBt cheader_filename="nm-device-bt.h"
+DeviceEthernet cheader_filename="nm-device-ethernet.h"
+DeviceInfiniband cheader_filename="nm-device-infiniband.h"
+DeviceModem cheader_filename="nm-device-modem.h"
+DeviceOlpcMesh cheader_filename="nm-device-olpc-mesh.h"
+DeviceVlan cheader_filename="nm-device-vlan.h"
+DeviceWifi cheader_filename="nm-device-wifi.h"
+DeviceWimax cheader_filename="nm-device-wimax.h"
+IP4Config cheader_filename="nm-ip4-config.h"
+IP6AddressArray cheader_filename="nm-types.h"
+IP6AddressObjectArray cheader_filename="nm-types.h"
+IP6Config cheader_filename="nm-ip6-config.h"
+IP6RouteObjectArray cheader_filename="nm-types.h"
+ObjectArray cheader_filename="nm-types.h"
+RemoteConnection cheader_filename="nm-remote-connection.h"
+RemoteSettings cheader_filename="nm-remote-settings.h"
+Ssid cheader_filename="nm-types.h"
+StringArray cheader_filename="nm-types.h"
+UintArray cheader_filename="nm-types.h"
+VPNConnection cheader_filename="nm-vpn-connection.h"
+WimaxNsp cheader_filename="nm-wimax-nsp.h"
+
+
+ClientPermission cheader_filename="nm-client.h"
+ClientPermissionResult cheader_filename="nm-client.h"
+DeviceAdslError cheader_filename="nm-device-adsl.h"
+DeviceBondError cheader_filename="nm-device-bond.h"
+DeviceBtError cheader_filename="nm-device-bt.h"
+DeviceEthernetError cheader_filename="nm-device-ethernet.h"
+DeviceInfinibandError cheader_filename="nm-device-infiniband.h"
+DeviceModemError cheader_filename="nm-device-modem.h"
+DeviceOlpcMeshError cheader_filename="nm-device-olpc-mesh.h"
+DeviceVlanError cheader_filename="nm-device-vlan.h"
+DeviceWifiError cheader_filename="nm-device-wifi.h"
+DeviceWimaxError cheader_filename="nm-device-wimax.h"
+ObjectError cheader_filename="nm-object.h"
+RemoteSettingsError cheader_filename="nm-remote-settings.h"
+SecretAgentError cheader_filename="nm-secret-agent.h"
+SecretAgentGetSecretsFlags cheader_filename="nm-secret-agent.h"
+WimaxNspNetworkType cheader_filename="nm-wimax-nsp.h"
+
+ClientActivateFn cheader_filename="nm-client.h"
+ClientAddActivateFn cheader_filename="nm-client.h"
+DeviceDeactivateFn cheader_filename="nm-device.h"
+RemoteConnectionCommitFunc cheader_filename="nm-remote-connection.h"
+RemoteConnectionDeleteFunc cheader_filename="nm-remote-connection.h"
+RemoteConnectionGetSecretsFunc cheader_filename="nm-remote-connection.h"
+RemoteSettingsAddConnectionFunc cheader_filename="nm-remote-settings.h"
+RemoteSettingsSaveHostnameFunc cheader_filename="nm-remote-settings.h"
+SecretAgentDeleteSecretsFunc cheader_filename="nm-secret-agent.h"
+SecretAgentGetSecretsFunc cheader_filename="nm-secret-agent.h"
+SecretAgentSaveSecretsFunc cheader_filename="nm-secret-agent.h"
+
+
+device_adsl_error_quark cheader_filename="nm-device-adsl.h"
+device_bond_error_quark cheader_filename="nm-device-bond.h"
+device_bt_error_quark cheader_filename="nm-device-bt.h"
+device_ethernet_error_quark cheader_filename="nm-device-ethernet.h"
+device_infiniband_error_quark cheader_filename="nm-device-infiniband.h"
+device_modem_error_quark cheader_filename="nm-device-modem.h"
+device_olpc_mesh_error_quark cheader_filename="nm-device-olpc-mesh.h"
+device_vlan_error_quark cheader_filename="nm-device-vlan.h"
+device_wifi_error_quark cheader_filename="nm-device-wifi.h"
+device_wimax_error_quark cheader_filename="nm-device-wimax.h"
+object_error_quark cheader_filename="nm-object.h"
+remote_settings_error_quark cheader_filename="nm-remote-settings.h"
+secret_agent_error_quark cheader_filename="nm-secret-agent.h"
+
+Object cheader_filename="nm-object.h"
+SecretAgent cheader_filename="nm-secret-agent.h"
diff --git a/vapi/metadata/NetworkManager-1.0.metadata b/vapi/metadata/NetworkManager-1.0.metadata
index 4680440..d74a447 100644
--- a/vapi/metadata/NetworkManager-1.0.metadata
+++ b/vapi/metadata/NetworkManager-1.0.metadata
@@ -1,2 +1,444 @@
 Setting.get_secret_flags#virtual_method skip
 Setting.set_secret_flags#virtual_method skip
+
+Connection cheader_filename="nm-connection.h"
+IP4Address cheader_filename="nm-setting-ip4-config.h"
+IP4Route cheader_filename="nm-setting-ip4-config.h"
+IP6Address cheader_filename="nm-setting-ip6-config.h"
+IP6Route cheader_filename="nm-setting-ip6-config.h"
+Setting8021x cheader_filename="nm-setting-8021x.h"
+SettingAdsl cheader_filename="nm-setting-adsl.h"
+SettingBluetooth cheader_filename="nm-setting-bluetooth.h"
+SettingBond cheader_filename="nm-setting-bond.h"
+SettingCdma cheader_filename="nm-setting-cdma.h"
+SettingConnection cheader_filename="nm-setting-connection.h"
+SettingGsm cheader_filename="nm-setting-gsm.h"
+SettingIP4Config cheader_filename="nm-setting-ip4-config.h"
+SettingIP6Config cheader_filename="nm-setting-ip6-config.h"
+SettingInfiniband cheader_filename="nm-setting-infiniband.h"
+SettingOlpcMesh cheader_filename="nm-setting-olpc-mesh.h"
+SettingPPP cheader_filename="nm-setting-ppp.h"
+SettingPPPOE cheader_filename="nm-setting-pppoe.h"
+SettingSerial cheader_filename="nm-setting-serial.h"
+SettingVPN cheader_filename="nm-setting-vpn.h"
+SettingVlan cheader_filename="nm-setting-vlan.h"
+SettingWimax cheader_filename="nm-setting-wimax.h"
+SettingWired cheader_filename="nm-setting-wired.h"
+SettingWireless cheader_filename="nm-setting-wireless.h"
+SettingWirelessSecurity cheader_filename="nm-setting-wireless-security.h"
+
+Setting cheader_filename="nm-setting.h"
+
+80211ApFlags cheader_filename="NetworkManager.h"
+80211ApSecurityFlags cheader_filename="NetworkManager.h"
+80211Mode cheader_filename="NetworkManager.h"
+ActiveConnectionState cheader_filename="NetworkManager.h"
+BluetoothCapabilities cheader_filename="NetworkManager.h"
+ConnectionError cheader_filename="nm-connection.h"
+DeviceCapabilities cheader_filename="NetworkManager.h"
+DeviceModemCapabilities cheader_filename="NetworkManager.h"
+DeviceState cheader_filename="NetworkManager.h"
+DeviceStateReason cheader_filename="NetworkManager.h"
+DeviceType cheader_filename="NetworkManager.h"
+DeviceWifiCapabilities cheader_filename="NetworkManager.h"
+Setting8021xCKFormat cheader_filename="nm-setting-8021x.h"
+Setting8021xCKScheme cheader_filename="nm-setting-8021x.h"
+Setting8021xError cheader_filename="nm-setting-8021x.h"
+SettingAdslError cheader_filename="nm-setting-adsl.h"
+SettingBluetoothError cheader_filename="nm-setting-bluetooth.h"
+SettingBondError cheader_filename="nm-setting-bond.h"
+SettingCdmaError cheader_filename="nm-setting-cdma.h"
+SettingCompareFlags cheader_filename="nm-setting.h"
+SettingConnectionError cheader_filename="nm-setting-connection.h"
+SettingDiffResult cheader_filename="nm-setting.h"
+SettingError cheader_filename="nm-setting.h"
+SettingGsmError cheader_filename="nm-setting-gsm.h"
+SettingGsmNetworkBand cheader_filename="nm-setting-gsm.h"
+SettingGsmNetworkType cheader_filename="nm-setting-gsm.h"
+SettingHashFlags cheader_filename="nm-setting.h"
+SettingIP4ConfigError cheader_filename="nm-setting-ip4-config.h"
+SettingIP6ConfigError cheader_filename="nm-setting-ip6-config.h"
+SettingIP6ConfigPrivacy cheader_filename="nm-setting-ip6-config.h"
+SettingInfinibandError cheader_filename="nm-setting-infiniband.h"
+SettingOlpcMeshError cheader_filename="nm-setting-olpc-mesh.h"
+SettingPPPError cheader_filename="nm-setting-ppp.h"
+SettingPPPOEError cheader_filename="nm-setting-pppoe.h"
+SettingSecretFlags cheader_filename="nm-setting.h"
+SettingSerialError cheader_filename="nm-setting-serial.h"
+SettingVlanError cheader_filename="nm-setting-vlan.h"
+SettingVpnError cheader_filename="nm-setting-vpn.h"
+SettingWimaxError cheader_filename="nm-setting-wimax.h"
+SettingWiredError cheader_filename="nm-setting-wired.h"
+SettingWirelessError cheader_filename="nm-setting-wireless.h"
+SettingWirelessSecurityError cheader_filename="nm-setting-wireless-security.h"
+State cheader_filename="NetworkManager.h"
+UtilsSecurityType cheader_filename="nm-utils.h"
+VPNConnectionState cheader_filename="NetworkManagerVPN.h"
+VPNConnectionStateReason cheader_filename="NetworkManagerVPN.h"
+VPNPluginFailure cheader_filename="NetworkManagerVPN.h"
+VPNServiceState cheader_filename="NetworkManagerVPN.h"
+VlanFlags cheader_filename="nm-setting-vlan.h"
+VlanPriorityMap cheader_filename="nm-setting-vlan.h"
+WepKeyType cheader_filename="nm-setting-wireless-security.h"
+
+SettingClearSecretsWithFlagsFn cheader_filename="nm-setting.h"
+SettingValueIterFn             cheader_filename="nm-setting.h"
+VPNIterFunc                    cheader_filename="nm-setting-vpn.h"
+
+CONNECTION_PATH cheader_filename="nm-connection.h"
+DBUS_IFACE_SETTINGS cheader_filename="NetworkManager.h"
+DBUS_IFACE_SETTINGS_CONNECTION cheader_filename="NetworkManager.h"
+DBUS_IFACE_SETTINGS_CONNECTION_SECRETS cheader_filename="NetworkManager.h"
+DBUS_INTERFACE cheader_filename="NetworkManager.h"
+DBUS_INTERFACE_VPN cheader_filename="NetworkManagerVPN.h"
+DBUS_INTERFACE_VPN_CONNECTION cheader_filename="NetworkManagerVPN.h"
+DBUS_INVALID_VPN_CONNECTION cheader_filename="NetworkManagerVPN.h"
+DBUS_NO_ACTIVE_VPN_CONNECTION cheader_filename="NetworkManagerVPN.h"
+DBUS_NO_VPN_CONNECTIONS cheader_filename="NetworkManagerVPN.h"
+DBUS_PATH cheader_filename="NetworkManager.h"
+DBUS_PATH_AGENT_MANAGER cheader_filename="NetworkManager.h"
+DBUS_PATH_SECRET_AGENT cheader_filename="NetworkManager.h"
+DBUS_PATH_SETTINGS cheader_filename="NetworkManager.h"
+DBUS_PATH_SETTINGS_CONNECTION cheader_filename="NetworkManager.h"
+DBUS_PATH_VPN cheader_filename="NetworkManagerVPN.h"
+DBUS_PATH_VPN_CONNECTION cheader_filename="NetworkManagerVPN.h"
+DBUS_SERVICE cheader_filename="NetworkManager.h"
+DBUS_VPN_ALREADY_STARTED cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_ALREADY_STOPPED cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_BAD_ARGUMENTS cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_CONNECT_FAILED cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_IP4_CONFIG cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_IP_CONFIG_BAD cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_LAUNCH_FAILED cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_LOGIN_BANNER cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_LOGIN_FAILED cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_STATE_CHANGE cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_SIGNAL_VPN_CONFIG_BAD cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_STARTING_IN_PROGRESS cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_STOPPING_IN_PROGRESS cheader_filename="NetworkManagerVPN.h"
+DBUS_VPN_WRONG_STATE cheader_filename="NetworkManagerVPN.h"
+SETTING_802_1X_ALTSUBJECT_MATCHES cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_ANONYMOUS_IDENTITY cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_CA_CERT cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_CA_PATH cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_CLIENT_CERT cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_EAP cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_IDENTITY cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PAC_FILE cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PASSWORD cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PASSWORD_FLAGS cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PASSWORD_RAW cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PASSWORD_RAW_FLAGS cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE1_FAST_PROVISIONING cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE1_PEAPLABEL cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE1_PEAPVER cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_AUTH cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_AUTHEAP cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_CA_CERT cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_CA_PATH cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_CLIENT_CERT cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_PRIVATE_KEY cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PHASE2_SUBJECT_MATCH cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PIN cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PIN_FLAGS cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PRIVATE_KEY cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PRIVATE_KEY_PASSWORD cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_SETTING_NAME cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_SUBJECT_MATCH cheader_filename="nm-setting-8021x.h"
+SETTING_802_1X_SYSTEM_CA_CERTS cheader_filename="nm-setting-8021x.h"
+SETTING_ADSL_ENCAPSULATION cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_ENCAPSULATION_LLC cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_ENCAPSULATION_VCMUX cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PASSWORD cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PASSWORD_FLAGS cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PROTOCOL cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PROTOCOL_IPOATM cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PROTOCOL_PPPOA cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_PROTOCOL_PPPOE cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_SETTING_NAME cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_USERNAME cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_VCI cheader_filename="nm-setting-adsl.h"
+SETTING_ADSL_VPI cheader_filename="nm-setting-adsl.h"
+SETTING_BLUETOOTH_BDADDR cheader_filename="nm-setting-bluetooth.h"
+SETTING_BLUETOOTH_SETTING_NAME cheader_filename="nm-setting-bluetooth.h"
+SETTING_BLUETOOTH_TYPE cheader_filename="nm-setting-bluetooth.h"
+SETTING_BLUETOOTH_TYPE_DUN cheader_filename="nm-setting-bluetooth.h"
+SETTING_BLUETOOTH_TYPE_PANU cheader_filename="nm-setting-bluetooth.h"
+SETTING_BOND_INTERFACE_NAME cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTIONS cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_ARP_INTERVAL cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_ARP_IP_TARGET cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_DOWNDELAY cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_MIIMON cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_MODE cheader_filename="nm-setting-bond.h"
+SETTING_BOND_OPTION_UPDELAY cheader_filename="nm-setting-bond.h"
+SETTING_BOND_SETTING_NAME cheader_filename="nm-setting-bond.h"
+SETTING_CDMA_NUMBER cheader_filename="nm-setting-cdma.h"
+SETTING_CDMA_PASSWORD cheader_filename="nm-setting-cdma.h"
+SETTING_CDMA_PASSWORD_FLAGS cheader_filename="nm-setting-cdma.h"
+SETTING_CDMA_SETTING_NAME cheader_filename="nm-setting-cdma.h"
+SETTING_CDMA_USERNAME cheader_filename="nm-setting-cdma.h"
+SETTING_CONNECTION_AUTOCONNECT cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ID cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_MASTER cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_PERMISSIONS cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_READ_ONLY cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_SETTING_NAME cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_SLAVE_TYPE cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_TIMESTAMP cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_TYPE cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_UUID cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE_BLOCK cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE_HOME cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE_PUBLIC cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE_TRUSTED cheader_filename="nm-setting-connection.h"
+SETTING_CONNECTION_ZONE_WORK cheader_filename="nm-setting-connection.h"
+SETTING_GSM_ALLOWED_BANDS cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_APN cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_HOME_ONLY cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_NETWORK_ID cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_NETWORK_TYPE cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_NUMBER cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_PASSWORD cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_PASSWORD_FLAGS cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_PIN cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_PIN_FLAGS cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_SETTING_NAME cheader_filename="nm-setting-gsm.h"
+SETTING_GSM_USERNAME cheader_filename="nm-setting-gsm.h"
+SETTING_INFINIBAND_MAC_ADDRESS cheader_filename="nm-setting-infiniband.h"
+SETTING_INFINIBAND_MTU cheader_filename="nm-setting-infiniband.h"
+SETTING_INFINIBAND_SETTING_NAME cheader_filename="nm-setting-infiniband.h"
+SETTING_INFINIBAND_TRANSPORT_MODE cheader_filename="nm-setting-infiniband.h"
+SETTING_IP4_CONFIG_ADDRESSES cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_DHCP_CLIENT_ID cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_DHCP_HOSTNAME cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_DNS cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_DNS_SEARCH cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_IGNORE_AUTO_DNS cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_MAY_FAIL cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD_AUTO cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD_DISABLED cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD_LINK_LOCAL cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD_MANUAL cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_METHOD_SHARED cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_NEVER_DEFAULT cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_ROUTES cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP4_CONFIG_SETTING_NAME cheader_filename="nm-setting-ip4-config.h"
+SETTING_IP6_CONFIG_ADDRESSES cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_DNS cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_DNS_SEARCH cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_IGNORE_AUTO_DNS cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_IP6_PRIVACY cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_MAY_FAIL cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_AUTO cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_DHCP cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_IGNORE cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_LINK_LOCAL cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_MANUAL cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_METHOD_SHARED cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_NEVER_DEFAULT cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_ROUTES cheader_filename="nm-setting-ip6-config.h"
+SETTING_IP6_CONFIG_SETTING_NAME cheader_filename="nm-setting-ip6-config.h"
+SETTING_NAME cheader_filename="nm-setting.h"
+SETTING_OLPC_MESH_CHANNEL cheader_filename="nm-setting-olpc-mesh.h"
+SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS cheader_filename="nm-setting-olpc-mesh.h"
+SETTING_OLPC_MESH_SETTING_NAME cheader_filename="nm-setting-olpc-mesh.h"
+SETTING_OLPC_MESH_SSID cheader_filename="nm-setting-olpc-mesh.h"
+SETTING_PPPOE_PASSWORD cheader_filename="nm-setting-pppoe.h"
+SETTING_PPPOE_PASSWORD_FLAGS cheader_filename="nm-setting-pppoe.h"
+SETTING_PPPOE_SERVICE cheader_filename="nm-setting-pppoe.h"
+SETTING_PPPOE_SETTING_NAME cheader_filename="nm-setting-pppoe.h"
+SETTING_PPPOE_USERNAME cheader_filename="nm-setting-pppoe.h"
+SETTING_PPP_BAUD cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_CRTSCTS cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_LCP_ECHO_FAILURE cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_LCP_ECHO_INTERVAL cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_MPPE_STATEFUL cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_MRU cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_MTU cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_NOAUTH cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_NOBSDCOMP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_NODEFLATE cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_NO_VJ_COMP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REFUSE_CHAP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REFUSE_EAP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REFUSE_MSCHAP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REFUSE_MSCHAPV2 cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REFUSE_PAP cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REQUIRE_MPPE cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_REQUIRE_MPPE_128 cheader_filename="nm-setting-ppp.h"
+SETTING_PPP_SETTING_NAME cheader_filename="nm-setting-ppp.h"
+SETTING_SERIAL_BAUD cheader_filename="nm-setting-serial.h"
+SETTING_SERIAL_BITS cheader_filename="nm-setting-serial.h"
+SETTING_SERIAL_PARITY cheader_filename="nm-setting-serial.h"
+SETTING_SERIAL_SEND_DELAY cheader_filename="nm-setting-serial.h"
+SETTING_SERIAL_SETTING_NAME cheader_filename="nm-setting-serial.h"
+SETTING_SERIAL_STOPBITS cheader_filename="nm-setting-serial.h"
+SETTING_VLAN_EGRESS_PRIORITY_MAP cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_FLAGS cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_ID cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_INGRESS_PRIORITY_MAP cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_INTERFACE_NAME cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_PARENT cheader_filename="nm-setting-vlan.h"
+SETTING_VLAN_SETTING_NAME cheader_filename="nm-setting-vlan.h"
+SETTING_VPN_DATA cheader_filename="nm-setting-vpn.h"
+SETTING_VPN_SECRETS cheader_filename="nm-setting-vpn.h"
+SETTING_VPN_SERVICE_TYPE cheader_filename="nm-setting-vpn.h"
+SETTING_VPN_SETTING_NAME cheader_filename="nm-setting-vpn.h"
+SETTING_VPN_USER_NAME cheader_filename="nm-setting-vpn.h"
+SETTING_WIMAX_MAC_ADDRESS cheader_filename="nm-setting-wimax.h"
+SETTING_WIMAX_NETWORK_NAME cheader_filename="nm-setting-wimax.h"
+SETTING_WIMAX_SETTING_NAME cheader_filename="nm-setting-wimax.h"
+SETTING_WIRED_AUTO_NEGOTIATE cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_CLONED_MAC_ADDRESS cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_DUPLEX cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_MAC_ADDRESS cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_MAC_ADDRESS_BLACKLIST cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_MTU cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_PORT cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_S390_NETTYPE cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_S390_OPTIONS cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_S390_SUBCHANNELS cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_SETTING_NAME cheader_filename="nm-setting-wired.h"
+SETTING_WIRED_SPEED cheader_filename="nm-setting-wired.h"
+SETTING_WIRELESS_BAND cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_BSSID cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_CHANNEL cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_CLONED_MAC_ADDRESS cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_HIDDEN cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MAC_ADDRESS cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MODE cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MODE_ADHOC cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MODE_INFRA cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_MTU cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_RATE cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_SEC cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_SECURITY_AUTH_ALG cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_GROUP cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_KEY_MGMT cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_LEAP_PASSWORD cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_LEAP_USERNAME cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_PAIRWISE cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_PROTO cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_PSK cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_PSK_FLAGS cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_SETTING_NAME cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY0 cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY1 cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY2 cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY3 cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX cheader_filename="nm-setting-wireless-security.h"
+SETTING_WIRELESS_SEEN_BSSIDS cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_SETTING_NAME cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_SSID cheader_filename="nm-setting-wireless.h"
+SETTING_WIRELESS_TX_POWER cheader_filename="nm-setting-wireless.h"
+VPN_DBUS_PLUGIN_INTERFACE cheader_filename="NetworkManagerVPN.h"
+VPN_DBUS_PLUGIN_PATH cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_BANNER cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_EXT_GATEWAY cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_HAS_IP4 cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_HAS_IP6 cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_MTU cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_CONFIG_TUNDEV cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_ADDRESS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_DNS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_DOMAIN cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_DOMAINS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_INT_GATEWAY cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_MSS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_NBNS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_NEVER_DEFAULT cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_PREFIX cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_PTP cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP4_CONFIG_ROUTES cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_ADDRESS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_DNS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_DOMAIN cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_DOMAINS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_INT_GATEWAY cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_MSS cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_PREFIX cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_PTP cheader_filename="NetworkManagerVPN.h"
+VPN_PLUGIN_IP6_CONFIG_ROUTES cheader_filename="NetworkManagerVPN.h"
+
+connection_error_quark cheader_filename="nm-connection.h"
+setting_802_1x_error_quark cheader_filename="nm-setting-8021x.h"
+setting_adsl_error_quark cheader_filename="nm-setting-adsl.h"
+setting_bluetooth_error_quark cheader_filename="nm-setting-bluetooth.h"
+setting_bond_error_quark cheader_filename="nm-setting-bond.h"
+setting_cdma_error_quark cheader_filename="nm-setting-cdma.h"
+setting_connection_error_quark cheader_filename="nm-setting-connection.h"
+setting_error_quark cheader_filename="nm-setting.h"
+setting_gsm_error_quark cheader_filename="nm-setting-gsm.h"
+setting_infiniband_error_quark cheader_filename="nm-setting-infiniband.h"
+setting_ip4_config_error_quark cheader_filename="nm-setting-ip4-config.h"
+setting_ip6_config_error_quark cheader_filename="nm-setting-ip6-config.h"
+setting_olpc_mesh_error_quark cheader_filename="nm-setting-olpc-mesh.h"
+setting_ppp_error_quark cheader_filename="nm-setting-ppp.h"
+setting_pppoe_error_quark cheader_filename="nm-setting-pppoe.h"
+setting_serial_error_quark cheader_filename="nm-setting-serial.h"
+setting_vlan_error_quark cheader_filename="nm-setting-vlan.h"
+setting_vpn_error_quark cheader_filename="nm-setting-vpn.h"
+setting_wimax_error_quark cheader_filename="nm-setting-wimax.h"
+setting_wired_error_quark cheader_filename="nm-setting-wired.h"
+setting_wireless_error_quark cheader_filename="nm-setting-wireless.h"
+setting_wireless_security_error_quark cheader_filename="nm-setting-wireless-security.h"
+
+utils_ip4_get_default_prefix cheader_filename="nm-utils.h"
+utils_ip4_netmask_to_prefix cheader_filename="nm-utils.h"
+utils_ip4_prefix_to_netmask cheader_filename="nm-utils.h"
+utils_wifi_channel_to_freq cheader_filename="nm-utils.h"
+utils_wifi_find_next_channel cheader_filename="nm-utils.h"
+utils_wifi_freq_to_channel cheader_filename="nm-utils.h"
+
+utils_hwaddr_ntoa cheader_filename="nm-utils.h"
+utils_ssid_to_utf8 cheader_filename="nm-utils.h"
+utils_uuid_generate cheader_filename="nm-utils.h"
+utils_uuid_generate_from_string cheader_filename="nm-utils.h"
+
+utils_escape_ssid cheader_filename="nm-utils.h"
+
+utils_deinit cheader_filename="nm-utils.h"
+utils_ip4_addresses_to_gvalue cheader_filename="nm-utils.h"
+utils_ip4_routes_to_gvalue cheader_filename="nm-utils.h"
+utils_ip6_addresses_to_gvalue cheader_filename="nm-utils.h"
+utils_ip6_routes_to_gvalue cheader_filename="nm-utils.h"
+
+utils_hwaddr_len cheader_filename="nm-utils.h"
+utils_hwaddr_type cheader_filename="nm-utils.h"
+
+utils_hwaddr_aton cheader_filename="nm-utils.h"
+
+utils_init cheader_filename="nm-utils.h"
+utils_is_empty_ssid cheader_filename="nm-utils.h"
+utils_same_ssid cheader_filename="nm-utils.h"
+utils_security_valid cheader_filename="nm-utils.h"
+utils_wifi_is_channel_valid cheader_filename="nm-utils.h"
+utils_hwaddr_atoba cheader_filename="nm-utils.h"
+utils_rsa_key_encrypt cheader_filename="nm-utils.h"
+utils_ip4_addresses_from_gvalue cheader_filename="nm-utils.h"
+utils_ip4_routes_from_gvalue cheader_filename="nm-utils.h"
+utils_ip6_addresses_from_gvalue cheader_filename="nm-utils.h"
+utils_ip6_routes_from_gvalue cheader_filename="nm-utils.h"
+
+utils_gvalue_hash_dup cheader_filename="nm-utils.h"
+SETTING_PARAM_FUZZY_IGNORE cheader_filename="nm-setting.h"
+SETTING_PARAM_REQUIRED cheader_filename="nm-setting.h"
+SETTING_PARAM_SECRET cheader_filename="nm-setting.h"
+SETTING_PARAM_SERIALIZE cheader_filename="nm-setting.h"
+UTILS_HWADDR_LEN_MAX cheader_filename="nm-utils.h"



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