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

diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index b930e26..52eddfd 100644 (file)
--- a/callouts/nm-dispatcher-utils.c
+++ b/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"
 

diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h
index be67787..f68b3ea 100644 (file)
--- a/callouts/nm-dispatcher-utils.h
+++ b/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,

diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c
index ef6f2a9..32b60e8 100644 (file)
--- a/callouts/nm-dispatcher.c
+++ b/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"
 

diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index c6516b3..faa6c08 100644 (file)
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/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"

diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 896e761..75422ce 100644 (file)
--- a/clients/cli/agent.c
+++ b/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"

diff --git a/clients/cli/common.c b/clients/cli/common.c
index db20372..5a3f796 100644 (file)
--- a/clients/cli/common.c
+++ b/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"
 

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 3678057..372f6ad 100644 (file)
--- a/clients/cli/connections.c
+++ b/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"

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index 70135e1..9401813 100644 (file)
--- a/clients/cli/devices.c
+++ b/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"

diff --git a/clients/cli/general.c b/clients/cli/general.c
index b5fd5e1..fa493bb 100644 (file)
--- a/clients/cli/general.c
+++ b/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"

diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 2c19e48..7ad5fa1 100644 (file)
--- a/clients/cli/nmcli.c
+++ b/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"

diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index 269fa6d..1120b7e 100644 (file)
--- a/clients/cli/polkit-agent.c
+++ b/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"
 

diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 42d8832..e5e6cd5 100644 (file)
--- a/clients/cli/settings.c
+++ b/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"

diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 6552e15..cfc8cd2 100644 (file)
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "utils.h"
 
 int

diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index bad5f43..5726e65 100644 (file)
--- a/clients/common/nm-polkit-listener.c
+++ b/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)

diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h
index ffdc91a..22c436c 100644 (file)
--- a/clients/common/nm-polkit-listener.h
+++ b/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
 

diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 8eddb44..00dc965 100644 (file)
--- a/clients/common/nm-secret-agent-simple.c
+++ b/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)

diff --git a/clients/nm-online.c b/clients/nm-online.c
index fc4e864..60e1a0a 100644 (file)
--- a/clients/nm-online.c
+++ b/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"

diff --git a/clients/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am
index e572238..dcc02ab 100644 (file)
--- a/clients/tui/newt/Makefile.am
+++ b/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) \

diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
index 775c3bc..4ea0a7b 100644 (file)
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/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
 

diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index b405c9d..b796219 100644 (file)
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/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

diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 7a3b677..706f10d 100644 (file)
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/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
 

diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c
index f936c95..8f15b73 100644 (file)
--- a/clients/tui/nm-editor-utils.c
+++ b/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"

diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index a0c1534..342da77 100644 (file)
--- a/clients/tui/nmt-editor.c
+++ b/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"

diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 2852de8..099bacb 100644 (file)
--- a/clients/tui/nmt-mac-entry.h
+++ b/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"
 

diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index 89e10cf..ef7a79a 100644 (file)
--- a/clients/tui/nmt-page-bond.c
+++ b/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"

diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index ee18ba5..c4238ff 100644 (file)
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/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)

diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index 84491b6..042a650 100644 (file)
--- a/clients/tui/nmt-page-bridge.c
+++ b/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"

diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index 0b0f1b9..9916553 100644 (file)
--- a/clients/tui/nmt-page-dsl.c
+++ b/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"

diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h
index 8da0e05..dc84ca0 100644 (file)
--- a/clients/tui/nmt-page-dsl.h
+++ b/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

diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index cec0491..4337101 100644 (file)
--- a/clients/tui/nmt-page-ethernet.c
+++ b/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"

diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index ecc5dc3..69ae281 100644 (file)
--- a/clients/tui/nmt-page-infiniband.c
+++ b/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"
 

diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index 366a391..5ec5736 100644 (file)
--- a/clients/tui/nmt-page-ip4.c
+++ b/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"

diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index ea8314d..ea84af3 100644 (file)
--- a/clients/tui/nmt-page-ip6.c
+++ b/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"

diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index 85690e4..7c2d940 100644 (file)
--- a/clients/tui/nmt-page-ppp.c
+++ b/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"

diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index a571924..dfcaa15 100644 (file)
--- a/clients/tui/nmt-page-team-port.c
+++ b/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)

diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index b766494..d153738 100644 (file)
--- a/clients/tui/nmt-page-team.c
+++ b/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"

diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index 95a0e45..994b63d 100644 (file)
--- a/clients/tui/nmt-page-team.h
+++ b/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

diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index fefb244..637987c 100644 (file)
--- a/clients/tui/nmt-page-vlan.c
+++ b/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"

diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index cf593f0..8a0c671 100644 (file)
--- a/clients/tui/nmt-page-wifi.c
+++ b/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"

diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 156f7ad..875c2c9 100644 (file)
--- a/clients/tui/nmt-route-editor.c
+++ b/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"
 

diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index cb7e632..5531dbe 100644 (file)
--- a/clients/tui/nmt-utils.h
+++ b/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
 

diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 3519d5b..d9e5142 100644 (file)
--- a/clients/tui/nmtui.c
+++ b/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"
 

diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index 9cf8ce8..5ab22f4 100644 (file)
--- a/clients/tui/vpn-helpers.c
+++ b/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"

diff --git a/clients/tui/vpn-helpers.h b/clients/tui/vpn-helpers.h
index 4503b81..47fc27e 100644 (file)
--- a/clients/tui/vpn-helpers.h
+++ b/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);
 

diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h
index 9d1beab..a98ced7 100644 (file)
--- a/include/nm-macros-internal.h
+++ b/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"
 
 /********************************************************/
 

diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 2c60e98..a8f64b4 100644 (file)
--- a/include/nm-test-utils.h
+++ b/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.

diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
index c6b6653..77bc071 100644 (file)
--- a/libnm-core/crypto.c
+++ b/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"
 

diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h
index d478410..c77ada5 100644 (file)
--- a/libnm-core/crypto.h
+++ b/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"

diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
index 32692fd..6098b86 100644 (file)
--- a/libnm-core/crypto_gnutls.c
+++ b/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"
 

diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index 0c5905c..a1916a2 100644 (file)
--- a/libnm-core/crypto_nss.c
+++ b/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"
 

diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 353421a..fd4b573 100644 (file)
--- a/libnm-core/nm-connection.c
+++ b/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

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index 4081a32..8028283 100644 (file)
--- a/libnm-core/nm-core-internal.h
+++ b/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) \

diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index e2e3265..6d75176 100644 (file)
--- a/libnm-core/nm-dbus-utils.c
+++ b/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 {

diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index b2e9506..28e5ca2 100644 (file)
--- a/libnm-core/nm-errors.c
+++ b/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"

diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index 5f4c927..7873aa7 100644 (file)
--- a/libnm-core/nm-keyfile-internal.h
+++ b/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"
 

diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index dfc3944..22141bd 100644 (file)
--- a/libnm-core/nm-keyfile-reader.c
+++ b/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"
 

diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index 2540afe..15b14a3 100644 (file)
--- a/libnm-core/nm-keyfile-utils.c
+++ b/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"

diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c
index 9dc9b38..a227088 100644 (file)
--- a/libnm-core/nm-keyfile-writer.c
+++ b/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"
 

diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index a52c3cc..d244f74 100644 (file)
--- a/libnm-core/nm-property-compare.c
+++ b/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)

diff --git a/libnm-core/nm-property-compare.h b/libnm-core/nm-property-compare.h
index c03d147..3f10581 100644 (file)
--- a/libnm-core/nm-property-compare.h
+++ b/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);
 

diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 235be6a..21fa9a4 100644 (file)
--- a/libnm-core/nm-setting-8021x.c
+++ b/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

diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index b4cd213..6d4441d 100644 (file)
--- a/libnm-core/nm-setting-ip-config.c
+++ b/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"

diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index ea81948..aa90d9c 100644 (file)
--- a/libnm-core/nm-setting-private.h
+++ b/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"

diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c
index 668565f..b8589cd 100644 (file)
--- a/libnm-core/nm-setting-serial.c
+++ b/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"
 

diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 07daeac..f9dee47 100644 (file)
--- a/libnm-core/nm-setting.c
+++ b/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"

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 0ed4814..6b6a35d 100644 (file)
--- a/libnm-core/nm-utils.c
+++ b/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"

diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c
index 6e861ff..914330f 100644 (file)
--- a/libnm-core/tests/test-compare.c
+++ b/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"

diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index 282939f..0d68653 100644 (file)
--- a/libnm-core/tests/test-crypto.c
+++ b/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"

diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index a033b9c..063bda7 100644 (file)
--- a/libnm-core/tests/test-general.c
+++ b/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"

diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index 6995522..4c0c7f5 100644 (file)
--- a/libnm-core/tests/test-secrets.c
+++ b/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"

diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c
index 255448b..49d7448 100644 (file)
--- a/libnm-core/tests/test-setting-8021x.c
+++ b/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"
 

diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c
index 2e9fa1a..f8b789c 100644 (file)
--- a/libnm-core/tests/test-setting-dcb.c
+++ b/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"

diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index 81d7542..21e16f3 100644 (file)
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/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"

diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index c8ea986..3b8f6ca 100644 (file)
--- a/libnm-glib/libnm-glib-test.c
+++ b/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"

diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index 7e99db1..09d9bea 100644 (file)
--- a/libnm-glib/libnm_glib.c
+++ b/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"
 

diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 5c6ba00..3a420ea 100644 (file)
--- a/libnm-glib/nm-access-point.c
+++ b/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"

diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c
index 613c357..539eb75 100644 (file)
--- a/libnm-glib/nm-active-connection.c
+++ b/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"

diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index e47a275..a30b096 100644 (file)
--- a/libnm-glib/nm-client.c
+++ b/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"

diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h
index b2c992b..c78bf1d 100644 (file)
--- a/libnm-glib/nm-dbus-helpers-private.h
+++ b/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);
 

diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c
index 44ae13a..db75eb2 100644 (file)
--- a/libnm-glib/nm-dbus-helpers.c
+++ b/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"
 

diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index b8a253c..12df490 100644 (file)
--- a/libnm-glib/nm-device-bond.c
+++ b/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"

diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c
index f80835a..d08104d 100644 (file)
--- a/libnm-glib/nm-device-bridge.c
+++ b/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"

diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c
index 5b09399..3d7d183 100644 (file)
--- a/libnm-glib/nm-device-bt.c
+++ b/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"

diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index 24e3f36..b591461 100644 (file)
--- a/libnm-glib/nm-device-ethernet.c
+++ b/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"

diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
index 10b65aa..b9af887 100644 (file)
--- a/libnm-glib/nm-device-infiniband.c
+++ b/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"

diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c
index 7ef2926..88c15dd 100644 (file)
--- a/libnm-glib/nm-device-modem.c
+++ b/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"

diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c
index f33c68e..69acce4 100644 (file)
--- a/libnm-glib/nm-device-olpc-mesh.c
+++ b/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"

diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c
index 6a16846..e762296 100644 (file)
--- a/libnm-glib/nm-device-team.c
+++ b/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"

diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c
index 475be6b..fe3db03 100644 (file)
--- a/libnm-glib/nm-device-vlan.c
+++ b/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"

diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index 788e669..05b47b4 100644 (file)
--- a/libnm-glib/nm-device-wifi.c
+++ b/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"

diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index e941420..70c8b14 100644 (file)
--- a/libnm-glib/nm-device-wimax.c
+++ b/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"

diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index b511254..2363167 100644 (file)
--- a/libnm-glib/nm-device.c
+++ b/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"

diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c
index 09bf720..82af114 100644 (file)
--- a/libnm-glib/nm-object-cache.c
+++ b/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"
 

diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h
index 5fcd2ef..30b62f0 100644 (file)
--- a/libnm-glib/nm-object-cache.h
+++ b/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

diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h
index 519f677..8878354 100644 (file)
--- a/libnm-glib/nm-object-private.h
+++ b/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);

diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index b92b0ca..44ca947 100644 (file)
--- a/libnm-glib/nm-object.c
+++ b/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"

diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index 1dce200..ce750ef 100644 (file)
--- a/libnm-glib/nm-remote-connection.c
+++ b/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"

diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index d2fa2db..421f703 100644 (file)
--- a/libnm-glib/nm-remote-settings.c
+++ b/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"

diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 32b8564..99871ad 100644 (file)
--- a/libnm-glib/nm-secret-agent.c
+++ b/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"

diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c
index daafc2b..30936f4 100644 (file)
--- a/libnm-glib/nm-types.c
+++ b/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"

diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index 290ecb4..6a728f9 100644 (file)
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <signal.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-plugin.h"
 #include "nm-vpn-enum-types.h"
 #include "nm-utils.h"

diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
index e85fb4e..1c40a21 100644 (file)
--- a/libnm-glib/nm-wimax-nsp.c
+++ b/libnm-glib/nm-wimax-nsp.c
@@ -26,7 +26,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-wimax-nsp.h"
 #include "NetworkManager.h"
 #include "nm-types-private.h"

diff --git a/libnm-glib/tests/common.c b/libnm-glib/tests/common.c
index 3989f75..f68c4b1 100644 (file)
--- a/libnm-glib/tests/common.c
+++ b/libnm-glib/tests/common.c
@@ -23,7 +23,7 @@
 #include <dbus/dbus.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 
 #include "common.h"

diff --git a/libnm-glib/tests/common.h b/libnm-glib/tests/common.h
index 63dbe4d..5ffd955 100644 (file)
--- a/libnm-glib/tests/common.h
+++ b/libnm-glib/tests/common.h
@@ -18,7 +18,7 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 typedef struct {
        GDBusConnection *bus;

diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
index 067d460..f3a5811 100644 (file)
--- a/libnm-glib/tests/test-nm-client.c
+++ b/libnm-glib/tests/test-nm-client.c
@@ -28,7 +28,7 @@
 #include <signal.h>
 
 #include <NetworkManager.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-client.h"
 #include "nm-device-wifi.h"
 #include "nm-device-ethernet.h"

diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c
index b40a0fa..831c1be 100644 (file)
--- a/libnm-glib/tests/test-remote-settings-client.c
+++ b/libnm-glib/tests/test-remote-settings-client.c
@@ -33,7 +33,7 @@
 #include <nm-setting-wired.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-remote-settings.h"
 #include "common.h"
 

diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 8b6198c..fccf05d 100644 (file)
--- a/libnm-util/crypto.c
+++ b/libnm-util/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"
 
 GQuark

diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h
index 3604158..74d1adb 100644 (file)
--- a/libnm-util/crypto.h
+++ b/libnm-util/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"

diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index 8b0c9f7..1ff55e9 100644 (file)
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/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"
 
 #define SALT_LEN 8

diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index 9f60f5c..222c55d 100644 (file)
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -35,7 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "crypto.h"
 
 static gboolean initialized = FALSE;

diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 2671ce3..0753fd1 100644 (file)
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -25,7 +25,7 @@
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"

diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index 456c341..50903b0 100644 (file)
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-param-spec-specialized.h"
 
 struct _NMParamSpecSpecialized {

diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h
index 226c301..0f1228f 100644 (file)
--- a/libnm-util/nm-param-spec-specialized.h
+++ b/libnm-util/nm-param-spec-specialized.h
@@ -23,7 +23,7 @@
 #ifndef NM_PARAM_SPEC_SPECIALIZED_H
 #define NM_PARAM_SPEC_SPECIALIZED_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized;
 

diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 838a88e..9c6a76b 100644 (file)
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -26,7 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"

diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 8c8055c..1d91648 100644 (file)
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -25,7 +25,7 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"

diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index 1b6c037..6956463 100644 (file)
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/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"
 
 #define NM_SETTING_SECRET_FLAGS_ALL \
        (NM_SETTING_SECRET_FLAG_NONE | \

diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 9524881..c60cffb 100644 (file)
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/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"
 

diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 23c2cbf..c4cc4cf 100644 (file)
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -30,7 +30,7 @@
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"

diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c
index 6a6f5bf..cc7bc50 100644 (file)
--- a/libnm-util/nm-value-transforms.c
+++ b/libnm-util/nm-value-transforms.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"

diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index 290a722..baf0cf4 100644 (file)
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/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"
 

diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 598914d..73c9dd8 100644 (file)
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -29,8 +29,7 @@
 #include <sys/resource.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-setting-connection.h"

diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c
index 66a4831..a24498f 100644 (file)
--- a/libnm-util/tests/test-libnm-linking.c
+++ b/libnm-util/tests/test-libnm-linking.c
@@ -23,7 +23,7 @@
 
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 extern GType nm_state_get_type (void);
 

diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c
index cc23813..f5423d1 100644 (file)
--- a/libnm-util/tests/test-secrets.c
+++ b/libnm-util/tests/test-secrets.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-wired.h"
 #include "nm-setting-8021x.h"

diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c
index 9790669..ad48ac6 100644 (file)
--- a/libnm-util/tests/test-setting-8021x.c
+++ b/libnm-util/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"
 

diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c
index 20a0225..26c4f0c 100644 (file)
--- a/libnm-util/tests/test-setting-dcb.c
+++ b/libnm-util/tests/test-setting-dcb.c
@@ -23,9 +23,8 @@
 
 #include <string.h>
 #include <nm-utils.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-dcb.h"
-#include "gsystem-local-alloc.h"
 
 #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \
                        NM_SETTING_DCB_FLAG_ADVERTISE | \

diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c
index 1f0ba1c..09f112c 100644 (file)
--- a/libnm-util/tests/test-settings-defaults.c
+++ b/libnm-util/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"

diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 95c2cf5..bd05134 100644 (file)
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -29,7 +29,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 "nm-dbus-interface.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index f2951fb..b160802 100644 (file)
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 5ddb70b..85cf4ae 100644 (file)
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-client.h"
 #include "nm-manager.h"
 #include "nm-remote-settings.h"

diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 717f7f4..5d876e0 100644 (file)
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-helpers.h"
 #include "nm-dbus-interface.h"
 

diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h
index 2b0809f..497739f 100644 (file)
--- a/libnm/nm-dbus-helpers.h
+++ b/libnm/nm-dbus-helpers.h
@@ -22,7 +22,7 @@
 #define __NM_DBUS_HELPERS_PRIVATE_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-compat.h"
 
 GBusType _nm_dbus_bus_type (void);

diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 8959f1e..f36b761 100644 (file)
--- a/libnm/nm-device-bond.c
+++ b/libnm/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"

diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 2b9efbd..4ebcec3 100644 (file)
--- a/libnm/nm-device-bridge.c
+++ b/libnm/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"

diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 0156631..1a0ecb9 100644 (file)
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -28,7 +28,7 @@
 #include <nm-setting-bluetooth.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-bt.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index 21bb52b..ac18d30 100644 (file)
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -29,7 +29,7 @@
 #include <nm-setting-pppoe.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index e8436a9..c59dd0f 100644 (file)
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -27,7 +27,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"

diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 81d7570..e62b10b 100644 (file)
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -28,7 +28,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"

diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 32b40eb..1cf3c33 100644 (file)
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -26,7 +26,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"

diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 5fc09cd..540786c 100644 (file)
--- a/libnm/nm-device-team.c
+++ b/libnm/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"

diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index d499242..0b95450 100644 (file)
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -28,7 +28,7 @@
 #include <nm-setting-wired.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"

diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 94bb5d3..a6a717f 100644 (file)
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -29,7 +29,7 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-wifi.h"
 #include "nm-access-point.h"
 #include "nm-device-private.h"

diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 61406ff..bc2337a 100644 (file)
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -28,7 +28,7 @@
 #include <nm-setting-wimax.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-wimax.h"
 #include "nm-wimax-nsp.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index ba9234d..5a23fab 100644 (file)
--- a/libnm/nm-device.c
+++ b/libnm/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 "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-device-ethernet.h"

diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 48e1d83..25ab1f8 100644 (file)
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -25,7 +25,7 @@
 #include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-manager.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"

diff --git a/libnm/nm-object-cache.c b/libnm/nm-object-cache.c
index 09bf720..82af114 100644 (file)
--- a/libnm/nm-object-cache.c
+++ b/libnm/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"
 

diff --git a/libnm/nm-object-cache.h b/libnm/nm-object-cache.h
index 5e5eead..c0f70f2 100644 (file)
--- a/libnm/nm-object-cache.h
+++ b/libnm/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

diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h
index f8fcee9..7e8066f 100644 (file)
--- a/libnm/nm-object-private.h
+++ b/libnm/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"
 
 typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer);

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index b86dc7d..9d6bde9 100644 (file)
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"

diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index a27c040..83da4f9 100644 (file)
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -27,7 +27,7 @@
 #include <nm-dbus-interface.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"

diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index d6a786a..999859c 100644 (file)
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -26,7 +26,7 @@
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-remote-settings.h"
 #include "nm-client.h"
 #include "nm-remote-connection.h"

diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 97f3bc8..97bb287 100644 (file)
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-secret-agent-old.h"
 #include "nm-enum-types.h"

diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index ff7ce83..a98cd43 100644 (file)
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-plugin-old.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 3fa4ddf..9fbc6ea 100644 (file)
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -26,7 +26,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-wimax-nsp.h"
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"

diff --git a/libnm/tests/common.c b/libnm/tests/common.c
index 833d7fd..877488e 100644 (file)
--- a/libnm/tests/common.c
+++ b/libnm/tests/common.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManager.h"
 #include "nm-dbus-compat.h"
 

diff --git a/libnm/tests/common.h b/libnm/tests/common.h
index 1fd3f46..4919d3f 100644 (file)
--- a/libnm/tests/common.h
+++ b/libnm/tests/common.h
@@ -20,7 +20,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 typedef struct {
        GDBusConnection *bus;

diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 55b0050..ccd952c 100644 (file)
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -26,7 +26,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 2f47b53..66fbf2b 100644 (file)
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -26,7 +26,7 @@
 
 #include <NetworkManager.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 28a6c99..ed2e2dc 100644 (file)
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -27,7 +27,7 @@
 #include <NetworkManager.h>
 #include <nm-secret-agent-old.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index 1043944..e92d9f7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,7 +59,9 @@ SYSTEMD_NM_CFLAGS = \
        -I$(top_srcdir)/src/systemd/src/libsystemd-network \
        -I$(top_srcdir)/src/systemd/src/basic \
        -I$(top_srcdir)/src/systemd/src/shared \
-       -I$(top_srcdir)/src/systemd
+       -I$(top_srcdir)/src/systemd \
+       -I$(top_srcdir)/libnm-core \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
 
 libsystemd_nm_la_SOURCES = \
        systemd/src/libsystemd/sd-id128/sd-id128.c \

diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index c9a7e13..d8e5fed 100644 (file)
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -33,12 +33,11 @@
 #include <linux/if.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-platform.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
 #include "nm-device.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
@@ -47,7 +46,6 @@
 #include "nm-setting-wireless-security.h"
 #include "nm-auth-utils.h"
 #include "nm-dbus-glib-types.h"
-#include "gsystem-local-alloc.h"
 
 /*
  * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export

diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 118534b..6a81217 100644 (file)
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -25,9 +25,8 @@
 #include <stdio.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
-#include "nm-types.h"
 
 /*****************************************************************************/
 

diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index 1718cdd..6a33d21 100644 (file)
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -24,12 +24,11 @@
 #include <gudev/gudev.h>
 #include <gmodule.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-atm-manager.h"
 #include "nm-setting-adsl.h"
 #include "nm-device-adsl.h"
 #include "nm-device-factory.h"
-#include "nm-logging.h"
 
 typedef struct {
        GUdevClient *client;

diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h
index 16dc332..fe0bc14 100644 (file)
--- a/src/devices/adsl/nm-atm-manager.h
+++ b/src/devices/adsl/nm-atm-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_ATM_MANAGER_H__
 #define __NETWORKMANAGER_ATM_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index a557a0c..3439028 100644 (file)
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -33,11 +33,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-adsl.h"
 #include "nm-device-private.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
 

diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h
index 74e29d5..3587bfc 100644 (file)
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/devices/adsl/nm-device-adsl.h
@@ -23,7 +23,7 @@
 #define __NETWORKMANAGER_DEVICE_ADSL_H__
 
 // Parent class
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 39afd09..ba02179 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -24,13 +24,12 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 
 #include "nm-bt-error.h"
 #include "nm-bluez-common.h"
 #include "nm-bluez-device.h"
-#include "nm-logging.h"
 #include "nm-settings-connection.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h
index 01052c8..0e54fcb 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-device.h
+++ b/src/devices/bluetooth/nm-bluez-device.h
@@ -23,7 +23,7 @@
 
 
 #include "config.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-connection-provider.h"
 

diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index ed424bd..7550d4e 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -25,8 +25,7 @@
 #include <stdlib.h>
 #include <gmodule.h>
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-bluez-manager.h"
 #include "nm-device-factory.h"
 #include "nm-setting-bluetooth.h"

diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/devices/bluetooth/nm-bluez-manager.h
index 97b9ac6..1f5597d 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-manager.h
+++ b/src/devices/bluetooth/nm-bluez-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_BLUEZ_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index e02e720..04ae833 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -22,12 +22,11 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-bluez4-adapter.h"
 #include "nm-bluez-device.h"
 #include "nm-bluez-common.h"
-#include "nm-logging.h"
 #include "nm-core-internal.h"
 
 G_DEFINE_TYPE (NMBluez4Adapter, nm_bluez4_adapter, G_TYPE_OBJECT)

diff --git a/src/devices/bluetooth/nm-bluez4-adapter.h b/src/devices/bluetooth/nm-bluez4-adapter.h
index 98d19b2..a8a2bfb 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-adapter.h
+++ b/src/devices/bluetooth/nm-bluez4-adapter.h
@@ -22,7 +22,7 @@
 #define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-bluez-device.h"
 #include "nm-connection-provider.h"
 

diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c
index 9df80bf..c5ba120 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-manager.c
+++ b/src/devices/bluetooth/nm-bluez4-manager.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-bluez-manager.h"
 #include "nm-bluez4-manager.h"
 #include "nm-bluez4-adapter.h"

diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h
index e5f5264..f6bf765 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-manager.h
+++ b/src/devices/bluetooth/nm-bluez4-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ4_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection-provider.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c
index a97eaa7..9ec6a08 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/devices/bluetooth/nm-bluez5-dun.c
@@ -32,7 +32,7 @@
 
 #include "nm-bluez5-dun.h"
 #include "nm-bt-error.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 
 struct _NMBluez5DunContext {

diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/devices/bluetooth/nm-bluez5-dun.h
index bc2f6c7..c59cbb8 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-dun.h
+++ b/src/devices/bluetooth/nm-bluez5-dun.h
@@ -21,7 +21,7 @@
 #ifndef _NM_BLUEZ5_UTILS_H_
 #define _NM_BLUEZ5_UTILS_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 typedef struct _NMBluez5DunContext NMBluez5DunContext;
 

diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index ceb8d48..c9f5828 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -26,8 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-bluez-manager.h"
 #include "nm-bluez5-manager.h"
 #include "nm-bluez-device.h"

diff --git a/src/devices/bluetooth/nm-bluez5-manager.h b/src/devices/bluetooth/nm-bluez5-manager.h
index faf6ce6..ae5512f 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-manager.h
+++ b/src/devices/bluetooth/nm-bluez5-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_BLUEZ5_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ5_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection-provider.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c
index 11aabbd..9c35d8b 100644 (file)
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/devices/bluetooth/nm-bt-error.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-bt-error.h"
 
 GQuark

diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index 55b8d0a..f0c94f8 100644 (file)
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -25,12 +25,11 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-bluez-common.h"
 #include "nm-bluez-device.h"
 #include "nm-device-bt.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-bluetooth.h"

diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index b352e51..822062a 100644 (file)
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -25,10 +25,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-device-bond.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index b031a43..a1fbc60 100644 (file)
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -24,10 +24,8 @@
 
 #include <stdlib.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-device-bridge.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-dbus-glib-types.h"

diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h
index e30c48c..1d0bf7c 100644 (file)
--- a/src/devices/nm-device-bridge.h
+++ b/src/devices/nm-device-bridge.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__
 #define __NETWORKMANAGER_DEVICE_BRIDGE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c
index 7c226f0..886edf4 100644 (file)
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -22,7 +22,7 @@
 #include <glib/gi18n.h>
 
 #include <nm-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-ethernet-utils.h"
 
 char *

diff --git a/src/devices/nm-device-ethernet-utils.h b/src/devices/nm-device-ethernet-utils.h
index 1ca181b..31d645d 100644 (file)
--- a/src/devices/nm-device-ethernet-utils.h
+++ b/src/devices/nm-device-ethernet-utils.h
@@ -19,7 +19,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_ETHERNET_UTILS_H__
 #define __NETWORKMANAGER_DEVICE_ETHERNET_UTILS_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 char *nm_device_ethernet_utils_get_default_wired_name (const GSList *connections);
 

diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 6caea49..fc49fd1 100644 (file)
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -30,7 +30,7 @@
 
 #include <gudev/gudev.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-activation-request.h"
@@ -39,7 +39,6 @@
 #include "nm-supplicant-interface.h"
 #include "nm-supplicant-config.h"
 #include "ppp-manager/nm-ppp-manager.h"
-#include "nm-logging.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
 #include "nm-platform-utils.h"
@@ -51,7 +50,6 @@
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 
 #include "nm-device-ethernet-glue.h"
 

diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 7f2468b..bf3f25c 100644 (file)
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -27,7 +27,7 @@
 #include <gmodule.h>
 
 #include "nm-device-factory.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 
 const NMLinkType _nm_device_factory_no_default_links[] = { NM_LINK_TYPE_NONE };

diff --git a/src/devices/nm-device-gre.c b/src/devices/nm-device-gre.c
index 4716989..c26190a 100644 (file)
--- a/src/devices/nm-device-gre.c
+++ b/src/devices/nm-device-gre.c
@@ -25,7 +25,7 @@
 
 #include "nm-device-gre.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-manager.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index ce53165..a3fcd75 100644 (file)
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -24,9 +24,8 @@
 
 #include <linux/if_infiniband.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-infiniband.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-enum-types.h"

diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h
index acca32e..7b8598d 100644 (file)
--- a/src/devices/nm-device-logging.h
+++ b/src/devices/nm-device-logging.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__
 #define __NETWORKMANAGER_DEVICE_LOGGING_H__
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-device.h"
 
 #define _LOG_DECLARE_SELF(t) \

diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 51d75b5..6f33157 100644 (file)
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -24,7 +24,7 @@
 
 #include "nm-device-macvlan.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-manager.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h
index c4e3fe0..33f51bf 100644 (file)
--- a/src/devices/nm-device-private.h
+++ b/src/devices/nm-device-private.h
@@ -24,7 +24,7 @@
 
 #include "nm-device.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 
 /* This file should only be used by subclasses of NMDevice */
 

diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c
index e2af6b2..6c6ed52 100644 (file)
--- a/src/devices/nm-device-tun.c
+++ b/src/devices/nm-device-tun.c
@@ -25,7 +25,7 @@
 
 #include "nm-device-tun.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"
 

diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c
index 1a3a654..c4666a2 100644 (file)
--- a/src/devices/nm-device-veth.c
+++ b/src/devices/nm-device-veth.c
@@ -29,7 +29,7 @@
 
 #include "nm-device-veth.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-manager.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index d89bf62..defa3b8 100644 (file)
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -24,10 +24,9 @@
 
 #include <sys/socket.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-vlan.h"
 #include "nm-manager.h"
-#include "nm-logging.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
@@ -39,7 +38,6 @@
 #include "nm-device-factory.h"
 #include "nm-manager.h"
 #include "nm-core-internal.h"
-#include "gsystem-local-alloc.h"
 
 #include "nm-device-vlan-glue.h"
 

diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c
index 4f46f6a..68dbd95 100644 (file)
--- a/src/devices/nm-device-vxlan.c
+++ b/src/devices/nm-device-vxlan.c
@@ -24,7 +24,7 @@
 
 #include "nm-device-vxlan.h"
 #include "nm-device-private.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-manager.h"
 #include "nm-platform.h"
 #include "nm-utils.h"

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 46d90cf..c2c8690 100644 (file)
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -35,8 +35,7 @@
 #include <fcntl.h>
 #include <netlink/route/addr.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
 #include "NetworkManagerUtils.h"
@@ -45,7 +44,6 @@
 #include "nm-rdisc.h"
 #include "nm-lndp-rdisc.h"
 #include "nm-dhcp-manager.h"
-#include "nm-logging.h"
 #include "nm-activation-request.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"

diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 9e0dcac..8c26d16 100644 (file)
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -27,7 +27,7 @@
 
 #include "nm-exported-object.h"
 #include "nm-dbus-interface.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-rfkill-manager.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index 145b854..5b5b760 100644 (file)
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -28,9 +28,8 @@
 #include <teamdctl.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-team.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"
@@ -38,7 +37,6 @@
 #include "nm-enum-types.h"
 #include "nm-team-enum-types.h"
 #include "nm-core-internal.h"
-#include "gsystem-local-alloc.h"
 
 #include "nm-device-team-glue.h"
 

diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index 949e01d..8591782 100644 (file)
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -26,7 +26,7 @@
 #include "nm-device-factory.h"
 #include "nm-team-factory.h"
 #include "nm-device-team.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 #include "nm-core-internal.h"
 

diff --git a/src/devices/team/nm-team-factory.h b/src/devices/team/nm-team-factory.h
index 35cee90..9049478 100644 (file)
--- a/src/devices/team/nm-team-factory.h
+++ b/src/devices/team/nm-team-factory.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_TEAM_FACTORY_H__
 #define __NETWORKMANAGER_TEAM_FACTORY_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_TYPE_TEAM_FACTORY (nm_team_factory_get_type ())
 #define NM_TEAM_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEAM_FACTORY, NMTeamFactory))

diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index f7fffd2..7e37a2c 100644 (file)
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -37,13 +37,12 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device.h"
 #include "nm-device-wifi.h"
 #include "nm-device-olpc-mesh.h"
 #include "nm-device-private.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-activation-request.h"
 #include "nm-setting-connection.h"

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index ed7a402..42326d5 100644 (file)
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -28,13 +28,11 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 #include "nm-activation-request.h"
 #include "nm-supplicant-manager.h"

diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c
index 9ac7052..d8b87d2 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap-utils.c
+++ b/src/devices/wifi/nm-wifi-ap-utils.c
@@ -25,6 +25,7 @@
 
 #include <glib/gi18n.h>
 
+#include "nm-default.h"
 #include "nm-wifi-ap-utils.h"
 #include "nm-utils.h"
 

diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index 7166e1f..6502e88 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -24,16 +24,14 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-wifi-ap.h"
 #include "nm-wifi-ap-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-core-internal.h"
 
 #include "nm-setting-wireless.h"
-#include "gsystem-local-alloc.h"
 
 #include "nm-access-point-glue.h"
 

diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c
index b7323b8..9b0092c 100644 (file)
--- a/src/devices/wifi/tests/test-wifi-ap-utils.c
+++ b/src/devices/wifi/tests/test-wifi-ap-utils.c
@@ -22,12 +22,11 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-wifi-ap-utils.h"
 #include "nm-dbus-glib-types.h"
 
 #include "nm-core-internal.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index bd115b4..9fdcef4 100644 (file)
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -22,12 +22,11 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-modem.h"
 #include "nm-modem.h"
 #include "nm-device-private.h"
 #include "nm-rfkill-manager.h"
-#include "nm-logging.h"
 #include "nm-settings-connection.h"
 #include "nm-modem-broadband.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index 2c07b36..fc78248 100644 (file)
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -27,7 +27,7 @@
 
 #include "nm-modem-broadband.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"

diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
index 92ac0a1..c472bc4 100644 (file)
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/devices/wwan/nm-modem-manager.c
@@ -27,7 +27,7 @@
 #include <libmm-glib.h>
 
 #include "nm-modem-manager.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-modem.h"
 #include "nm-modem-broadband.h"
 

diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index b74d72c..be35ffd 100644 (file)
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -25,7 +25,7 @@
 #include "nm-modem.h"
 #include "nm-platform.h"
 #include "nm-setting-connection.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-dbus-glib-types.h"

diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index 0889f72..35b80ba 100644 (file)
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_MODEM_H__
 #define __NETWORKMANAGER_MODEM_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "nm-device.h"
 

diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c
index 863c582..479b5a9 100644 (file)
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/devices/wwan/nm-wwan-factory.c
@@ -29,7 +29,7 @@
 #include "nm-setting-cdma.h"
 #include "nm-modem-manager.h"
 #include "nm-device-modem.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 
 static GType nm_wwan_factory_get_type (void);

diff --git a/src/devices/wwan/nm-wwan-factory.h b/src/devices/wwan/nm-wwan-factory.h
index fc85a92..78031e6 100644 (file)
--- a/src/devices/wwan/nm-wwan-factory.h
+++ b/src/devices/wwan/nm-wwan-factory.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_WWAN_FACTORY_H__
 #define __NETWORKMANAGER_WWAN_FACTORY_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_TYPE_WWAN_FACTORY (nm_wwan_factory_get_type ())
 #define NM_WWAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WWAN_FACTORY, NMWwanFactory))

diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index b560724..332f2d3 100644 (file)
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -5,6 +5,7 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
 nm_dhcp_helper_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/libnm-core \
        -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        -DNMRUNDIR=\"$(nmrundir)\"

diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index c00782f..1032812 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -28,10 +28,9 @@
 #include <stdlib.h>
 #include <uuid/uuid.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-dhcp-client.h"
 #include "nm-dhcp-utils.h"

diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h
index b5f30c5..6e6e0fe 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-client.h
+++ b/src/dhcp-manager/nm-dhcp-client.h
@@ -24,7 +24,7 @@
 #include <nm-ip4-config.h>
 #include <nm-ip6-config.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_TYPE_DHCP_CLIENT            (nm_dhcp_client_get_type ())
 #define NM_DHCP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient))

diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 4c889e7..3456ce7 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -24,14 +24,13 @@
 #include <ctype.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
 
 #define CLIENTID_TAG            "send dhcp-client-identifier"

diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
index 70ad7a1..970c6bd 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
@@ -22,7 +22,7 @@
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-ip6-config.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 char *nm_dhcp_dhclient_create_config (const char *interface,
                                       gboolean is_ip6,

diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index d6dde54..4fcba5c 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -34,15 +34,13 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-dhclient.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-listener.h"
-#include "gsystem-local-alloc.h"
 
 G_DEFINE_TYPE (NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT)
 

diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h
index dba9011..3e8d9c5 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient.h
@@ -19,7 +19,7 @@
 #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_H__
 #define __NETWORKMANAGER_DHCP_DHCLIENT_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-client.h"
 
 #define NM_TYPE_DHCP_DHCLIENT            (nm_dhcp_dhclient_get_type ())

diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 716ec84..955e616 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -32,11 +32,10 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-dhcpcd.h"
 #include "nm-dhcp-manager.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-listener.h"
 

diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c
index dde95aa..4086094 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-helper.c
+++ b/src/dhcp-manager/nm-dhcp-helper.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <signal.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_DHCP_CLIENT_DBUS_IFACE   "org.freedesktop.nm_dhcp_client"
 

diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c
index d675dcf..1fb8e36 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-listener.c
+++ b/src/dhcp-manager/nm-dhcp-listener.c
@@ -29,10 +29,9 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-listener.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
 #include "nm-bus-manager.h"
 #include "nm-dbus-glib-types.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/dhcp-manager/nm-dhcp-listener.h b/src/dhcp-manager/nm-dhcp-listener.h
index 015c8eb..b2631ac 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-listener.h
+++ b/src/dhcp-manager/nm-dhcp-listener.h
@@ -19,7 +19,7 @@
 #ifndef __NETWORKMANAGER_DHCP_LISTENER_H__
 #define __NETWORKMANAGER_DHCP_LISTENER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_TYPE_DHCP_LISTENER           (nm_dhcp_listener_get_type ())
 #define NM_DHCP_LISTENER(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_LISTENER, NMDhcpListener))

diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 0f2b8fa..f7ccc01 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -33,12 +33,11 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-manager.h"
 #include "nm-dhcp-dhclient.h"
 #include "nm-dhcp-dhcpcd.h"
 #include "nm-dhcp-systemd.h"
-#include "nm-logging.h"
 #include "nm-config.h"
 #include "nm-dbus-glib-types.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 4286d9f..8a298f0 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -23,7 +23,7 @@
 #define __NETWORKMANAGER_DHCP_MANAGER_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-client.h"
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"

diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index 1ad68a5..6fc8b6e 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -29,13 +29,11 @@
 #include <ctype.h>
 #include <net/if_arp.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-systemd.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-dhcp-utils.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 #include "nm-platform.h"
 
 #include "nm-sd-adapt.h"

diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c
index 85fd257..cdf26fc 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-utils.c
+++ b/src/dhcp-manager/nm-dhcp-utils.c
@@ -24,8 +24,7 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-dhcp-utils.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp-manager/nm-dhcp-utils.h
index fd9e8e2..056982c 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-utils.h
+++ b/src/dhcp-manager/nm-dhcp-utils.h
@@ -24,7 +24,7 @@
 #include <nm-ip4-config.h>
 #include <nm-ip6-config.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 NMIP4Config *nm_dhcp_utils_ip4_config_from_options (int ifindex,
                                                     const char *iface,

diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index 14fbe4f..15817ad 100644 (file)
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -24,8 +24,7 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
@@ -33,7 +32,6 @@
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
 #include "nm-macros-internal.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c
index 3bc8798..0ec1052 100644 (file)
--- a/src/dhcp-manager/tests/test-dhcp-utils.c
+++ b/src/dhcp-manager/tests/test-dhcp-utils.c
@@ -25,9 +25,8 @@
 
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dhcp-utils.h"
-#include "nm-logging.h"
 #include "nm-platform.h"
 
 #include "nm-test-utils.h"

diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index d71a0eb..62c581e 100644 (file)
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -29,10 +29,9 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dns-dnsmasq.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-dns-utils.h"

diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 59cddb9..13b4185 100644 (file)
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -37,13 +37,12 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-dns-manager.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 #include "nm-config.h"
 

diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
index ef1272b..937238f 100644 (file)
--- a/src/dns-manager/nm-dns-manager.h
+++ b/src/dns-manager/nm-dns-manager.h
@@ -24,7 +24,7 @@
 #ifndef __NETWORKMANAGER_DNS_MANAGER_H__
 #define __NETWORKMANAGER_DNS_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 

diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
index c384c66..a53a7fc 100644 (file)
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -25,9 +25,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dns-plugin.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 typedef struct {

diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
index 3e7ce5b..0a46759 100644 (file)
--- a/src/dns-manager/nm-dns-plugin.h
+++ b/src/dns-manager/nm-dns-plugin.h
@@ -19,7 +19,7 @@
 #ifndef __NETWORKMANAGER_DNS_PLUGIN_H__
 #define __NETWORKMANAGER_DNS_PLUGIN_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define NM_TYPE_DNS_PLUGIN            (nm_dns_plugin_get_type ())
 #define NM_DNS_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPlugin))

diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index ea4a2b2..b53d37e 100644 (file)
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -28,10 +28,9 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dnsmasq-manager.h"
 #include "nm-dnsmasq-utils.h"
-#include "nm-logging.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h
index 4b43658..f7d951b 100644 (file)
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.h
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h
@@ -22,7 +22,7 @@
 #define __NETWORKMANAGER_DNSMASQ_MANAGER_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-ip4-config.h"
 
 #define NM_TYPE_DNSMASQ_MANAGER            (nm_dnsmasq_manager_get_type ())

diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.h b/src/dnsmasq-manager/nm-dnsmasq-utils.h
index ed0b9eb..43d0b9a 100644 (file)
--- a/src/dnsmasq-manager/nm-dnsmasq-utils.h
+++ b/src/dnsmasq-manager/nm-dnsmasq-utils.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__
 #define __NETWORKMANAGER_DNSMASQ_UTILS_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 
 gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr,

diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
index e36500d..8cc5fa9 100644 (file)
--- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
@@ -22,9 +22,8 @@
 
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dnsmasq-utils.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/main-utils.c b/src/main-utils.c
index 94437b8..1c24f40 100644 (file)
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -33,11 +33,9 @@
 #include <glib-unix.h>
 #include <gmodule.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 
 static gboolean
 sighup_handler (gpointer user_data)

diff --git a/src/main-utils.h b/src/main-utils.h
index af68568..cae97b5 100644 (file)
--- a/src/main-utils.h
+++ b/src/main-utils.h
@@ -21,7 +21,7 @@
 #ifndef __MAIN_UTILS_H__
 #define __MAIN_UTILS_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 void     nm_main_utils_ensure_root (void);
 

diff --git a/src/main.c b/src/main.c
index 9f6ebdf..14a9c46 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -39,8 +39,7 @@
 #include <string.h>
 #include <sys/resource.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "main-utils.h"
@@ -49,7 +48,6 @@
 #include "nm-bus-manager.h"
 #include "nm-device.h"
 #include "nm-dhcp-manager.h"
-#include "nm-logging.h"
 #include "nm-config.h"
 #include "nm-session-monitor.h"
 #include "nm-dispatcher.h"

diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 2c084b8..e10182c 100644 (file)
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -26,10 +26,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "gsystem-local-alloc.h"
 
 #include "nm-activation-request.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
 #include "nm-device.h"

diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h
index 62b4f62..b93fff5 100644 (file)
--- a/src/nm-activation-request.h
+++ b/src/nm-activation-request.h
@@ -22,8 +22,7 @@
 #define __NETWORKMANAGER_ACTIVATION_REQUEST_H__
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 #include "nm-active-connection.h"
 

diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index e52b467..aeb5bd7 100644 (file)
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -21,18 +21,15 @@
 #include "config.h"
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "nm-active-connection.h"
 #include "nm-dbus-interface.h"
-#include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-device.h"
 #include "nm-settings-connection.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 #include "nm-active-connection-glue.h"
 
 /* Base class for anything implementing the Connection.Active D-Bus interface */

diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index 998ffb1..d429f43 100644 (file)
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -22,7 +22,7 @@
 
 #include "nm-auth-manager.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-errors.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h
index 4589651..2875ccc 100644 (file)
--- a/src/nm-auth-manager.h
+++ b/src/nm-auth-manager.h
@@ -22,7 +22,7 @@
 #define NM_AUTH_MANAGER_H
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-auth-subject.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 7570b3c..5e2eaa7 100644 (file)
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -33,11 +33,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-bus-manager.h"
 #include "nm-enum-types.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 
 G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT)
 

diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h
index 73013d8..3205ced 100644 (file)
--- a/src/nm-auth-subject.h
+++ b/src/nm-auth-subject.h
@@ -25,8 +25,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_TYPE_AUTH_SUBJECT            (nm_auth_subject_get_type ())
 #define NM_AUTH_SUBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_SUBJECT, NMAuthSubject))

diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index e0f770e..969accb 100644 (file)
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -22,11 +22,9 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-setting-connection.h"
 #include "nm-auth-utils.h"
-#include "nm-logging.h"
 #include "nm-auth-subject.h"
 #include "nm-auth-manager.h"
 #include "nm-session-monitor.h"

diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h
index f96fbea..4071b12 100644 (file)
--- a/src/nm-auth-utils.h
+++ b/src/nm-auth-utils.h
@@ -24,8 +24,7 @@
 #include <dbus/dbus-glib.h>
 
 #include <nm-connection.h>
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK     "org.freedesktop.NetworkManager.enable-disable-network"
 #define NM_AUTH_PERMISSION_SLEEP_WAKE                 "org.freedesktop.NetworkManager.sleep-wake"

diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c
index 66c117e..4ebc166 100644 (file)
--- a/src/nm-bus-manager.c
+++ b/src/nm-bus-manager.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-bus-manager.h"
 
@@ -34,7 +34,6 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <string.h>
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 #define PRIV_SOCK_PATH NMRUNDIR "/private"

diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h
index 55919cf..53dbe44 100644 (file)
--- a/src/nm-bus-manager.h
+++ b/src/nm-bus-manager.h
@@ -26,8 +26,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 5e015f0..a804e61 100644 (file)
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -24,12 +24,11 @@
 #include <string.h>
 
 #include "nm-config.h"
-#include "gsystem-local-alloc.h"
 #include "nm-device.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
 #include "nm-macros-internal.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 typedef struct {
        char *group_name;

diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index 052a6b2..8b745f2 100644 (file)
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -22,8 +22,7 @@
 #define NM_CONFIG_DATA_H
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-config.c b/src/nm-config.c
index be04f16..24cca2b 100644 (file)
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -26,13 +26,11 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-config.h"
-#include "nm-logging.h"
 #include "nm-utils.h"
 #include "nm-device.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 #include "nm-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"

diff --git a/src/nm-config.h b/src/nm-config.h
index e492999..e2365ab 100644 (file)
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -23,8 +23,7 @@
 #define __NETWORKMANAGER_CONFIG_H__
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "nm-config-data.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h
index 31b654f..1f15216 100644 (file)
--- a/src/nm-connection-provider.h
+++ b/src/nm-connection-provider.h
@@ -18,8 +18,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_TYPE_CONNECTION_PROVIDER      (nm_connection_provider_get_type ())
 #define NM_CONNECTION_PROVIDER(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider))

diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index e8b854c..5cfc8d6 100644 (file)
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -27,10 +27,9 @@
 #endif
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connectivity.h"
 #include "nm-config.h"
-#include "nm-logging.h"
 
 G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT)
 

diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 66e943c..f037403 100644 (file)
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -22,9 +22,8 @@
 #define __NETWORKMANAGER_CONNECTIVITY_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
-#include "nm-types.h"
 
 #define NM_TYPE_CONNECTIVITY            (nm_connectivity_get_type ())
 #define NM_CONNECTIVITY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity))

diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index b5a1346..109e56e 100644 (file)
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -23,11 +23,10 @@
 #include <sys/wait.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dcb.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 
 static const char *helper_names[] = { "dcbtool", "fcoeadm" };
 

diff --git a/src/nm-dcb.h b/src/nm-dcb.h
index e12fa18..86e6153 100644 (file)
--- a/src/nm-dcb.h
+++ b/src/nm-dcb.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DCB_H__
 #define __NETWORKMANAGER_DCB_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-setting-dcb.h"
 
 gboolean nm_dcb_enable (const char *iface, gboolean enable, GError **error);

diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index b36dd44..12399ea 100644 (file)
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -25,7 +25,7 @@
 
 #include "string.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-device.h"
 #include "nm-vpn-connection.h"
 #include "nm-platform.h"

diff --git a/src/nm-default-route-manager.h b/src/nm-default-route-manager.h
index 4c1b032..2ee4b6d 100644 (file)
--- a/src/nm-default-route-manager.h
+++ b/src/nm-default-route-manager.h
@@ -19,9 +19,8 @@
  */
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-connection.h"
-#include "nm-types.h"
 
 #ifndef __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__
 #define __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__

diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index d2d93d3..5b1345c 100644 (file)
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp4-config-glue.h"

diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index 6b27c53..db7147a 100644 (file)
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-dhcp6-config.h"
 #include "nm-dhcp6-config-glue.h"

diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index d8e6be2..57fb024 100644 (file)
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dispatcher.h"
 #include "nm-dispatcher-api.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
 #include "nm-device.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"

diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
index d4ea329..94f48ab 100644 (file)
--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
@@ -24,8 +24,7 @@
 
 #include <stdio.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "nm-connection.h"
 
 typedef enum {

diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c
index 1023842..9ad734d 100644 (file)
--- a/src/nm-exported-object.c
+++ b/src/nm-exported-object.c
@@ -25,7 +25,7 @@
 #include "nm-exported-object.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-bus-manager.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 static GHashTable *prefix_counters;
 

diff --git a/src/nm-exported-object.h b/src/nm-exported-object.h
index ed67a6d..e0ffd9e 100644 (file)
--- a/src/nm-exported-object.h
+++ b/src/nm-exported-object.h
@@ -23,8 +23,7 @@
 
 #include <dbus/dbus-glib.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 304ee7e..93792b8 100644 (file)
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -22,10 +22,8 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-firewall-manager.h"
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_FIREWALL_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \

diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index 6423cbb..19d9689 100644 (file)
--- a/src/nm-firewall-manager.h
+++ b/src/nm-firewall-manager.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__
 #define __NETWORKMANAGER_FIREWALL_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define FIREWALL_DBUS_SERVICE         "org.fedoraproject.FirewallD1"
 #define FIREWALL_DBUS_PATH            "/org/fedoraproject/FirewallD1"

diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index a35d0d7..07b3d34 100644 (file)
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -37,12 +37,10 @@
  * Forward declare if_nametoindex. */
 extern unsigned int if_nametoindex (const char *__ifname);
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-linux-platform.h"
 #include "nm-dhcp-manager.h"
-#include "nm-logging.h"
 #include "main-utils.h"
 #include "nm-rdisc.h"
 #include "nm-lndp-rdisc.h"

diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 389e99c..f365fd0 100644 (file)
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -26,6 +26,7 @@
 
 #include "nm-ip4-config.h"
 
+#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "nm-dbus-glib-types.h"
@@ -34,7 +35,6 @@
 #include "nm-core-internal.h"
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
-#include "gsystem-local-alloc.h"
 
 G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_EXPORTED_OBJECT)
 

diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 1206da8..b4b5b3e 100644 (file)
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-ip6-config.h"
 
 #include "nm-utils.h"

diff --git a/src/nm-logging.c b/src/nm-logging.c
index 6ee09fb..b74f1a0 100644 (file)
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -39,10 +39,8 @@
 #include <systemd/sd-journal.h>
 #endif
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-errors.h"
-#include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 
 static void

diff --git a/src/nm-logging.h b/src/nm-logging.h
index a346a7a..b334075 100644 (file)
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -26,8 +26,9 @@
 #error nm-test-utils.h must be included as last header
 #endif
 
+#include "nm-logging.h"
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-macros-internal.h"
 
 /* Log domains */

diff --git a/src/nm-manager.c b/src/nm-manager.c
index b14c262..224f084 100644 (file)
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -30,10 +30,8 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-manager.h"
-#include "nm-logging.h"
 #include "nm-bus-manager.h"
 #include "nm-vpn-manager.h"
 #include "nm-device.h"

diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c
index 8a7e4d1..da3507d 100644 (file)
--- a/src/nm-multi-index.c
+++ b/src/nm-multi-index.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-multi-index.h"
 
 #include <string.h>

diff --git a/src/nm-multi-index.h b/src/nm-multi-index.h
index 3438d1c..046e243 100644 (file)
--- a/src/nm-multi-index.h
+++ b/src/nm-multi-index.h
@@ -21,7 +21,7 @@
 #ifndef __NM_MULTI_INDEX__
 #define __NM_MULTI_INDEX__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-policy.c b/src/nm-policy.c
index 2f924ee..939ddfe 100644 (file)
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -27,11 +27,10 @@
 #include <netdb.h>
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-policy.h"
 #include "NetworkManagerUtils.h"
 #include "nm-activation-request.h"
-#include "nm-logging.h"
 #include "nm-device.h"
 #include "nm-default-route-manager.h"
 #include "nm-setting-ip4-config.h"

diff --git a/src/nm-policy.h b/src/nm-policy.h
index 7665352..7824f3e 100644 (file)
--- a/src/nm-policy.h
+++ b/src/nm-policy.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_POLICY_H__
 #define __NETWORKMANAGER_POLICY_H__
 
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_TYPE_POLICY            (nm_policy_get_type ())
 #define NM_POLICY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLICY, NMPolicy))

diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index 27f3ca0..c1f288a 100644 (file)
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -24,7 +24,7 @@
 #include <gudev/gudev.h>
 
 #include "nm-rfkill-manager.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 typedef struct {
        GUdevClient *client;

diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h
index cea6c7a..9b8e23d 100644 (file)
--- a/src/nm-rfkill-manager.h
+++ b/src/nm-rfkill-manager.h
@@ -20,8 +20,7 @@
  */
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__
 #define __NETWORKMANAGER_RFKILL_MANAGER_H__

diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c
index 5ee6c86..9c5d9be 100644 (file)
--- a/src/nm-route-manager.c
+++ b/src/nm-route-manager.c
@@ -26,8 +26,7 @@
 #include "nm-platform.h"
 #include "nmp-object.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 
 /* if within half a second after adding an IP address a matching device-route shows

diff --git a/src/nm-route-manager.h b/src/nm-route-manager.h
index e72bce7..9a08496 100644 (file)
--- a/src/nm-route-manager.h
+++ b/src/nm-route-manager.h
@@ -19,8 +19,7 @@
  */
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #ifndef __NETWORKMANAGER_ROUTE_MANAGER_H__
 #define __NETWORKMANAGER_ROUTE_MANAGER_H__

diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index 8a12552..fb8b7e1 100644 (file)
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -26,9 +26,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-session-monitor.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 #ifdef SESSION_TRACKING_SYSTEMD

diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h
index ef7bd51..dfc86a8 100644 (file)
--- a/src/nm-session-monitor.h
+++ b/src/nm-session-monitor.h
@@ -22,8 +22,7 @@
 #define __NETWORKMANAGER_SESSION_MONITOR_H__
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
index 175c0c1..620cf93 100644 (file)
--- a/src/nm-sleep-monitor-systemd.c
+++ b/src/nm-sleep-monitor-systemd.c
@@ -25,8 +25,7 @@
 #include <glib/gi18n.h>
 #include <gio/gunixfdlist.h>
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
index e3599a2..c65609c 100644 (file)
--- a/src/nm-sleep-monitor-upower.c
+++ b/src/nm-sleep-monitor-upower.c
@@ -22,8 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 
 #include "nm-sleep-monitor.h"

diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
index 3f13d32..21e6b84 100644 (file)
--- a/src/nm-sleep-monitor.h
+++ b/src/nm-sleep-monitor.h
@@ -21,8 +21,7 @@
 #define __NETWORKMANAGER_SLEEP_MONITOR_H__
 
 
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index d5aeb03..03ff8a5 100644 (file)
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -26,11 +26,10 @@
 #include <netinet/in.h>
 #include <linux/rtnetlink.h>
 
-#include "gsystem-local-alloc.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-fake-platform.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index f3a9254..60fe737 100644 (file)
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -50,14 +50,13 @@
 #endif
 #endif
 
-#include "gsystem-local-alloc.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 #include "nm-linux-platform.h"
 #include "nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "wifi/wifi-utils.h"
 #include "wifi/wifi-utils-wext.h"
 #include "nmp-object.h"

diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index 73506c7..c551201 100644 (file)
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -29,10 +29,9 @@
 #include <linux/mii.h>
 #include <linux/version.h>
 
-#include "gsystem-local-alloc.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-setting-wired.h"
 
 

diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 5e9f969..bd8ab8b 100644 (file)
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -29,13 +29,12 @@
 #include <netlink/route/addr.h>
 #include <netlink/route/rtnl.h>
 
-#include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-enum-types.h"
 #include "nm-core-internal.h"
 

diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 448101d..59e8901 100644 (file)
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -26,8 +26,7 @@
 #include <linux/if_addr.h>
 
 #include <nm-dbus-interface.h>
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_TYPE_PLATFORM            (nm_platform_get_type ())

diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c
index 51684b9..05f63b2 100644 (file)
--- a/src/platform/nmp-object.c
+++ b/src/platform/nmp-object.c
@@ -25,7 +25,7 @@
 #include "nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 /*********************************************************************************************/
 

diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c
index 933e124..6c95830 100644 (file)
--- a/src/platform/tests/monitor.c
+++ b/src/platform/tests/monitor.c
@@ -3,10 +3,9 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-fake-platform.h"
 #include "nm-linux-platform.h"
-#include "nm-logging.h"
 
 int
 main (int argc, char **argv)

diff --git a/src/platform/tests/platform.c b/src/platform/tests/platform.c
index ebf162a..31f3635 100644 (file)
--- a/src/platform/tests/platform.c
+++ b/src/platform/tests/platform.c
@@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 #include <netlink/route/addr.h>
 
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 #include "nm-linux-platform.h"
 #include "nm-fake-platform.h"

diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h
index 3d64754..e69f956 100644 (file)
--- a/src/platform/tests/test-common.h
+++ b/src/platform/tests/test-common.h
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 #include "nm-fake-platform.h"
 #include "nm-linux-platform.h"

diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c
index 94d9650..b1dd454 100644 (file)
--- a/src/platform/tests/test-general.c
+++ b/src/platform/tests/test-general.c
@@ -23,7 +23,7 @@
 #include <linux/rtnetlink.h>
 
 #include "nm-linux-platform.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
index 88bb070..836353b 100644 (file)
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/platform/tests/test-nmp-object.c
@@ -20,7 +20,7 @@
 
 #include "nmp-object.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index e427f33..a4d4017 100644 (file)
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -36,11 +36,10 @@
 
 #include <linux/nl80211.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "wifi-utils-private.h"
 #include "wifi-utils-nl80211.h"
 #include "nm-platform.h"
-#include "nm-logging.h"
 #include "nm-utils.h"
 
 typedef struct {

diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h
index 9e5b206..21a4c57 100644 (file)
--- a/src/platform/wifi/wifi-utils-private.h
+++ b/src/platform/wifi/wifi-utils-private.h
@@ -22,7 +22,7 @@
 #define __WIFI_UTILS_PRIVATE_H__
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "wifi-utils.h"
 

diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index 52d1e49..0d7488b 100644 (file)
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -29,10 +29,9 @@
 #include <math.h>
 
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "wifi-utils-private.h"
 #include "wifi-utils-wext.h"
-#include "nm-logging.h"
 #include "nm-utils.h"
 
 /* Hacks necessary to #include wireless.h; yay for WEXT */

diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c
index eab99bf..5f2f61b 100644 (file)
--- a/src/platform/wifi/wifi-utils.c
+++ b/src/platform/wifi/wifi-utils.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "wifi-utils.h"
 #include "wifi-utils-private.h"
 #include "wifi-utils-nl80211.h"

diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
index a5c9fea..21dac9e 100644 (file)
--- a/src/platform/wifi/wifi-utils.h
+++ b/src/platform/wifi/wifi-utils.h
@@ -24,7 +24,7 @@
 
 #include <net/ethernet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 
 typedef struct WifiData WifiData;

diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 15a738c..ee5788f 100644 (file)
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -3,6 +3,7 @@ if WITH_PPP
 AM_CPPFLAGS = \
        -I${top_srcdir}/include \
        -I${top_srcdir}/libnm-core \
+       -I${top_srcdir}/src \
        -I${top_builddir}/libnm-core \
        -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \

diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index f767c29..e3739d9 100644 (file)
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -42,10 +42,9 @@
 #include <linux/if.h>
 #include <linux/if_ppp.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ppp-manager.h"
-#include "nm-logging.h"
 #include "nm-platform.h"
 #include "nm-core-internal.h"
 

diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 9b07519..1f1016a 100644 (file)
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -34,7 +34,7 @@
 #include <pppd/eui64.h>
 #include <pppd/ipv6cp.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-pppd-plugin.h"
 #include "nm-ppp-status.h"

diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c
index 68f43c0..25ba3f7 100644 (file)
--- a/src/rdisc/nm-fake-rdisc.c
+++ b/src/rdisc/nm-fake-rdisc.c
@@ -26,7 +26,7 @@
 #include "nm-fake-rdisc.h"
 #include "nm-rdisc-private.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__)
 #define warning(...) nm_log_warn (LOGD_IP6, __VA_ARGS__)

diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c
index 46f8147..f31a13b 100644 (file)
--- a/src/rdisc/nm-lndp-rdisc.c
+++ b/src/rdisc/nm-lndp-rdisc.c
@@ -30,7 +30,7 @@
 #include "nm-rdisc-private.h"
 
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-platform.h"
 
 #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__)

diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c
index 09d1f5f..35436e9 100644 (file)
--- a/src/rdisc/nm-rdisc.c
+++ b/src/rdisc/nm-rdisc.c
@@ -27,7 +27,7 @@
 #include "nm-rdisc.h"
 #include "nm-rdisc-private.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-utils.h"
 
 #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__)

diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h
index 4c83fb4..def63ee 100644 (file)
--- a/src/rdisc/nm-rdisc.h
+++ b/src/rdisc/nm-rdisc.h
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <netinet/in.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_TYPE_RDISC            (nm_rdisc_get_type ())

diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c
index 3367263..3b248dc 100644 (file)
--- a/src/rdisc/tests/test-rdisc-fake.c
+++ b/src/rdisc/tests/test-rdisc-fake.c
@@ -25,7 +25,7 @@
 
 #include "nm-rdisc.h"
 #include "nm-fake-rdisc.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-fake-platform.h"
 

diff --git a/src/rdisc/tests/test-rdisc-linux.c b/src/rdisc/tests/test-rdisc-linux.c
index eddb3b0..184573b 100644 (file)
--- a/src/rdisc/tests/test-rdisc-linux.c
+++ b/src/rdisc/tests/test-rdisc-linux.c
@@ -25,7 +25,7 @@
 
 #include "nm-rdisc.h"
 #include "nm-lndp-rdisc.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-linux-platform.h"
 

diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index eaf5ff3..e1333ba 100644 (file)
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -26,9 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
-#include "nm-logging.h"
 #include "nm-agent-manager.h"
 #include "nm-secret-agent.h"
 #include "nm-auth-utils.h"

diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c
index 2c4fe9e..681933c 100644 (file)
--- a/src/settings/nm-inotify-helper.c
+++ b/src/settings/nm-inotify-helper.c
@@ -25,9 +25,8 @@
 #include <sys/inotify.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-inotify-helper.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 /* NOTE: this code should be killed once we depend on a new enough glib to

diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h
index 1dd73a5..b4e2c61 100644 (file)
--- a/src/settings/nm-inotify-helper.h
+++ b/src/settings/nm-inotify-helper.h
@@ -23,7 +23,7 @@
 
 #include <sys/inotify.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 /* NOTE: this code should be killed once we depend on a new enough glib to
  * include the patches from https://bugzilla.gnome.org/show_bug.cgi?id=532815

diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 5f659d2..43885fe 100644 (file)
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -26,12 +26,11 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-bus-manager.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-logging.h"
 #include "nm-auth-subject.h"
 #include "nm-simple-connection.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h
index d8712c5..aedc3d2 100644 (file)
--- a/src/settings/nm-secret-agent.h
+++ b/src/settings/nm-secret-agent.h
@@ -23,8 +23,7 @@
 
 
 #include <nm-connection.h>
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 #define NM_TYPE_SECRET_AGENT            (nm_secret_agent_get_type ())
 #define NM_SECRET_AGENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent))

diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index ec0d6c2..b4300e0 100644 (file)
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -26,18 +26,16 @@
 #include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-settings-connection.h"
 #include "nm-session-monitor.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-logging.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"
 #include "nm-agent-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 #include "nm-audit-manager.h"
-#include "gsystem-local-alloc.h"
 
 #define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"
 #define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"

diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index 734d917..b4b4827 100644 (file)
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -26,7 +26,7 @@
 
 #include "nm-exported-object.h"
 #include <nm-connection.h>
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index e0e3af6..d7b76c9 100644 (file)
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -38,7 +38,6 @@
 #include <selinux/selinux.h>
 #endif
 
-#include "gsystem-local-alloc.h"
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include <nm-setting-8021x.h>
@@ -66,7 +65,7 @@
 #include "nm-settings.h"
 #include "nm-settings-connection.h"
 #include "nm-system-config-interface.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-bus-manager.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"

diff --git a/src/settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h
index 1dce931..81a422d 100644 (file)
--- a/src/settings/nm-system-config-interface.h
+++ b/src/settings/nm-system-config-interface.h
@@ -24,8 +24,7 @@
 
 
 #include <nm-connection.h>
-#include "nm-glib.h"
-#include "nm-types.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c
index 2c3504f..feb02dd 100644 (file)
--- a/src/settings/plugins/ibft/plugin.c
+++ b/src/settings/plugins/ibft/plugin.c
@@ -29,10 +29,9 @@
 
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-system-config-interface.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 #include "plugin.h"

diff --git a/src/settings/plugins/ibft/plugin.h b/src/settings/plugins/ibft/plugin.h
index f9426fc..d86b018 100644 (file)
--- a/src/settings/plugins/ibft/plugin.h
+++ b/src/settings/plugins/ibft/plugin.h
@@ -21,7 +21,7 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define SC_TYPE_PLUGIN_IBFT            (sc_plugin_ibft_get_type ())
 #define SC_PLUGIN_IBFT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IBFT, SCPluginIbft))

diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c
index 45006f7..81c83a6 100644 (file)
--- a/src/settings/plugins/ibft/reader.c
+++ b/src/settings/plugins/ibft/reader.c
@@ -33,11 +33,10 @@
 
 #include <glib/gi18n.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 
 #include "reader.h"
 

diff --git a/src/settings/plugins/ibft/reader.h b/src/settings/plugins/ibft/reader.h
index bea32e2..42969ae 100644 (file)
--- a/src/settings/plugins/ibft/reader.h
+++ b/src/settings/plugins/ibft/reader.h
@@ -23,7 +23,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 gboolean read_ibft_blocks (const char *iscsiadm_path,
                            GSList **out_blocks,

diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c
index 980a9ce..c7aef05 100644 (file)
--- a/src/settings/plugins/ibft/tests/test-ibft.c
+++ b/src/settings/plugins/ibft/tests/test-ibft.c
@@ -33,7 +33,7 @@
 #include "NetworkManagerUtils.h"
 
 #include "reader.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/settings/plugins/ifcfg-rh/common.h b/src/settings/plugins/ifcfg-rh/common.h
index 168177f..5d6ebe6 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/common.h
+++ b/src/settings/plugins/ifcfg-rh/common.h
@@ -21,7 +21,7 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define IFCFG_TAG "ifcfg-"
 #define KEYS_TAG "keys-"

diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index 026ce59..acb5b1e 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -34,7 +34,8 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-setting-8021x.h>
 #include "nm-platform.h"
-#include "nm-logging.h"
+
+#include "nm-default.h"
 
 #include "common.h"
 #include "nm-config.h"

diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 4b968aa..c351924 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -42,13 +42,12 @@
 
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "common.h"
 #include "nm-dbus-glib-types.h"
 #include "plugin.h"
 #include "nm-system-config-interface.h"
 #include "nm-config.h"
-#include "nm-logging.h"
 #include "NetworkManagerUtils.h"
 
 #include "nm-ifcfg-connection.h"
@@ -56,7 +55,6 @@
 #include "reader.h"
 #include "writer.h"
 #include "utils.h"
-#include "gsystem-local-alloc.h"
 
 #define IFCFGRH1_DBUS_SERVICE_NAME "com.redhat.ifcfgrh1"
 #define IFCFGRH1_DBUS_OBJECT_PATH "/com/redhat/ifcfgrh1"

diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 69f08eb..41fe18d 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -48,14 +48,12 @@
 #include <nm-setting-bridge-port.h>
 #include <nm-setting-dcb.h>
 #include <nm-setting-generic.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include <nm-utils.h>
 
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
 
 #include "common.h"
 #include "shvar.h"

diff --git a/src/settings/plugins/ifcfg-rh/reader.h b/src/settings/plugins/ifcfg-rh/reader.h
index a9f830f..88f9a72 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/reader.h
+++ b/src/settings/plugins/ifcfg-rh/reader.h
@@ -23,7 +23,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "shvar.h"
 
 NMConnection *connection_from_file (const char *filename,

diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index 283aa82..fad1478 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -36,9 +36,8 @@
 
 #include "shvar.h"
 
-#include "gsystem-local-alloc.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, "    " msg)
 

diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
index 1778206..876be3a 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/shvar.h
+++ b/src/settings/plugins/ifcfg-rh/shvar.h
@@ -31,7 +31,7 @@
 #ifndef _SHVAR_H
 #define _SHVAR_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 14473ff..16bc14d 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -54,7 +54,7 @@
 #include "reader.h"
 #include "writer.h"
 #include "utils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index 4d38c9b..599e3a4 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -23,11 +23,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
 #include "NetworkManagerUtils.h"
-#include "gsystem-local-alloc.h"
 
 #include "utils.h"
 #include "shvar.h"

diff --git a/src/settings/plugins/ifcfg-rh/utils.h b/src/settings/plugins/ifcfg-rh/utils.h
index d8b4784..329f454 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/utils.h
+++ b/src/settings/plugins/ifcfg-rh/utils.h
@@ -22,10 +22,9 @@
 #define _UTILS_H_
 
 #include <nm-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "shvar.h"
 #include "common.h"
-#include "nm-logging.h"
 
 #define NM_IFCFG_CONNECTION_LOG_PATH(path)  str_if_set (path,"in-memory")
 #define NM_IFCFG_CONNECTION_LOG_FMT         "%s (%s,\"%s\")"

diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
index d95915f..35c1518 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/writer.c
+++ b/src/settings/plugins/ifcfg-rh/writer.c
@@ -45,8 +45,7 @@
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
 
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "common.h"
 #include "shvar.h"
 #include "reader.h"

diff --git a/src/settings/plugins/ifcfg-rh/writer.h b/src/settings/plugins/ifcfg-rh/writer.h
index 2c7168d..6938936 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/writer.h
+++ b/src/settings/plugins/ifcfg-rh/writer.h
@@ -25,7 +25,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 gboolean writer_can_write_connection (NMConnection *connection,
                                       GError **error);

diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 888ee58..619eb3e 100644 (file)
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n.h>
 
 #include "nm-system-config-interface.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c
index 6375335..81ea043 100644 (file)
--- a/src/settings/plugins/ifnet/net_parser.c
+++ b/src/settings/plugins/ifnet/net_parser.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include <nm-system-config-interface.h>
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "plugin.h"
 #include "nm-platform.h"

diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h
index c696624..968feaf 100644 (file)
--- a/src/settings/plugins/ifnet/net_parser.h
+++ b/src/settings/plugins/ifnet/net_parser.h
@@ -22,7 +22,7 @@
 #ifndef _NET_PARSER_H
 #define _NET_PARSER_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define CONF_NET_FILE SYSCONFDIR "/conf.d/net"
 

diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c
index 7d0f778..c653dd0 100644 (file)
--- a/src/settings/plugins/ifnet/net_utils.c
+++ b/src/settings/plugins/ifnet/net_utils.c
@@ -28,9 +28,8 @@
 #include <nm-utils.h>
 #include "NetworkManagerUtils.h"
 #include <nm-system-config-interface.h>
-#include "nm-logging.h"
 #include "nm-config.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "net_utils.h"
 #include "wpa_parser.h"
 #include "net_parser.h"

diff --git a/src/settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/net_utils.h
index bcb265d..c1422f6 100644 (file)
--- a/src/settings/plugins/ifnet/net_utils.h
+++ b/src/settings/plugins/ifnet/net_utils.h
@@ -25,7 +25,7 @@
 #include <arpa/inet.h>
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-ip4-config.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "net_parser.h"
 #define has_default_ip4_route(conn_name) has_default_route((conn_name), &is_ip4_address)
 #define has_default_ip6_route(conn_name) has_default_route((conn_name), &is_ip6_address)

diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
index df1598e..7edb032 100644 (file)
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c
@@ -28,7 +28,7 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>
 #include <nm-system-config-interface.h>
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-ifnet-connection.h"
 #include "connection_parser.h"
 #include "net_parser.h"

diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
index b82a9d0..d11bf9a 100644 (file)
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -29,10 +29,9 @@
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
-#include "nm-logging.h"
 #include "nm-ifnet-connection.h"
 #include "nm-config.h"
 

diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h
index 89e0fa3..cb8767b 100644 (file)
--- a/src/settings/plugins/ifnet/plugin.h
+++ b/src/settings/plugins/ifnet/plugin.h
@@ -23,7 +23,7 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define SC_TYPE_PLUGIN_IFNET            (sc_plugin_ifnet_get_type ())
 #define SC_PLUGIN_IFNET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFNET, SCPluginIfnet))

diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c
index 18876e6..96fb5dd 100644 (file)
--- a/src/settings/plugins/ifnet/tests/test-ifnet.c
+++ b/src/settings/plugins/ifnet/tests/test-ifnet.c
@@ -29,9 +29,8 @@
 #include <unistd.h>
 #include <nm-utils.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-linux-platform.h"
-#include "nm-logging.h"
 
 #include "net_parser.h"
 #include "net_utils.h"

diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c
index 5338e78..51474ee 100644 (file)
--- a/src/settings/plugins/ifnet/wpa_parser.c
+++ b/src/settings/plugins/ifnet/wpa_parser.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <nm-system-config-interface.h>
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "wpa_parser.h"
 #include "net_parser.h"
 #include "net_utils.h"

diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h
index 9f2cf60..8099d19 100644 (file)
--- a/src/settings/plugins/ifnet/wpa_parser.h
+++ b/src/settings/plugins/ifnet/wpa_parser.h
@@ -22,7 +22,7 @@
 #ifndef _WPA_PARSER_H
 #define _WPA_PARSER_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define WPA_SUPPLICANT_CONF SYSCONFDIR "/wpa_supplicant/wpa_supplicant.conf"
 

diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
index 32d27c5..4606f5a 100644 (file)
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/interface_parser.c
@@ -29,7 +29,7 @@
 #include <wordexp.h>
 #include <libgen.h>
 #include "nm-utils.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 if_block* first;
 if_block* last;

diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h
index 0b6c8c9..4034d44 100644 (file)
--- a/src/settings/plugins/ifupdown/interface_parser.h
+++ b/src/settings/plugins/ifupdown/interface_parser.h
@@ -24,7 +24,7 @@
 #ifndef _INTERFACE_PARSER_H
 #define _INTERFACE_PARSER_H
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 typedef struct _if_data
 {

diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
index 49c2328..d66789a 100644 (file)
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
@@ -30,7 +30,7 @@
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>
 #include <nm-system-config-interface.h>
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-ifupdown-connection.h"
 #include "parser.h"
 

diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
index bc2df73..54c219f 100644 (file)
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
@@ -25,7 +25,7 @@
 #define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__
 
 #include <nm-settings-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "interface_parser.h"
 
 G_BEGIN_DECLS

diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index 15081a4..1f9553d 100644 (file)
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -31,7 +31,7 @@
 
 #include "nm-core-internal.h"
 #include "nm-system-config-interface.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "parser.h"
 #include "plugin.h"

diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index f2a700c..6e676ca 100644 (file)
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n.h>
 #include <nm-setting-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "interface_parser.h"
 
 #include "nm-dbus-interface.h"
@@ -46,7 +46,6 @@
 #include "plugin.h"
 #include "parser.h"
 
-#include "nm-logging.h"
 #include "nm-config.h"
 
 #include <arpa/inet.h>

diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h
index a9aa56f..8eab4f2 100644 (file)
--- a/src/settings/plugins/ifupdown/plugin.h
+++ b/src/settings/plugins/ifupdown/plugin.h
@@ -24,7 +24,7 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define PLUGIN_NAME "ifupdown"
 

diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index edadd28..24e8afd 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -22,12 +22,10 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
-#include "nm-logging.h"
 #include "interface_parser.h"
 #include "parser.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/settings/plugins/keyfile/common.h b/src/settings/plugins/keyfile/common.h
index 871a745..19fa18c 100644 (file)
--- a/src/settings/plugins/keyfile/common.h
+++ b/src/settings/plugins/keyfile/common.h
@@ -21,7 +21,7 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define KEYFILE_PLUGIN_NAME "keyfile"
 #define KEYFILE_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."

diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
index 744ae9c..06504a9 100644 (file)
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c
@@ -27,6 +27,7 @@
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 
+#include "nm-default.h"
 #include "nm-system-config-interface.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-keyfile-connection.h"
@@ -34,7 +35,6 @@
 #include "writer.h"
 #include "common.h"
 #include "utils.h"
-#include "gsystem-local-alloc.h"
 #include "nm-logging.h"
 
 G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION)

diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 98c4fc5..467cbdb 100644 (file)
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -34,8 +34,7 @@
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 #include "nm-config.h"
-#include "nm-logging.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-core-internal.h"
 
 #include "plugin.h"
@@ -44,7 +43,6 @@
 #include "writer.h"
 #include "common.h"
 #include "utils.h"
-#include "gsystem-local-alloc.h"
 
 static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class);
 

diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h
index 4d77a92..143fead 100644 (file)
--- a/src/settings/plugins/keyfile/plugin.h
+++ b/src/settings/plugins/keyfile/plugin.h
@@ -22,7 +22,7 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 #define SC_TYPE_PLUGIN_KEYFILE            (sc_plugin_keyfile_get_type ())
 #define SC_PLUGIN_KEYFILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_KEYFILE, SCPluginKeyfile))

diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index bd08c17..1c984a1 100644 (file)
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -25,7 +25,7 @@
 
 #include "reader.h"
 
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "nm-keyfile-internal.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/settings/plugins/keyfile/reader.h b/src/settings/plugins/keyfile/reader.h
index 44bf55c..a8021cb 100644 (file)
--- a/src/settings/plugins/keyfile/reader.h
+++ b/src/settings/plugins/keyfile/reader.h
@@ -24,7 +24,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 NMConnection *nm_keyfile_plugin_connection_from_file (const char *filename, GError **error);
 

diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 28e9eb4..375f0d8 100644 (file)
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 
 #include "nm-core-internal.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "reader.h"
 #include "writer.h"

diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
index 1685e22..4300b0d 100644 (file)
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/utils.c
@@ -22,8 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "utils.h"
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>

diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h
index a4c1365..427cd5f 100644 (file)
--- a/src/settings/plugins/keyfile/utils.h
+++ b/src/settings/plugins/keyfile/utils.h
@@ -21,7 +21,7 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_KEYFILE_CONNECTION_LOG_PATH(path)  str_if_set (path,"in-memory")

diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index d5c087d..d3c292b 100644 (file)
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -27,13 +27,11 @@
 #include <errno.h>
 #include <string.h>
 
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 #include "writer.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-keyfile-internal.h"
-#include "gsystem-local-alloc.h"
 
 typedef struct {
        const char *keyfile_dir;

diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h
index e7bb346..25f44e9 100644 (file)
--- a/src/settings/plugins/keyfile/writer.h
+++ b/src/settings/plugins/keyfile/writer.h
@@ -24,7 +24,7 @@
 
 #include <nm-connection.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 
 gboolean nm_keyfile_plugin_write_connection (NMConnection *connection,
                                              const char *existing_path,

diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 62fc8e0..722645d 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -25,10 +25,9 @@
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-config.h"
 #include "nm-supplicant-settings-verify.h"
-#include "nm-logging.h"
 #include "nm-setting.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"

diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h
index 5b5356c..76a404d 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-config.h
+++ b/src/supplicant-manager/nm-supplicant-config.h
@@ -25,7 +25,7 @@
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-setting-8021x.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 56bd5dc..854a774 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -24,12 +24,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-supplicant-interface.h"
-#include "nm-logging.h"
 #include "nm-supplicant-config.h"
-#include "gsystem-local-alloc.h"
 #include "nm-core-internal.h"
 #include "nm-dbus-compat.h"
 

diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h
index 9d930f2..79c88da 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-interface.h
+++ b/src/supplicant-manager/nm-supplicant-interface.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__
 #define __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-types.h"
 
 /*

diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index fff5c07..e0b132e 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -24,10 +24,9 @@
 #include <string.h>
 #include <dbus/dbus.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
-#include "nm-logging.h"
 #include "nm-core-internal.h"
 
 #define NM_SUPPLICANT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \

diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h
index 0378a4e..d745646 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-manager.h
+++ b/src/supplicant-manager/nm-supplicant-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_SUPPLICANT_MANAGER_H__
 #define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-types.h"
 #include "nm-device.h"
 

diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
index 1114bef..f2d5654 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-supplicant-settings-verify.h"
 
 struct Opt {

diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c
index db4342f..9e16360 100644 (file)
--- a/src/supplicant-manager/tests/test-supplicant-config.c
+++ b/src/supplicant-manager/tests/test-supplicant-config.c
@@ -36,7 +36,7 @@
 
 #include "nm-supplicant-config.h"
 #include "nm-supplicant-settings-verify.h"
-#include "nm-logging.h"
+#include "nm-default.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h
index 10592fd..d140b9c 100644 (file)
--- a/src/systemd/nm-sd-adapt.h
+++ b/src/systemd/nm-sd-adapt.h
@@ -39,7 +39,7 @@
 #include <net/if_arp.h>
 #include <sys/resource.h>
 
-#include "nm-logging.h"
+#include "nm-default.h"
 
 /* Missing in Linux 3.2.0, in Ubuntu 12.04 */
 #ifndef BPF_XOR

diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index beb2a29..281a514 100644 (file)
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -24,10 +24,9 @@
 
 
 #include "nm-config.h"
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-test-device.h"
 #include "nm-fake-platform.h"
-#include "nm-logging.h"
 #include "nm-bus-manager.h"
 
 #include "nm-test-utils.h"

diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index b6ca0b7..35f1ed0 100644 (file)
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -22,9 +22,8 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-dcb.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c
index e652abe..b56b067 100644 (file)
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-general-with-expect.c
@@ -26,9 +26,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 #include "nm-multi-index.h"
 
 #include "nm-test-utils.h"

diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index 129802d..ba3d958 100644 (file)
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -23,9 +23,8 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 #include "nm-core-internal.h"
 
 #include "nm-test-utils.h"

diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 0bf0506..828bb34 100644 (file)
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -23,10 +23,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index 1bac506..8b59f6c 100644 (file)
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -23,10 +23,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-ip6-config.h"
 
-#include "nm-logging.h"
 #include "nm-platform.h"
 #include "nm-test-utils.h"
 

diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c
index f8d3e9d..db7006b 100644 (file)
--- a/src/tests/test-resolvconf-capture.c
+++ b/src/tests/test-resolvconf-capture.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-platform.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c
index 6b31fe1..fd9af1b 100644 (file)
--- a/src/tests/test-route-manager.c
+++ b/src/tests/test-route-manager.c
@@ -23,12 +23,11 @@
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "test-common.h"
 
 #include "nm-platform.h"
 #include "nm-route-manager.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c
index da693c9..989345d 100644 (file)
--- a/src/tests/test-wired-defname.c
+++ b/src/tests/test-wired-defname.c
@@ -23,9 +23,8 @@
 
 #include <nm-simple-connection.h>
 #include <nm-setting-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device-ethernet-utils.h"
-#include "nm-logging.h"
 
 #include "nm-test-utils.h"
 

diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 680fccb..3d14fb2 100644 (file)
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -28,12 +28,11 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-connection.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-platform.h"
-#include "nm-logging.h"
 #include "nm-active-connection.h"
 #include "nm-dbus-glib-types.h"
 #include "NetworkManagerUtils.h"
@@ -44,7 +43,6 @@
 #include "nm-default-route-manager.h"
 #include "nm-route-manager.h"
 #include "nm-firewall-manager.h"
-#include "gsystem-local-alloc.h"
 
 #include "nm-vpn-connection-glue.h"
 

diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 8dc46c4..d7947b4 100644 (file)
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-manager.h"
 #include "nm-vpn-service.h"
 #include "nm-vpn-connection.h"
@@ -31,8 +31,6 @@
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
 #include "nm-enum-types.h"
-#include "nm-logging.h"
-#include "gsystem-local-alloc.h"
 
 G_DEFINE_TYPE (NMVpnManager, nm_vpn_manager, G_TYPE_OBJECT)
 

diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h
index c7fe2b1..2034e07 100644 (file)
--- a/src/vpn-manager/nm-vpn-manager.h
+++ b/src/vpn-manager/nm-vpn-manager.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_VPN_MANAGER_H__
 #define __NETWORKMANAGER_VPN_MANAGER_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-connection.h"
 
 #define NM_TYPE_VPN_MANAGER            (nm_vpn_manager_get_type ())

diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c
index 4661ab4..c96242c 100644 (file)
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -27,9 +27,8 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-vpn-service.h"
-#include "nm-logging.h"
 #include "nm-vpn-manager.h"
 
 G_DEFINE_TYPE (NMVpnService, nm_vpn_service, G_TYPE_OBJECT)

diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h
index a748d32..c43d7cd 100644 (file)
--- a/src/vpn-manager/nm-vpn-service.h
+++ b/src/vpn-manager/nm-vpn-service.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_VPN_SERVICE_H__
 #define __NETWORKMANAGER_VPN_SERVICE_H__
 
-#include "nm-glib.h"
+#include "nm-default.h"
 #include "nm-device.h"
 #include "nm-vpn-connection.h"
 #include "nm-vpn-plugin-info.h"