all: rename the introspection data to use the interface paths in names

This makes it easier to install the files with proper names.
Also, it makes the makefile rules slightly simpler.

Lastly, the documentation is now generated into docs/api, which makes it
possible to get rid of the awkward relative file names in docbook.

.gitignore

@@ -87,6 +87,8 @@ test-*.trs
 /docs/api/NetworkManager.signals
 /docs/api/NetworkManager.types
 
+/docs/api/dbus-org.freedesktop.NetworkManager*.xml
+
 /docs/libnm-glib/*.stamp
 /docs/libnm-glib/html/
 /docs/libnm-glib/tmpl/
@@ -141,9 +143,7 @@ test-*.trs
 
 /shared/nm-version-macros.h
 
-/introspection/nmdbus-*.c
-/introspection/nmdbus-*.h
-/introspection/nmdbus-*.xml
+/introspection/org.freedesktop.NetworkManager*.[ch]
 
 /libgsystem/
 
@@ -272,7 +272,6 @@ test-*.trs
 
 /vapi/*.vapi
 
-
 # The following names are no longer present on this branch,
 # but they were on older versions. Thus keep ignoring them
 # otherwise when switching branches these untracked files show
@@ -297,3 +296,6 @@ test-*.trs
 /src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
 /src/settings/plugins/ifnet/tests/check_ifnet
 /src/supplicant-manager/tests/test-supplicant-config
+/introspection/nmdbus-*.c
+/introspection/nmdbus-*.h
+/introspection/nmdbus-*.xml

Makefile.am

@@ -171,175 +171,171 @@ noinst_LTLIBRARIES += \
 introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS))
 
 introspection_sources = \
-	introspection/nmdbus-access-point.c \
-	introspection/nmdbus-access-point.h \
-	introspection/nmdbus-active-connection.c \
-	introspection/nmdbus-active-connection.h \
-	introspection/nmdbus-agent-manager.c \
-	introspection/nmdbus-agent-manager.h \
-	introspection/nmdbus-checkpoint.c \
-	introspection/nmdbus-checkpoint.h \
-	introspection/nmdbus-device-adsl.c \
-	introspection/nmdbus-device-adsl.h \
-	introspection/nmdbus-device-bond.c \
-	introspection/nmdbus-device-bond.h \
-	introspection/nmdbus-device-bridge.c \
-	introspection/nmdbus-device-bridge.h \
-	introspection/nmdbus-device-bt.c \
-	introspection/nmdbus-device-bt.h \
-	introspection/nmdbus-device-ethernet.c \
-	introspection/nmdbus-device-ethernet.h \
-	introspection/nmdbus-device.c \
-	introspection/nmdbus-device.h \
-	introspection/nmdbus-device-generic.c \
-	introspection/nmdbus-device-generic.h \
-	introspection/nmdbus-device-infiniband.c \
-	introspection/nmdbus-device-infiniband.h \
-	introspection/nmdbus-device-ip-tunnel.c \
-	introspection/nmdbus-device-ip-tunnel.h \
-	introspection/nmdbus-device-macvlan.c \
-	introspection/nmdbus-device-macvlan.h \
-	introspection/nmdbus-device-modem.c \
-	introspection/nmdbus-device-modem.h \
-	introspection/nmdbus-device-olpc-mesh.c \
-	introspection/nmdbus-device-olpc-mesh.h \
-	introspection/nmdbus-device-statistics.c \
-	introspection/nmdbus-device-statistics.h \
-	introspection/nmdbus-device-team.c \
-	introspection/nmdbus-device-team.h \
-	introspection/nmdbus-device-tun.c \
-	introspection/nmdbus-device-tun.h \
-	introspection/nmdbus-device-veth.c \
-	introspection/nmdbus-device-veth.h \
-	introspection/nmdbus-device-vlan.c \
-	introspection/nmdbus-device-vlan.h \
-	introspection/nmdbus-device-vxlan.c \
-	introspection/nmdbus-device-vxlan.h \
-	introspection/nmdbus-device-wifi.c \
-	introspection/nmdbus-device-wifi.h \
-	introspection/nmdbus-device-wimax.c \
-	introspection/nmdbus-device-wimax.h \
-	introspection/nmdbus-dhcp4-config.c \
-	introspection/nmdbus-dhcp4-config.h \
-	introspection/nmdbus-dhcp6-config.c \
-	introspection/nmdbus-dhcp6-config.h \
-	introspection/nmdbus-ip4-config.c \
-	introspection/nmdbus-ip4-config.h \
-	introspection/nmdbus-ip6-config.c \
-	introspection/nmdbus-ip6-config.h \
-	introspection/nmdbus-manager.c \
-	introspection/nmdbus-manager.h \
-	introspection/nmdbus-ppp-manager.c \
-	introspection/nmdbus-ppp-manager.h \
-	introspection/nmdbus-secret-agent.c \
-	introspection/nmdbus-secret-agent.h \
-	introspection/nmdbus-settings-connection.c \
-	introspection/nmdbus-settings-connection.h \
-	introspection/nmdbus-settings.c \
-	introspection/nmdbus-settings.h \
-	introspection/nmdbus-vpn-connection.c \
-	introspection/nmdbus-vpn-connection.h \
-	introspection/nmdbus-vpn-plugin.c \
-	introspection/nmdbus-vpn-plugin.h
+	introspection/org.freedesktop.NetworkManager.AccessPoint.c \
+	introspection/org.freedesktop.NetworkManager.AccessPoint.h \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.c \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.h \
+	introspection/org.freedesktop.NetworkManager.AgentManager.c \
+	introspection/org.freedesktop.NetworkManager.AgentManager.h \
+	introspection/org.freedesktop.NetworkManager.Checkpoint.c \
+	introspection/org.freedesktop.NetworkManager.Checkpoint.h \
+	introspection/org.freedesktop.NetworkManager.Device.Adsl.c \
+	introspection/org.freedesktop.NetworkManager.Device.Adsl.h \
+	introspection/org.freedesktop.NetworkManager.Device.Bond.c \
+	introspection/org.freedesktop.NetworkManager.Device.Bond.h \
+	introspection/org.freedesktop.NetworkManager.Device.Bridge.c \
+	introspection/org.freedesktop.NetworkManager.Device.Bridge.h \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.c \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.c \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.h \
+	introspection/org.freedesktop.NetworkManager.Device.Generic.c \
+	introspection/org.freedesktop.NetworkManager.Device.Generic.h \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.c \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
+	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
+	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
+	introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
+	introspection/org.freedesktop.NetworkManager.Device.Macvlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.Modem.c \
+	introspection/org.freedesktop.NetworkManager.Device.Modem.h \
+	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.c \
+	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h \
+	introspection/org.freedesktop.NetworkManager.Device.Statistics.c \
+	introspection/org.freedesktop.NetworkManager.Device.Statistics.h \
+	introspection/org.freedesktop.NetworkManager.Device.Team.c \
+	introspection/org.freedesktop.NetworkManager.Device.Team.h \
+	introspection/org.freedesktop.NetworkManager.Device.Tun.c \
+	introspection/org.freedesktop.NetworkManager.Device.Tun.h \
+	introspection/org.freedesktop.NetworkManager.Device.Veth.c \
+	introspection/org.freedesktop.NetworkManager.Device.Veth.h \
+	introspection/org.freedesktop.NetworkManager.Device.Vlan.c \
+	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
+	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
+	introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
+	introspection/org.freedesktop.NetworkManager.Device.c \
+	introspection/org.freedesktop.NetworkManager.Device.h \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.h \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.c \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.h \
+	introspection/org.freedesktop.NetworkManager.IP4Config.c \
+	introspection/org.freedesktop.NetworkManager.IP4Config.h \
+	introspection/org.freedesktop.NetworkManager.IP6Config.c \
+	introspection/org.freedesktop.NetworkManager.IP6Config.h \
+	introspection/org.freedesktop.NetworkManager.c \
+	introspection/org.freedesktop.NetworkManager.h \
+	introspection/org.freedesktop.NetworkManager.PPP.c \
+	introspection/org.freedesktop.NetworkManager.PPP.h \
+	introspection/org.freedesktop.NetworkManager.SecretAgent.c \
+	introspection/org.freedesktop.NetworkManager.SecretAgent.h \
+	introspection/org.freedesktop.NetworkManager.Settings.Connection.c \
+	introspection/org.freedesktop.NetworkManager.Settings.Connection.h \
+	introspection/org.freedesktop.NetworkManager.Settings.c \
+	introspection/org.freedesktop.NetworkManager.Settings.h \
+	introspection/org.freedesktop.NetworkManager.VPN.Connection.c \
+	introspection/org.freedesktop.NetworkManager.VPN.Connection.h \
+	introspection/org.freedesktop.NetworkManager.VPN.Plugin.c \
+	introspection/org.freedesktop.NetworkManager.VPN.Plugin.h
 
 nodist_introspection_libnmdbus_la_SOURCES = $(introspection_sources)
 
 DBUS_INTERFACE_DOCS = \
-	introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
-	introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
-	introspection/nmdbus-checkpoint-org.freedesktop.NetworkManager.Checkpoint.xml \
-	introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
-	introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \
-	introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
-	introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
-	introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
-	introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
-	introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
-	introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
-	introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
-	introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
-	introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
-	introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
-	introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
-	introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
-	introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
-	introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml
+	docs/api/dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Checkpoint.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.PPP.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml
 
-define _make_nmdbus_rule
-$(1): $(patsubst introspection/nmdbus-%.c,introspection/nm-%.xml,$(1))
-	$$(AM_V_GEN) gdbus-codegen \
-		--generate-c-code $$(basename $$@) \
-		--generate-docbook $$(basename $$@) \
+introspection/%.c: introspection/%.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--generate-c-code $(basename $@) \
+		--generate-docbook docs/api/dbus \
 		--c-namespace NMDBus \
 		--interface-prefix org.freedesktop.NetworkManager \
-		$$<
+		$<
 
-$(filter $(basename $(1))-org.freedesktop.NetworkManager.%,$(DBUS_INTERFACE_DOCS)): $(1)
-	@true
+introspection/%.h: introspection/%.c
+	$()
 
-$(basename $(1)).h: $(1)
-	@true
-endef
-
-$(foreach f,$(filter %.c,$(introspection_sources)),$(eval $(call _make_nmdbus_rule,$f)))
+docs/api/dbus-%.xml: introspection/%.c
+	$()
 
 BUILT_SOURCES += \
 	$(introspection_sources) \
 	$(DBUS_INTERFACE_DOCS)
 
 EXTRA_DIST += \
-	introspection/nm-access-point.xml \
-	introspection/nm-active-connection.xml \
-	introspection/nm-agent-manager.xml \
-	introspection/nm-checkpoint.xml \
-	introspection/nm-device-adsl.xml \
-	introspection/nm-device-bond.xml \
-	introspection/nm-device-bridge.xml \
-	introspection/nm-device-bt.xml \
-	introspection/nm-device-ethernet.xml \
-	introspection/nm-device-generic.xml \
-	introspection/nm-device-infiniband.xml \
-	introspection/nm-device-ip-tunnel.xml \
-	introspection/nm-device-macvlan.xml \
-	introspection/nm-device-modem.xml \
-	introspection/nm-device-olpc-mesh.xml \
-	introspection/nm-device-statistics.xml \
-	introspection/nm-device-team.xml \
-	introspection/nm-device-tun.xml \
-	introspection/nm-device-veth.xml \
-	introspection/nm-device-vlan.xml \
-	introspection/nm-device-vxlan.xml \
-	introspection/nm-device-wifi.xml \
-	introspection/nm-device-wimax.xml \
-	introspection/nm-device.xml \
-	introspection/nm-dhcp4-config.xml \
-	introspection/nm-dhcp6-config.xml \
-	introspection/nm-ip4-config.xml \
-	introspection/nm-ip6-config.xml \
-	introspection/nm-manager.xml \
-	introspection/nm-ppp-manager.xml \
-	introspection/nm-secret-agent.xml \
-	introspection/nm-settings-connection.xml \
-	introspection/nm-settings.xml \
-	introspection/nm-vpn-connection.xml \
-	introspection/nm-vpn-plugin.xml \
-	introspection/nm-wimax-nsp.xml
+	introspection/org.freedesktop.NetworkManager.AccessPoint.xml \
+	introspection/org.freedesktop.NetworkManager.Connection.Active.xml \
+	introspection/org.freedesktop.NetworkManager.AgentManager.xml \
+	introspection/org.freedesktop.NetworkManager.Checkpoint.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Adsl.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Bond.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Bridge.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Wired.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
+	introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Statistics.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Team.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Tun.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
+	introspection/org.freedesktop.NetworkManager.Device.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
+	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
+	introspection/org.freedesktop.NetworkManager.IP4Config.xml \
+	introspection/org.freedesktop.NetworkManager.IP6Config.xml \
+	introspection/org.freedesktop.NetworkManager.xml \
+	introspection/org.freedesktop.NetworkManager.PPP.xml \
+	introspection/org.freedesktop.NetworkManager.SecretAgent.xml \
+	introspection/org.freedesktop.NetworkManager.Settings.Connection.xml \
+	introspection/org.freedesktop.NetworkManager.Settings.xml \
+	introspection/org.freedesktop.NetworkManager.VPN.Connection.xml \
+	introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	introspection/org.freedesktop.NetworkManager.WiMax.Nsp.xml
 
 ###############################################################################
 
@@ -745,7 +741,6 @@ $(libnm_libnm_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
 
 libnm_libnm_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	$(GUDEV_CFLAGS) \
@@ -943,7 +938,6 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
 
 src_cppflags = \
 	$(dflt_cppflags_libnm_core) \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
 	\
@@ -2217,7 +2211,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(builddir)/libnm-core \
@@ -2249,7 +2242,6 @@ if WITH_MODEM_MANAGER_1
 src_devices_wwan_cppflags = \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -2346,7 +2338,6 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(builddir)/libnm-core \
@@ -2405,7 +2396,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
 src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(builddir)/libnm-core \
@@ -2439,7 +2429,6 @@ src_devices_wifi_tests_test_general_SOURCES = \
 	src/devices/wifi/nm-wifi-utils.h
 
 src_devices_wifi_tests_test_general_CPPFLAGS = \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -2470,7 +2459,6 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
-	-I$(builddir)/introspection \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(builddir)/libnm-core \
@@ -3762,10 +3750,10 @@ nm_vpn_enum_types_sources = $(libnm_glib_vpn_h_real)
 
 $(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_glib_vpn_h_mkenums)
 
-libnm-glib/nm-vpn-plugin-glue.h: $(srcdir)/introspection/nm-vpn-plugin.xml
+libnm-glib/nm-vpn-plugin-glue.h: $(srcdir)/introspection/org.freedesktop.NetworkManager.VPN.Plugin.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
 
-libnm-glib/nm-secret-agent-glue.h: $(srcdir)/introspection/nm-secret-agent.xml
+libnm-glib/nm-secret-agent-glue.h: $(srcdir)/introspection/org.freedesktop.NetworkManager.SecretAgent.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
 
 BUILT_SOURCES += \

docs/api/Makefile.am

@@ -40,40 +40,40 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)"
 
 # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
 content_files = \
-	$(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
-	$(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
-	$(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
-	$(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
-	$(top_builddir)/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
-	$(top_builddir)/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \
-	$(top_builddir)/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
-	$(top_builddir)/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
-	$(top_builddir)/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
-	$(top_builddir)/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
-	$(top_builddir)/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
-	$(top_builddir)/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
-	$(top_builddir)/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
-	$(top_builddir)/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
-	$(top_builddir)/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
-	$(top_builddir)/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
-	$(top_builddir)/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
-	$(top_builddir)/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
-	$(top_builddir)/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
-	$(top_builddir)/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
-	$(top_builddir)/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
-	$(top_builddir)/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
-	$(top_builddir)/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
-	$(top_builddir)/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
-	$(top_builddir)/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
-	$(top_builddir)/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
-	$(top_builddir)/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
-	$(top_builddir)/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
-	$(top_builddir)/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
-	$(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
-	$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
-	$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
-	$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
-	$(top_builddir)/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml \
+	dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
+	dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Team.xml \
+	dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
+	dbus-org.freedesktop.NetworkManager.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
+	dbus-org.freedesktop.NetworkManager.Device.xml \
+	dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
+	dbus-org.freedesktop.NetworkManager.PPP.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
+	dbus-org.freedesktop.NetworkManager.AgentManager.xml \
+	dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
+	dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
+	dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
+	dbus-org.freedesktop.NetworkManager.IP6Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
+	dbus-org.freedesktop.NetworkManager.Settings.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	dbus-org.freedesktop.NetworkManager.IP4Config.xml \
+	dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
 	$(top_builddir)/libnm-core/nm-dbus-types.xml \
 	$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
 	$(top_builddir)/man/nmcli.xml \

docs/api/network-manager-docs.xml

@@ -65,40 +65,40 @@
       <title>Interfaces</title>
       <!-- TODO: Split me into chapters about daemon, vpn plugins, dispatcher and the secret agent.
                     Then describe the daemon's singletons and object hierarchy. -->
-      <xi:include href="../../introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml"/>
-      <xi:include href="../../introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml"/>
-      <xi:include href="../../introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml"/>
-      <xi:include href="../../introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml"/>
-      <xi:include href="../../introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml"/>
-      <xi:include href="../../introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
-      <xi:include href="../../introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
-      <xi:include href="../../introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
-      <xi:include href="../../introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
-      <xi:include href="../../introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
-      <xi:include href="../../introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml"/>
-      <xi:include href="../../introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml"/>
-      <xi:include href="../../introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
-      <xi:include href="../../introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml"/>
-      <xi:include href="../../introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.AgentManager.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Connection.Active.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Team.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Tun.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.IP4Config.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.IP6Config.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.SecretAgent.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/>
     </section>
     <section id="dbus-types">
       <title>Types</title>

libnm/nm-client.c

@@ -37,12 +37,12 @@
 #include "nm-wimax-nsp.h"
 #include "nm-object-private.h"
 
-#include "nmdbus-manager.h"
-#include "nmdbus-device-wifi.h"
-#include "nmdbus-device.h"
-#include "nmdbus-settings.h"
-#include "nmdbus-settings-connection.h"
-#include "nmdbus-vpn-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
+#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
 
 #include "nm-access-point.h"
 #include "nm-active-connection.h"

libnm/nm-device-wifi.c

@@ -35,7 +35,7 @@
 #include "nm-core-internal.h"
 #include "nm-dbus-helpers.h"
 
-#include "nmdbus-device-wifi.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
 
 G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
 

libnm/nm-device.c

@@ -41,7 +41,7 @@
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
 
-#include "nmdbus-device.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.h"
 
 static gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error);
 static NMLldpNeighbor *nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor);

libnm/nm-manager.c

@@ -35,7 +35,7 @@
 #include "nm-vpn-connection.h"
 #include "nm-dbus-helpers.h"
 
-#include "nmdbus-manager.h"
+#include "introspection/org.freedesktop.NetworkManager.h"
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 

libnm/nm-remote-connection.c

@@ -33,7 +33,7 @@
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
 
-#include "nmdbus-settings-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
 
 static void nm_remote_connection_connection_iface_init (NMConnectionInterface *iface);
 static void nm_remote_connection_initable_iface_init (GInitableIface *iface);

libnm/nm-remote-settings.c

@@ -35,7 +35,7 @@
 #include "nm-dbus-helpers.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-settings.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.h"
 
 G_DEFINE_TYPE (NMRemoteSettings, nm_remote_settings, NM_TYPE_OBJECT)
 

libnm/nm-secret-agent-old.c

@@ -29,8 +29,8 @@
 #include "nm-simple-connection.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-secret-agent.h"
-#include "nmdbus-agent-manager.h"
+#include "introspection/org.freedesktop.NetworkManager.SecretAgent.h"
+#include "introspection/org.freedesktop.NetworkManager.AgentManager.h"
 
 static void nm_secret_agent_old_initable_iface_init (GInitableIface *iface);
 static void nm_secret_agent_old_async_initable_iface_init (GAsyncInitableIface *iface);

libnm/nm-vpn-connection.c

@@ -30,7 +30,7 @@
 #include "nm-active-connection.h"
 #include "nm-dbus-helpers.h"
 
-#include "nmdbus-vpn-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
 
 G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
 

libnm/nm-vpn-plugin-old.c

@@ -34,7 +34,7 @@
 #include "nm-core-internal.h"
 #include "nm-simple-connection.h"
 
-#include "nmdbus-vpn-plugin.h"
+#include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
 
 #define NM_VPN_PLUGIN_OLD_QUIT_TIMER    180
 

libnm/nm-vpn-service-plugin.c

@@ -34,7 +34,7 @@
 #include "nm-core-internal.h"
 #include "nm-simple-connection.h"
 
-#include "nmdbus-vpn-plugin.h"
+#include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
 
 #define NM_VPN_SERVICE_PLUGIN_QUIT_TIMER    180
 

src/devices/adsl/nm-device-adsl.c

@@ -39,7 +39,7 @@
 #include "nm-setting-adsl.h"
 #include "nm-utils.h"
 
-#include "nmdbus-device-adsl.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Adsl.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF (NMDeviceAdsl);

src/devices/bluetooth/nm-device-bt.c

@@ -40,7 +40,7 @@
 #include "nm-bt-error.h"
 #include "platform/nm-platform.h"
 
-#include "nmdbus-device-bt.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceBt);

src/devices/nm-device-bond.c

@@ -32,7 +32,7 @@
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
 
-#include "nmdbus-device-bond.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Bond.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceBond);

src/devices/nm-device-bridge.c

@@ -30,7 +30,7 @@
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-device-bridge.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Bridge.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceBridge);

src/devices/nm-device-ethernet.c

@@ -51,7 +51,7 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "nmdbus-device-ethernet.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Wired.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceEthernet);

src/devices/nm-device-generic.c

@@ -26,7 +26,7 @@
 #include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-device-generic.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Generic.h"
 
 /*****************************************************************************/
 

src/devices/nm-device-infiniband.c

@@ -32,7 +32,7 @@
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-device-infiniband.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Infiniband.h"
 
 #define NM_DEVICE_INFINIBAND_IS_PARTITION "is-partition"
 

src/devices/nm-device-ip-tunnel.c

@@ -37,7 +37,7 @@
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 
-#include "nmdbus-device-ip-tunnel.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceIPTunnel);

src/devices/nm-device-macvlan.c

@@ -36,7 +36,7 @@
 #include "nm-ip4-config.h"
 #include "nm-utils.h"
 
-#include "nmdbus-device-macvlan.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Macvlan.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceMacvlan);

src/devices/nm-device-tun.c

@@ -34,7 +34,7 @@
 #include "nm-setting-tun.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-device-tun.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Tun.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceTun);

src/devices/nm-device-veth.c

@@ -33,7 +33,7 @@
 #include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 
-#include "nmdbus-device-veth.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Veth.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceVeth);

src/devices/nm-device-vlan.c

@@ -37,7 +37,7 @@
 #include "nm-core-internal.h"
 #include "platform/nmp-object.h"
 
-#include "nmdbus-device-vlan.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Vlan.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceVlan);

src/devices/nm-device-vxlan.c

@@ -35,7 +35,7 @@
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 
-#include "nmdbus-device-vxlan.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Vxlan.h"
 
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceVxlan);

src/devices/nm-device.c

@@ -70,8 +70,8 @@
 #include "nm-device-logging.h"
 _LOG_DECLARE_SELF (NMDevice);
 
-#include "nmdbus-device.h"
-#include "nmdbus-device-statistics.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Statistics.h"
 
 G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, NM_TYPE_EXPORTED_OBJECT)
 

src/devices/team/nm-device-team.c

@@ -36,7 +36,7 @@
 #include "nm-ip4-config.h"
 #include "nm-dbus-compat.h"
 
-#include "nmdbus-device-team.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Team.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceTeam);

src/devices/wifi/nm-device-olpc-mesh.c

@@ -51,7 +51,7 @@
 /* This is a bug; but we can't really change API now... */
 #include "nm-vpn-dbus-interface.h"
 
-#include "nmdbus-device-olpc-mesh.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceOlpcMesh);

src/devices/wifi/nm-device-wifi.c

@@ -51,7 +51,7 @@
 #include "nm-core-internal.h"
 #include "nm-config.h"
 
-#include "nmdbus-device-wifi.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceWifi);

src/devices/wifi/nm-wifi-ap.c

@@ -32,7 +32,7 @@
 
 #include "nm-setting-wireless.h"
 
-#include "nmdbus-access-point.h"
+#include "introspection/org.freedesktop.NetworkManager.AccessPoint.h"
 
 #define PROTO_WPA "wpa"
 #define PROTO_RSN "rsn"

src/devices/wwan/nm-device-modem.c

@@ -32,7 +32,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-device-modem.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Modem.h"
 
 #include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceModem);

src/nm-active-connection.c

@@ -32,7 +32,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-active-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.Connection.Active.h"
 
 typedef struct _NMActiveConnectionPrivate {
 	NMSettingsConnection *settings_connection;

src/nm-checkpoint.c

@@ -33,7 +33,7 @@
 #include "settings/nm-settings-connection.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
-#include "nmdbus-checkpoint.h"
+#include "introspection/org.freedesktop.NetworkManager.Checkpoint.h"
 
 /*****************************************************************************/
 

src/nm-dhcp4-config.c

@@ -28,7 +28,7 @@
 #include "nm-utils.h"
 #include "nm-exported-object.h"
 
-#include "nmdbus-dhcp4-config.h"
+#include "introspection/org.freedesktop.NetworkManager.DHCP4Config.h"
 
 /*****************************************************************************/
 

src/nm-dhcp6-config.c

@@ -28,7 +28,7 @@
 #include "nm-utils.h"
 #include "nm-exported-object.h"
 
-#include "nmdbus-dhcp6-config.h"
+#include "introspection/org.freedesktop.NetworkManager.DHCP6Config.h"
 
 /*****************************************************************************/
 

src/nm-exported-object.c

@@ -29,7 +29,7 @@
 
 #include "devices/nm-device.h"
 #include "nm-active-connection.h"
-#include "nmdbus-device-statistics.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.Statistics.h"
 
 #if NM_MORE_ASSERTS >= 2
 #define _ASSERT_NO_EARLY_EXPORT

src/nm-ip4-config.c

@@ -33,7 +33,7 @@
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-ip4-config.h"
+#include "introspection/org.freedesktop.NetworkManager.IP4Config.h"
 
 typedef struct {
 	gboolean never_default;

src/nm-ip6-config.c

@@ -33,7 +33,7 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "nmdbus-ip6-config.h"
+#include "introspection/org.freedesktop.NetworkManager.IP6Config.h"
 
 typedef struct {
 	gboolean never_default;

src/nm-manager.c

@@ -56,8 +56,8 @@
 #include "nm-checkpoint-manager.h"
 #include "NetworkManagerUtils.h"
 
-#include "nmdbus-manager.h"
-#include "nmdbus-device.h"
+#include "introspection/org.freedesktop.NetworkManager.h"
+#include "introspection/org.freedesktop.NetworkManager.Device.h"
 
 static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
 

src/ppp/nm-ppp-manager.c

@@ -52,7 +52,7 @@
 #include "nm-pppd-plugin.h"
 #include "nm-ppp-status.h"
 
-#include "nmdbus-ppp-manager.h"
+#include "introspection/org.freedesktop.NetworkManager.PPP.h"
 
 #define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so"
 #define PPP_MANAGER_SECRET_TRIES "ppp-manager-secret-tries"

src/settings/nm-agent-manager.c

@@ -37,7 +37,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 
-#include "nmdbus-agent-manager.h"
+#include "introspection/org.freedesktop.NetworkManager.AgentManager.h"
 
 /*****************************************************************************/
 

src/settings/nm-secret-agent.c

@@ -31,7 +31,7 @@
 #include "nm-simple-connection.h"
 #include "NetworkManagerUtils.h"
 
-#include "nmdbus-secret-agent.h"
+#include "introspection/org.freedesktop.NetworkManager.SecretAgent.h"
 
 /*****************************************************************************/
 

src/settings/nm-settings-connection.c

@@ -37,7 +37,7 @@
 #include "nm-core-internal.h"
 #include "nm-audit-manager.h"
 
-#include "nmdbus-settings-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
 
 #define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"
 #define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"

src/settings/nm-settings.c

@@ -77,7 +77,7 @@
 #include "nm-dispatcher.h"
 #include "nm-inotify-helper.h"
 
-#include "nmdbus-settings.h"
+#include "introspection/org.freedesktop.NetworkManager.Settings.h"
 
 /*****************************************************************************/
 

src/vpn/nm-vpn-connection.c

@@ -51,7 +51,7 @@
 #include "nm-vpn-manager.h"
 #include "dns/nm-dns-manager.h"
 
-#include "nmdbus-vpn-connection.h"
+#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
 
 typedef enum {
 	/* Only system secrets */