libnm: rename NetworkManager.h and NetworkManagerVPN.h

"NetworkManager.h"'s name (and non-standard capitalization) suggest
that it's some sort of high-level super-important header, but it's
really just low-level D-Bus stuff. Rename it to "nm-dbus-interface.h"
and likewise "NetworkManagerVPN.h" to "nm-vpn-dbus-interface.h"

callouts/nm-dispatcher-utils.c

@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-dbus-glib-types.h>
 #include <nm-connection.h>
 #include <nm-setting-ip4-config.h>

examples/C/glib/add-connection-dbus-glib.c

@@ -33,7 +33,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-ip4-config.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 #define DBUS_TYPE_G_MAP_OF_VARIANT          (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
@@ -110,7 +110,7 @@ int main (int argc, char *argv[])
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
-	/* Create a D-Bus proxy; NM_DBUS_* defined in NetworkManager.h */
+	/* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */
 	proxy = dbus_g_proxy_new_for_name (bus,
 	                                   NM_DBUS_SERVICE,
 	                                   NM_DBUS_PATH_SETTINGS,

examples/C/glib/get-active-connections-dbus-glib.c

@@ -34,7 +34,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-ip4-config.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 #define DBUS_TYPE_G_MAP_OF_VARIANT          (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
@@ -205,7 +205,7 @@ int main (int argc, char *argv[])
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
 	/* Create a D-Bus proxy to get the object properties from the NM Manager
-	 * object.  NM_DBUS_* defines are from NetworkManager.h.
+	 * object.  NM_DBUS_* defines are from nm-dbus-interface.h.
 	 */
 	props_proxy = dbus_g_proxy_new_for_name (bus,
 	                                         NM_DBUS_SERVICE,

examples/C/glib/get-ap-info-libnm.c

@@ -33,7 +33,7 @@
 #include <nm-device.h>
 #include <nm-device-wifi.h>
 #include <nm-access-point.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 /* Convert flags to string */

examples/C/glib/list-connections-dbus-glib.c

@@ -29,7 +29,7 @@
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 #define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
 
@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
 	/* Get system bus */
 	bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
-	/* Create a D-Bus proxy; NM_DBUS_* defined in NetworkManager.h */
+	/* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */
 	proxy = dbus_g_proxy_new_for_name (bus,
 	                                   NM_DBUS_SERVICE,
 	                                   NM_DBUS_PATH_SETTINGS,

examples/C/glib/list-connections-libnm.c

@@ -31,7 +31,7 @@
 
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-remote-settings.h>
 

examples/C/glib/monitor-nm-state-GDBus.c

@@ -24,7 +24,7 @@
  * It uses GDBus and the libnm headers.
 
  * You don't need to have NetworkManager devel package installed. You can just
- * grab NetworkManager.h and put it in the path.
+ * grab nm-dbus-interface.h and put it in the path.
  *
  * Standalone compilation:
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-GDBus.c -o monitor-nm-state-GDBus
@@ -32,7 +32,7 @@
 
 #include <gio/gio.h>
 #include <string.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 static const char *
 nm_state_to_string (NMState state)

examples/C/qt/add-connection-wired.cpp

@@ -31,7 +31,7 @@
 
 #include <QtCore/QDebug>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 typedef QMap<QString, QMap<QString, QVariant> > Connection;
 Q_DECLARE_METATYPE(Connection)

examples/C/qt/change-ipv4-addresses.cpp

@@ -25,7 +25,7 @@
  * g++ -Wall `pkg-config --libs --cflags QtCore QtDBus QtNetwork` `pkg-config --cflags libnm` change-ipv4-addresses.cpp -o change-ipv4-addresses
  *
  * You don't need to have NetworkManager devel package installed; you can just
- * grab NetworkManager.h and put it in the path
+ * grab nm-dbus-interface.h and put it in the path
  */
 
 #include <QtDBus/QDBusConnection>
@@ -40,7 +40,7 @@
 
 #include "arpa/inet.h"
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 typedef QMap<QString, QMap<QString, QVariant> > Connection;
 Q_DECLARE_METATYPE(Connection)

examples/C/qt/list-connections.cpp

@@ -28,7 +28,7 @@
 
 #include <QtCore/QDebug>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 
 void listConnections(QDBusInterface& interface) {

libnm-core/Makefile.libnm-core

@@ -5,10 +5,9 @@
 core = $(top_srcdir)/libnm-core
 
 libnm_core_headers =				\
-	$(core)/NetworkManager.h		\
-	$(core)/NetworkManagerVPN.h		\
 	$(core)/nm-connection.h			\
 	$(core)/nm-core-enum-types.h		\
+	$(core)/nm-dbus-interface.h		\
 	$(core)/nm-setting-8021x.h		\
 	$(core)/nm-setting-adsl.h		\
 	$(core)/nm-setting-bluetooth.h		\
@@ -37,7 +36,8 @@ libnm_core_headers =				\
 	$(core)/nm-setting-wireless.h		\
 	$(core)/nm-setting.h			\
 	$(core)/nm-utils.h			\
-	$(core)/nm-version.h
+	$(core)/nm-version.h			\
+	$(core)/nm-vpn-dbus-interface.h
 
 libnm_core_private_headers =			\
 	$(core)/crypto.h			\

libnm-core/nm-dbus-interface.h

@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NETWORK_MANAGER_H
-#define NETWORK_MANAGER_H
+#ifndef NM_DBUS_INTERFACE_H
+#define NM_DBUS_INTERFACE_H
 
 #include "nm-version.h"
 
@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ {
 	NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS
 } NMSecretAgentCapabilities;
 
-#endif /* NETWORK_MANAGER_H */
+#endif /* NM_DBUS_INTERFACE_H */

libnm-core/nm-setting-olpc-mesh.c

@@ -25,8 +25,8 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
-#include "NetworkManager.h"
 #include "nm-setting-olpc-mesh.h"
+#include "nm-dbus-interface.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"

libnm-core/nm-setting-wireless.c

@@ -26,8 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
-#include "NetworkManager.h"
 #include "nm-setting-wireless.h"
+#include "nm-dbus-interface.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"

libnm-core/nm-setting-wireless.h

@@ -23,9 +23,9 @@
 #ifndef NM_SETTING_WIRELESS_H
 #define NM_SETTING_WIRELESS_H
 
-#include <NetworkManager.h>
 #include <nm-setting.h>
 #include <nm-setting-wireless-security.h>
+#include <nm-dbus-interface.h>
 
 G_BEGIN_DECLS
 

libnm-core/nm-vpn-dbus-interface.h

@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NETWORK_MANAGER_VPN_H
-#define NETWORK_MANAGER_VPN_H
+#ifndef NM_VPN_DBUS_INTERFACE_H
+#define NM_VPN_DBUS_INTERFACE_H
 
 /*
  * dbus services details
@@ -299,4 +299,4 @@ typedef enum {
 /* boolean: prevent this VPN connection from ever getting the default route */
 #define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 
-#endif /* NETWORK_MANAGER_VPN_H */
+#endif /* NM_VPN_DBUS_INTERFACE_H */

libnm/nm-access-point.c

@@ -32,7 +32,7 @@
 #include <nm-utils.h>
 
 #include "nm-access-point.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 

libnm/nm-access-point.h

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include "nm-object.h"
 

libnm/nm-active-connection.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"
 #include "nm-types-private.h"

libnm/nm-active-connection.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include "nm-object.h"
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"

libnm/nm-client.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-object.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"

libnm/nm-dbus-helpers.c

@@ -24,7 +24,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include "nm-dbus-helpers-private.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 static dbus_int32_t priv_slot = -1;
 

libnm/nm-device-bt.h

@@ -22,7 +22,7 @@
 #ifndef NM_DEVICE_BT_H
 #define NM_DEVICE_BT_H
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device.h"
 
 G_BEGIN_DECLS

libnm/nm-device.c

@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <gudev/gudev.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"

libnm/nm-device.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-object.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"

libnm/nm-dhcp4-config.c

@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "nm-dhcp4-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

libnm/nm-dhcp6-config.c

@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "nm-dhcp6-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

libnm/nm-ip4-config.c

@@ -23,7 +23,7 @@
 
 #include <nm-setting-ip4-config.h>
 #include "nm-ip4-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

libnm/nm-ip6-config.c

@@ -23,7 +23,7 @@
 
 #include <nm-setting-ip6-config.h>
 #include "nm-ip6-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

libnm/nm-object.c

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"

libnm/nm-remote-connection.c

@@ -23,7 +23,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 #include "nm-remote-connection.h"

libnm/nm-remote-settings.c

@@ -20,7 +20,7 @@
  */
 
 #include <string.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
 #include "nm-dbus-glib-types.h"

libnm/nm-secret-agent.c

@@ -23,7 +23,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "nm-glib-compat.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-enum-types.h"
 #include "nm-dbus-helpers-private.h"

libnm/nm-vpn-connection.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include "nm-vpn-connection.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-object-private.h"
 #include "nm-active-connection.h"

libnm/nm-vpn-connection.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-active-connection.h"
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 
 G_BEGIN_DECLS
 

libnm/nm-vpn-plugin.h

@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManagerVPN.h>
+#include <nm-vpn-dbus-interface.h>
 #include <nm-connection.h>
 
 G_BEGIN_DECLS

libnm/nm-wimax-nsp.c

@@ -28,7 +28,7 @@
 #include <nm-setting-wimax.h>
 
 #include "nm-wimax-nsp.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 

libnm/nm-wimax-nsp.h

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-object.h"
 
 G_BEGIN_DECLS

libnm/tests/test-nm-client.c

@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include <NetworkManager.h>
+#include "nm-dbus-interface.h"
 #include "nm-client.h"
 #include "nm-device-wifi.h"
 #include "nm-device-ethernet.h"

libnm/tests/test-remote-settings-client.c

@@ -26,8 +26,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include <NetworkManager.h>
-
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-utils.h>

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

@@ -26,7 +26,7 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-setting-bluetooth.h"
 
 #include "nm-bluez-common.h"

src/devices/bluetooth/nm-bluez4-adapter.c

@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-bluez4-adapter.h"
 #include "nm-bluez-device.h"

src/devices/nm-device-factory.h

@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device.h"
 
 /* WARNING: this file is private API between NetworkManager and its internal

src/devices/nm-device.h

@@ -26,7 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <netinet/in.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types.h"
 #include "nm-connection.h"
 #include "nm-rfkill-manager.h"

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

@@ -57,7 +57,7 @@
 #include "nm-wifi-enum-types.h"
 
 /* This is a bug; but we can't really change API now... */
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 
 
 #include "nm-device-olpc-mesh-glue.h"

src/devices/wifi/nm-wifi-ap-utils.h

@@ -23,7 +23,7 @@
 
 #include <net/ethernet.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>

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

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-connection.h"
 
 #define NM_TYPE_AP            (nm_ap_get_type ())

src/devices/wimax/nm-wimax-nsp.c

@@ -20,7 +20,7 @@
  */
 
 #include "nm-wimax-nsp.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-setting-wimax.h"
 #include "nm-wimax-nsp-glue.h"

src/main.c

@@ -40,7 +40,7 @@
 #include <sys/resource.h>
 
 #include "gsystem-local-alloc.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "nm-linux-platform.h"

src/nm-active-connection.c

@@ -21,7 +21,7 @@
 #include <glib.h>
 #include "nm-types.h"
 #include "nm-active-connection.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-dbus-manager.h"

src/nm-connectivity.h

@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types.h"
 
 #define NM_TYPE_CONNECTIVITY            (nm_connectivity_get_type ())

src/nm-dbus-manager.c

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-glib-compat.h"
 #include "nm-properties-changed-signal.h"

src/nm-dhcp4-config.c

@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp4-config-glue.h"

src/nm-dhcp6-config.c

@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp6-config.h"
 #include "nm-dhcp6-config-glue.h"

src/platform/nm-platform.h

@@ -28,7 +28,7 @@
 #include <linux/if.h>
 #include <linux/if_addr.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "gsystem-local-alloc.h"
 #include "nm-types.h"
 

src/platform/wifi/wifi-utils-private.h

@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "wifi-utils.h"
 
 struct WifiData {

src/platform/wifi/wifi-utils.h

@@ -25,7 +25,7 @@
 #include <net/ethernet.h>
 #include <glib.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 typedef struct WifiData WifiData;
 

src/ppp-manager/nm-ppp-manager.c

@@ -41,7 +41,7 @@
 #endif
 #include <linux/if_ppp.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "nm-glib-compat.h"
 #include "nm-ppp-manager.h"

src/ppp-manager/nm-pppd-plugin.c

@@ -36,7 +36,7 @@
 #include <pppd/eui64.h>
 #include <pppd/ipv6cp.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-pppd-plugin.h"
 #include "nm-ppp-status.h"
 #include "nm-dbus-glib-types.h"

src/settings/nm-agent-manager.c

@@ -26,7 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-agent-manager.h"
 #include "nm-secret-agent.h"

src/settings/nm-secret-agent.c

@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-dbus-manager.h"
 #include "nm-dbus-glib-types.h"

src/settings/nm-settings-connection.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>

src/settings/nm-settings.c

@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include <nm-setting-8021x.h>
 #include <nm-setting-bluetooth.h>

src/settings/plugins/example/nm-example-connection.c

@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 

src/settings/plugins/example/reader.c

@@ -22,7 +22,7 @@
 #include <glib.h>
 
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 #include "common.h"
 

src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c

@@ -24,7 +24,7 @@
 
 #include <glib/gstdio.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>

src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h

@@ -23,7 +23,7 @@
 
 G_BEGIN_DECLS
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-settings-connection.h>
 
 #define NM_TYPE_IFCFG_CONNECTION            (nm_ifcfg_connection_get_type ())

src/settings/plugins/ifcfg-rh/reader.c

@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-vlan.h>

src/settings/plugins/ifnet/nm-ifnet-connection.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>

src/settings/plugins/ifnet/plugin.c

@@ -29,7 +29,7 @@
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
 #include "nm-logging.h"
 #include "nm-ifnet-connection.h"

src/settings/plugins/ifupdown/nm-ifupdown-connection.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>

src/settings/plugins/ifupdown/parser.c

@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-ppp.h>

src/settings/plugins/ifupdown/plugin.c

@@ -36,7 +36,7 @@
 
 #include "interface_parser.h"
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-wireless.h"

src/settings/plugins/keyfile/nm-keyfile-connection.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 

src/vpn-manager/nm-vpn-connection.c

@@ -27,8 +27,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "NetworkManager.h"
-#include "NetworkManagerVPN.h"
+#include "nm-dbus-interface.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-vpn.h"

src/vpn-manager/nm-vpn-connection.h

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-device.h"
 #include "nm-auth-subject.h"
 #include "nm-active-connection.h"

src/vpn-manager/nm-vpn-manager.c

@@ -27,7 +27,7 @@
 #include "nm-vpn-connection.h"
 #include "nm-setting-vpn.h"
 #include "nm-dbus-manager.h"
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-enum-types.h"
 #include "nm-logging.h"