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

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 \

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

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"
 
 /*****************************************************************************/
 

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;

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
 

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"
 

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

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"
 

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"
 

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"

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
 

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)

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"
 

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"

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

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 {

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;
 

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"

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

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

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"

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"

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"

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

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 *

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);
 

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"
 

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 };

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"

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"

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) \

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"

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 */
 

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"
 

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"

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"
 

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"

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"

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"

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"
 

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"
 

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))

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"

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"

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"
 

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"
 

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"
 

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"

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"

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"
 

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"

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"
 

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);

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))

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)\"

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"

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))

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"

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,

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)
 

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 ())

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"
 

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"
 

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"

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))

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"

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"

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"

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"

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,

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"
 

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"

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"

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"
 

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"
 

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 {

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))

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"
 

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 ())

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,

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"
 

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)

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);
 

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"

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"

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"
 

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 */

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"

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

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)
 

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))

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"

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"

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"

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
 

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;

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
 

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"

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

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))