all: make use of new header file "nm-default.h"

callouts/nm-dispatcher-utils.c

@@ -29,7 +29,7 @@
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 

callouts/nm-dispatcher-utils.h

@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
 #define __NETWORKMANAGER_DISPATCHER_UTILS_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 char **
 nm_dispatcher_utils_construct_envp (const char *action,

callouts/nm-dispatcher.c

@@ -34,7 +34,7 @@
 
 #include <glib-unix.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
 

callouts/tests/test-dispatcher-envp.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

clients/cli/agent.c

@@ -29,7 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-secret-agent-simple.h"

clients/cli/common.c

@@ -29,7 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 #include "utils.h"
 

clients/cli/connections.c

@@ -30,8 +30,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"

clients/cli/devices.c

@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"

clients/cli/general.c

@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "utils.h"
 #include "general.h"

clients/cli/nmcli.c

@@ -35,7 +35,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
 #include "utils.h"

clients/cli/polkit-agent.c

@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
 #include "common.h"
@@ -142,7 +142,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
 #else
 /* polkit agent is not avalable; implement stub functions. */
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmcli.h"
 #include "polkit-agent.h"
 

clients/cli/settings.c

@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"

clients/cli/utils.c

@@ -31,7 +31,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "utils.h"
 
 int

clients/common/nm-polkit-listener.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-polkit-listener.h"
 
 G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)

clients/common/nm-polkit-listener.h

@@ -22,7 +22,7 @@
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
 #include <polkitagent/polkitagent.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/common/nm-secret-agent-simple.c

@@ -34,6 +34,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 
 G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD)

clients/nm-online.c

@@ -42,7 +42,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"

clients/tui/newt/Makefile.am

@@ -1,5 +1,6 @@
 AM_CPPFLAGS= \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libnm-core \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \

clients/tui/newt/nmt-newt-types.h

@@ -21,7 +21,7 @@
 
 #include <newt.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/newt/nmt-newt-utils.c

@@ -30,7 +30,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-newt-utils.h"
 
 static void

clients/tui/newt/nmt-newt-utils.h

@@ -21,7 +21,7 @@
 
 #include <newt.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/nm-editor-utils.c

@@ -30,6 +30,7 @@
 #include <glib/gi18n.h>
 #include <NetworkManager.h>
 
+#include "nm-default.h"
 #include "nm-editor-utils.h"
 #if 0
 #include "vpn-helpers.h"

clients/tui/nmt-editor.c

@@ -30,7 +30,7 @@
 #include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"

clients/tui/nmt-mac-entry.h

@@ -19,7 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nmt-newt.h"
 

clients/tui/nmt-page-bond.c

@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-bridge-port.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bridge-port.h"
 
 G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-bridge.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-dsl.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"

clients/tui/nmt-page-dsl.h

@@ -19,7 +19,7 @@
 #ifndef NMT_PAGE_DSL_H
 #define NMT_PAGE_DSL_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-ethernet.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-page-infiniband.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 

clients/tui/nmt-page-ip4.c

@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ip6.c

@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ppp.c

@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"

clients/tui/nmt-page-team-port.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-team-port.h"
 
 G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-team.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"

clients/tui/nmt-page-team.h

@@ -19,7 +19,7 @@
 #ifndef NMT_PAGE_TEAM_H
 #define NMT_PAGE_TEAM_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-vlan.c

@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"

clients/tui/nmt-page-wifi.c

@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-route-editor.c

@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 

clients/tui/nmt-utils.h

@@ -19,7 +19,7 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

clients/tui/nmtui.c

@@ -34,7 +34,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 

clients/tui/vpn-helpers.c

@@ -34,7 +34,7 @@
 #include <gmodule.h>
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "vpn-helpers.h"
 
 #include "nm-macros-internal.h"

clients/tui/vpn-helpers.h

@@ -21,7 +21,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 GSList *vpn_get_plugins (void);
 

include/nm-macros-internal.h

@@ -22,7 +22,7 @@
 #ifndef __NM_MACROS_INTERNAL_H__
 #define __NM_MACROS_INTERNAL_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 /********************************************************/
 

include/nm-test-utils.h

@@ -89,10 +89,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 #ifdef __NETWORKMANAGER_LOGGING_H__
 /* We are running tests under src/. Let's include some files by default.

libnm-core/crypto.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto.h

@@ -24,7 +24,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"

libnm-core/crypto_gnutls.c

@@ -30,7 +30,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto_nss.c

@@ -35,7 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/nm-connection.c

@@ -24,13 +24,12 @@
 
 #include <glib/gi18n-lib.h>
 #include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-setting-private.h"
 #include "nm-core-internal.h"
-#include "gsystem-local-alloc.h"
 
 /**
  * SECTION:nm-connection

libnm-core/nm-core-internal.h

@@ -34,7 +34,7 @@
  **/
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-dbus-interface.h"
@@ -67,7 +67,6 @@
 #include "nm-setting.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
-#include "nm-version.h"
 #include "nm-vpn-dbus-interface.h"
 
 #define NM_UTILS_CLEAR_CANCELLABLE(c) \

libnm-core/nm-dbus-utils.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 
 typedef struct {

libnm-core/nm-errors.c

@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-errors.h"
 #include "nm-dbus-interface.h"
 #include "nm-vpn-dbus-interface.h"

libnm-core/nm-keyfile-internal.h

@@ -24,7 +24,7 @@
 
 #include <sys/types.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 

libnm-core/nm-keyfile-reader.c

@@ -30,10 +30,9 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

libnm-core/nm-keyfile-utils.c

@@ -23,8 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"

libnm-core/nm-keyfile-writer.c

@@ -30,7 +30,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
@@ -43,7 +43,6 @@
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 
-#include "gsystem-local-alloc.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

libnm-core/nm-property-compare.c

@@ -27,7 +27,7 @@
 #include <netinet/in.h>
 
 #include "nm-property-compare.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 
 static gint
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)

libnm-core/nm-property-compare.h

@@ -23,7 +23,7 @@
 #ifndef __NM_PROPERTY_COMPARE_H__
 #define __NM_PROPERTY_COMPARE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 int nm_property_compare (GVariant *value1, GVariant *value2);
 

libnm-core/nm-setting-8021x.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-default.h"
 #include "nm-setting-8021x.h"
 #include "nm-utils.h"
 #include "crypto.h"
@@ -32,7 +33,6 @@
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
 #include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 /**
  * SECTION:nm-setting-8021x

libnm-core/nm-setting-ip-config.c

@@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"

libnm-core/nm-setting-private.h

@@ -21,7 +21,7 @@
 #ifndef __NM_SETTING_PRIVATE_H__
 #define __NM_SETTING_PRIVATE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"

libnm-core/nm-setting-serial.c

@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-serial.h"
 #include "nm-setting-private.h"
 

libnm-core/nm-setting.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"

libnm-core/nm-utils.c

@@ -32,12 +32,11 @@
 #include <glib/gi18n-lib.h>
 #include <sys/stat.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
 
 #include "nm-setting-bond.h"

libnm-core/tests/test-compare.c

@@ -24,7 +24,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-property-compare.h"
 
 #include "nm-test-utils.h"

libnm-core/tests/test-crypto.c

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 #include "nm-utils.h"
 #include "nm-errors.h"

libnm-core/tests/test-general.c

@@ -26,8 +26,7 @@
 #include <string.h>
 
 #include <nm-utils.h>
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 
 #include "nm-setting-private.h"
 #include "nm-utils.h"

libnm-core/tests/test-secrets.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

libnm-core/tests/test-setting-8021x.c

@@ -25,7 +25,7 @@
 
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-8021x.h"
 

libnm-core/tests/test-setting-dcb.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <nm-utils.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-dcb.h"
 #include "nm-connection.h"
 #include "nm-errors.h"

libnm-core/tests/test-settings-defaults.c

@@ -25,7 +25,7 @@
 
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

libnm-glib/libnm-glib-test.c

@@ -31,7 +31,7 @@
 #include <arpa/inet.h>
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-client.h"
 #include "nm-device.h"
 #include "nm-device-ethernet.h"

libnm-glib/libnm_glib.c

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 #include "libnm_glib.h"
 

libnm-glib/nm-access-point.c

@@ -30,7 +30,7 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-access-point.h"
 #include "NetworkManager.h"
 #include "nm-types-private.h"

libnm-glib/nm-active-connection.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"

libnm-glib/nm-client.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-client.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"

libnm-glib/nm-dbus-helpers-private.h

@@ -24,7 +24,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 DBusGConnection *_nm_dbus_new_connection (GError **error);
 

libnm-glib/nm-dbus-helpers.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-helpers-private.h"
 #include "NetworkManager.h"
 

libnm-glib/nm-device-bond.c

@@ -27,7 +27,7 @@
 #include <nm-setting-bond.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-bond.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-bridge.c

@@ -27,7 +27,7 @@
 #include <nm-setting-bridge.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-bridge.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-bt.c

@@ -27,7 +27,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-bt.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-ethernet.c

@@ -28,7 +28,7 @@
 #include <nm-setting-wired.h>
 #include <nm-setting-pppoe.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-infiniband.c

@@ -28,7 +28,7 @@
 #include <nm-setting-infiniband.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-infiniband.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-modem.c

@@ -27,7 +27,7 @@
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-modem.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-olpc-mesh.c

@@ -25,7 +25,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-olpc-mesh.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-team.c

@@ -27,7 +27,7 @@
 #include <nm-setting-team.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-team.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-vlan.c

@@ -27,7 +27,7 @@
 #include <nm-setting-vlan.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-vlan.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-wifi.c

@@ -28,7 +28,7 @@
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-wimax.c

@@ -27,7 +27,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-wimax.h"
 #include "nm-object-private.h"
 #include "nm-object-cache.h"

libnm-glib/nm-device.c

@@ -26,7 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"

libnm-glib/nm-object-cache.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-object-cache.h"
 #include "nm-object.h"
 

libnm-glib/nm-object-cache.h

@@ -21,7 +21,7 @@
 #ifndef NM_OBJECT_CACHE_H
 #define NM_OBJECT_CACHE_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

libnm-glib/nm-object-private.h

@@ -21,7 +21,7 @@
 #ifndef NM_OBJECT_PRIVATE_H
 #define NM_OBJECT_PRIVATE_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-object.h"
 
 void _nm_object_ensure_inited (NMObject *object);

libnm-glib/nm-object.c

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

libnm-glib/nm-remote-connection.c

@@ -27,7 +27,7 @@
 #include <NetworkManager.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-remote-settings.c

@@ -25,7 +25,7 @@
 #include <NetworkManager.h>
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-remote-settings.h"
 #include "nm-remote-connection-private.h"

libnm-glib/nm-secret-agent.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 #include "nm-secret-agent.h"
 #include "nm-glib-enum-types.h"

libnm-glib/nm-types.c

@@ -22,7 +22,7 @@
 
 #include <dbus/dbus-glib.h>
 #include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-types.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"