all: add "src/core/nm-default-daemon.h" as replacement for "nm-default.h"

Makefile.am

@@ -1890,13 +1890,12 @@ EXTRA_DIST += \
 src_core_cppflags_base = \
 	-I$(srcdir)/src/core \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 src_core_cppflags_base_test = \
 	$(src_core_cppflags_base) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
 src_core_cppflags_device_plugin = \
@@ -1917,7 +1916,6 @@ src_core_cppflags = \
 
 src_core_cppflags_test = \
 	$(src_core_cppflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(NULL)
 
 if REQUIRE_ROOT_TESTS
@@ -2308,6 +2306,8 @@ EXTRA_DIST += \
 src_core_libNetworkManager_la_CPPFLAGS = $(src_core_cppflags)
 
 src_core_libNetworkManager_la_SOURCES = \
+	\
+	src/core/nm-default-daemon.h \
 	\
 	src/core/nm-checkpoint.c \
 	src/core/nm-checkpoint.h \
@@ -2682,7 +2682,6 @@ src_core_initrd_nm_initrd_generator_LDFLAGS = \
 check_programs += src/core/initrd/tests/test-dt-reader
 
 src_core_initrd_tests_test_dt_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(src_core_cppflags) \
 	$(NULL)
 
@@ -2703,7 +2702,6 @@ src_core_initrd_tests_test_dt_reader_LDADD = \
 check_programs += src/core/initrd/tests/test-ibft-reader
 
 src_core_initrd_tests_test_ibft_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(src_core_cppflags) \
 	$(NULL)
 
@@ -2940,7 +2938,6 @@ EXTRA_DIST += \
 check_programs += src/core/initrd/tests/test-cmdline-reader
 
 src_core_initrd_tests_test_cmdline_reader_CPPFLAGS = \
-	-DNETWORKMANAGER_COMPILATION_TEST \
 	$(src_core_cppflags) \
 	$(NULL)
 

shared/nm-default.h

@@ -22,7 +22,7 @@
     #error Define NETWORKMANAGER_COMPILATION accordingly
 #endif
 
-#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_DAEMON
+#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED
     #error Dont include this header with such NETWORKMANAGER_COMPILATION
 #endif
 

src/core/NetworkManagerUtils.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "NetworkManagerUtils.h"
 

src/core/devices/adsl/nm-atm-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2009 - 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <gmodule.h>
 #include <libudev.h>

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

@@ -3,7 +3,7 @@
  * Pantelis Koukousoulas <pktoss@gmail.com>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-adsl.h"
 

src/core/devices/bluetooth/nm-bluez-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-bluez-manager.h"
 

src/core/devices/bluetooth/nm-bluez5-dun.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <sys/socket.h>
 #include <bluetooth/sdp.h>

src/core/devices/bluetooth/nm-bt-error.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-bt-error.h"
 

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-bt.h"
 

src/core/devices/bluetooth/tests/nm-bt-test.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <glib-unix.h>
 

src/core/devices/nm-acd-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-acd-manager.h"
 

src/core/devices/nm-device-6lowpan.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-6lowpan.h"
 

src/core/devices/nm-device-bond.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-bond.h"
 

src/core/devices/nm-device-bridge.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-bridge.h"
 

src/core/devices/nm-device-dummy.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-dummy.h"
 

src/core/devices/nm-device-ethernet-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ethernet-utils.h"
 

src/core/devices/nm-device-ethernet.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ethernet.h"
 

src/core/devices/nm-device-factory.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-factory.h"
 

src/core/devices/nm-device-generic.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-generic.h"
 

src/core/devices/nm-device-infiniband.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-infiniband.h"
 

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ip-tunnel.h"
 

src/core/devices/nm-device-macsec.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-macsec.h"
 

src/core/devices/nm-device-macvlan.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-macvlan.h"
 

src/core/devices/nm-device-ppp.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ppp.h"
 

src/core/devices/nm-device-tun.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-tun.h"
 

src/core/devices/nm-device-veth.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdlib.h>
 

src/core/devices/nm-device-vlan.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-vlan.h"
 

src/core/devices/nm-device-vrf.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-vrf.h"
 

src/core/devices/nm-device-vxlan.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-vxlan.h"
 

src/core/devices/nm-device-wireguard.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Javier Arteaga <jarteaga@jbeta.is>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-wireguard.h"
 

src/core/devices/nm-device-wpan.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-manager.h"
 #include "nm-device-wpan.h"

src/core/devices/nm-device.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device.h"
 

src/core/devices/nm-lldp-listener.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-lldp-listener.h"
 

src/core/devices/ovs/nm-device-ovs-bridge.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ovs-bridge.h"
 

src/core/devices/ovs/nm-device-ovs-interface.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ovs-interface.h"
 

src/core/devices/ovs/nm-device-ovs-port.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-ovs-port.h"
 

src/core/devices/ovs/nm-ovs-factory.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-manager.h"
 #include "nm-ovsdb.h"

src/core/devices/ovs/nm-ovsdb.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ovsdb.h"
 

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

@@ -4,7 +4,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-team.h"
 

src/core/devices/team/nm-team-factory.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <gmodule.h>
 

src/core/devices/tests/test-acd.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "n-acd/src/n-acd.h"
 

src/core/devices/tests/test-lldp.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <fcntl.h>
 #include <netinet/if_ether.h>

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Intel Corporation
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-iwd.h"
 

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

@@ -8,7 +8,7 @@
  * Copyright (C) 2009 One Laptop per Child
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-olpc-mesh.h"
 

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-wifi-p2p.h"
 

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

@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-wifi.h"
 

src/core/devices/wifi/nm-iwd-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Intel Corporation
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-iwd-manager.h"
 

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

@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wifi-ap.h"
 

src/core/devices/wifi/nm-wifi-common.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wifi-common.h"
 

src/core/devices/wifi/nm-wifi-factory.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <gmodule.h>
 

src/core/devices/wifi/nm-wifi-p2p-peer.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wifi-p2p-peer.h"
 

src/core/devices/wifi/nm-wifi-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wifi-utils.h"
 

src/core/devices/wifi/tests/test-devices-wifi.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "devices/wifi/nm-wifi-utils.h"
 #include "devices/wifi/nm-device-wifi.h"

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2009 - 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-device-modem.h"
 

src/core/devices/wwan/nm-modem-broadband.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-modem-broadband.h"
 #include "nm-service-providers.h"

src/core/devices/wwan/nm-modem-manager.c

@@ -5,7 +5,7 @@
  * Copyright (C) 2009 - 2013 Canonical Ltd.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-modem-manager.h"
 

src/core/devices/wwan/nm-modem-ofono.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2016 Canonical Ltd.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-modem-ofono.h"
 

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

@@ -4,7 +4,7 @@
  * Copyright (C) 2009 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-modem.h"
 

src/core/devices/wwan/nm-service-providers.c

@@ -6,7 +6,7 @@
  * Copyright (C) 2012 Lanedo GmbH
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-service-providers.h"
 

src/core/devices/wwan/nm-wwan-factory.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <gmodule.h>
 

src/core/devices/wwan/tests/test-service-providers.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Red Hat
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-service-providers.h"
 

src/core/dhcp/nm-dhcp-client.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2005 - 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-client.h"
 

src/core/dhcp/nm-dhcp-dhclient-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-dhclient-utils.h"
 

src/core/dhcp/nm-dhcp-dhclient.c

@@ -10,7 +10,7 @@
 #include <time.h>
 #undef _XOPEN_SOURCE
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #if WITH_DHCLIENT
 

src/core/dhcp/nm-dhcp-dhcpcanon.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 juga <juga at riseup dot net>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #if WITH_DHCPCANON
 

src/core/dhcp/nm-dhcp-dhcpcd.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #if WITH_DHCPCD
 

src/core/dhcp/nm-dhcp-listener.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-listener.h"
 

src/core/dhcp/nm-dhcp-manager.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-manager.h"
 

src/core/dhcp/nm-dhcp-nettools.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/core/dhcp/nm-dhcp-options.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-options.h"
 

src/core/dhcp/nm-dhcp-systemd.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/core/dhcp/nm-dhcp-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2005 - 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <unistd.h>
 #include <arpa/inet.h>

src/core/dhcp/tests/test-dhcp-dhclient.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <unistd.h>
 #include <arpa/inet.h>

src/core/dhcp/tests/test-dhcp-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <netinet/in.h>
 #include <arpa/inet.h>

src/core/dns/nm-dns-dnsmasq.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2010 Dan Williams <dcbw@redhat.com>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dns-dnsmasq.h"
 

src/core/dns/nm-dns-manager.c

@@ -5,7 +5,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <fcntl.h>
 #include <resolv.h>

src/core/dns/nm-dns-plugin.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dns-plugin.h"
 

src/core/dns/nm-dns-systemd-resolved.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2016 Sjoerd Simons <sjoerd@luon.net>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dns-systemd-resolved.h"
 

src/core/dns/nm-dns-unbound.c

@@ -4,7 +4,7 @@
  * Author: Pavel Šimerda <psimerda@redhat.com>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dns-unbound.h"
 

src/core/dnsmasq/nm-dnsmasq-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dnsmasq-manager.h"
 

src/core/dnsmasq/nm-dnsmasq-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <arpa/inet.h>
 

src/core/dnsmasq/tests/test-dnsmasq-utils.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <arpa/inet.h>
 

src/core/initrd/nm-initrd-generator.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 #include "nm-core-utils.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile/nm-keyfile-internal.h"

src/core/initrd/nmi-cmdline-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>

src/core/initrd/nmi-dt-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-initrd-generator.h"
 

src/core/initrd/nmi-ibft-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-initrd-generator.h"
 

src/core/initrd/tests/test-cmdline-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>

src/core/initrd/tests/test-dt-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>

src/core/initrd/tests/test-ibft-reader.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>

src/core/main-utils.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <fcntl.h>

src/core/main.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <getopt.h>
 #include <locale.h>

src/core/meson.build

@@ -34,7 +34,9 @@ subdir('systemd')
 
 core_plugins = []
 
-daemon_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON']
+daemon_c_flags = [
+  '-DG_LOG_DOMAIN="NetworkManager"',
+]
 
 platform_wifi_wext_source = files()
 if enable_wext
@@ -224,7 +226,7 @@ executable(
 )
 
 if enable_tests
-  test_c_flags = daemon_c_flags + ['-DNETWORKMANAGER_COMPILATION_TEST']
+  test_c_flags = daemon_c_flags
   if require_root_tests
     test_c_flags += ['-DREQUIRE_ROOT_TESTS=1']
   endif

src/core/ndisc/nm-fake-ndisc.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-fake-ndisc.h"
 

src/core/ndisc/nm-lndp-ndisc.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-lndp-ndisc.h"
 

src/core/ndisc/nm-ndisc.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ndisc.h"
 

src/core/ndisc/tests/test-ndisc-fake.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <syslog.h>
 

src/core/ndisc/tests/test-ndisc-linux.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <syslog.h>
 

src/core/nm-act-request.c

@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-act-request.h"
 

src/core/nm-active-connection.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-active-connection.h"
 

src/core/nm-audit-manager.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-audit-manager.h"