From dc2afc9b7785671d3fb7e2b9e222ebb43f2ed34e Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 4 Feb 2021 18:04:13 +0100
Subject: [PATCH] all: add "src/core/nm-default-daemon.h" as replacement for
 "nm-default.h"

---
 Makefile.am                                   |  9 +++----
 shared/nm-default.h                           |  2 +-
 src/core/NetworkManagerUtils.c                |  2 +-
 src/core/devices/adsl/nm-atm-manager.c        |  2 +-
 src/core/devices/adsl/nm-device-adsl.c        |  2 +-
 src/core/devices/bluetooth/nm-bluez-manager.c |  2 +-
 src/core/devices/bluetooth/nm-bluez5-dun.c    |  2 +-
 src/core/devices/bluetooth/nm-bt-error.c      |  2 +-
 src/core/devices/bluetooth/nm-device-bt.c     |  2 +-
 src/core/devices/bluetooth/tests/nm-bt-test.c |  2 +-
 src/core/devices/nm-acd-manager.c             |  2 +-
 src/core/devices/nm-device-6lowpan.c          |  2 +-
 src/core/devices/nm-device-bond.c             |  2 +-
 src/core/devices/nm-device-bridge.c           |  2 +-
 src/core/devices/nm-device-dummy.c            |  2 +-
 src/core/devices/nm-device-ethernet-utils.c   |  2 +-
 src/core/devices/nm-device-ethernet.c         |  2 +-
 src/core/devices/nm-device-factory.c          |  2 +-
 src/core/devices/nm-device-generic.c          |  2 +-
 src/core/devices/nm-device-infiniband.c       |  2 +-
 src/core/devices/nm-device-ip-tunnel.c        |  2 +-
 src/core/devices/nm-device-macsec.c           |  2 +-
 src/core/devices/nm-device-macvlan.c          |  2 +-
 src/core/devices/nm-device-ppp.c              |  2 +-
 src/core/devices/nm-device-tun.c              |  2 +-
 src/core/devices/nm-device-veth.c             |  2 +-
 src/core/devices/nm-device-vlan.c             |  2 +-
 src/core/devices/nm-device-vrf.c              |  2 +-
 src/core/devices/nm-device-vxlan.c            |  2 +-
 src/core/devices/nm-device-wireguard.c        |  2 +-
 src/core/devices/nm-device-wpan.c             |  2 +-
 src/core/devices/nm-device.c                  |  2 +-
 src/core/devices/nm-lldp-listener.c           |  2 +-
 src/core/devices/ovs/nm-device-ovs-bridge.c   |  2 +-
 .../devices/ovs/nm-device-ovs-interface.c     |  2 +-
 src/core/devices/ovs/nm-device-ovs-port.c     |  2 +-
 src/core/devices/ovs/nm-ovs-factory.c         |  2 +-
 src/core/devices/ovs/nm-ovsdb.c               |  2 +-
 src/core/devices/team/nm-device-team.c        |  2 +-
 src/core/devices/team/nm-team-factory.c       |  2 +-
 src/core/devices/tests/test-acd.c             |  2 +-
 src/core/devices/tests/test-lldp.c            |  2 +-
 src/core/devices/wifi/nm-device-iwd.c         |  2 +-
 src/core/devices/wifi/nm-device-olpc-mesh.c   |  2 +-
 src/core/devices/wifi/nm-device-wifi-p2p.c    |  2 +-
 src/core/devices/wifi/nm-device-wifi.c        |  2 +-
 src/core/devices/wifi/nm-iwd-manager.c        |  2 +-
 src/core/devices/wifi/nm-wifi-ap.c            |  2 +-
 src/core/devices/wifi/nm-wifi-common.c        |  2 +-
 src/core/devices/wifi/nm-wifi-factory.c       |  2 +-
 src/core/devices/wifi/nm-wifi-p2p-peer.c      |  2 +-
 src/core/devices/wifi/nm-wifi-utils.c         |  2 +-
 .../devices/wifi/tests/test-devices-wifi.c    |  2 +-
 src/core/devices/wwan/nm-device-modem.c       |  2 +-
 src/core/devices/wwan/nm-modem-broadband.c    |  2 +-
 src/core/devices/wwan/nm-modem-manager.c      |  2 +-
 src/core/devices/wwan/nm-modem-ofono.c        |  2 +-
 src/core/devices/wwan/nm-modem.c              |  2 +-
 src/core/devices/wwan/nm-service-providers.c  |  2 +-
 src/core/devices/wwan/nm-wwan-factory.c       |  2 +-
 .../wwan/tests/test-service-providers.c       |  2 +-
 src/core/dhcp/nm-dhcp-client.c                |  2 +-
 src/core/dhcp/nm-dhcp-dhclient-utils.c        |  2 +-
 src/core/dhcp/nm-dhcp-dhclient.c              |  2 +-
 src/core/dhcp/nm-dhcp-dhcpcanon.c             |  2 +-
 src/core/dhcp/nm-dhcp-dhcpcd.c                |  2 +-
 src/core/dhcp/nm-dhcp-listener.c              |  2 +-
 src/core/dhcp/nm-dhcp-manager.c               |  2 +-
 src/core/dhcp/nm-dhcp-nettools.c              |  2 +-
 src/core/dhcp/nm-dhcp-options.c               |  2 +-
 src/core/dhcp/nm-dhcp-systemd.c               |  2 +-
 src/core/dhcp/nm-dhcp-utils.c                 |  2 +-
 src/core/dhcp/tests/test-dhcp-dhclient.c      |  2 +-
 src/core/dhcp/tests/test-dhcp-utils.c         |  2 +-
 src/core/dns/nm-dns-dnsmasq.c                 |  2 +-
 src/core/dns/nm-dns-manager.c                 |  2 +-
 src/core/dns/nm-dns-plugin.c                  |  2 +-
 src/core/dns/nm-dns-systemd-resolved.c        |  2 +-
 src/core/dns/nm-dns-unbound.c                 |  2 +-
 src/core/dnsmasq/nm-dnsmasq-manager.c         |  2 +-
 src/core/dnsmasq/nm-dnsmasq-utils.c           |  2 +-
 src/core/dnsmasq/tests/test-dnsmasq-utils.c   |  2 +-
 src/core/initrd/nm-initrd-generator.c         |  2 +-
 src/core/initrd/nmi-cmdline-reader.c          |  2 +-
 src/core/initrd/nmi-dt-reader.c               |  2 +-
 src/core/initrd/nmi-ibft-reader.c             |  2 +-
 src/core/initrd/tests/test-cmdline-reader.c   |  2 +-
 src/core/initrd/tests/test-dt-reader.c        |  2 +-
 src/core/initrd/tests/test-ibft-reader.c      |  2 +-
 src/core/main-utils.c                         |  2 +-
 src/core/main.c                               |  2 +-
 src/core/meson.build                          |  6 +++--
 src/core/ndisc/nm-fake-ndisc.c                |  2 +-
 src/core/ndisc/nm-lndp-ndisc.c                |  2 +-
 src/core/ndisc/nm-ndisc.c                     |  2 +-
 src/core/ndisc/tests/test-ndisc-fake.c        |  2 +-
 src/core/ndisc/tests/test-ndisc-linux.c       |  2 +-
 src/core/nm-act-request.c                     |  2 +-
 src/core/nm-active-connection.c               |  2 +-
 src/core/nm-audit-manager.c                   |  2 +-
 src/core/nm-auth-manager.c                    |  2 +-
 src/core/nm-auth-utils.c                      |  2 +-
 src/core/nm-checkpoint-manager.c              |  2 +-
 src/core/nm-checkpoint.c                      |  2 +-
 src/core/nm-config-data.c                     |  2 +-
 src/core/nm-config.c                          |  2 +-
 src/core/nm-connectivity.c                    |  2 +-
 src/core/nm-core-utils.c                      |  2 +-
 src/core/nm-dbus-manager.c                    |  2 +-
 src/core/nm-dbus-object.c                     |  2 +-
 src/core/nm-dbus-utils.c                      |  2 +-
 src/core/nm-dcb.c                             |  2 +-
 src/core/nm-default-daemon.h                  | 26 +++++++++++++++++++
 src/core/nm-dhcp-config.c                     |  2 +-
 src/core/nm-dispatcher.c                      |  2 +-
 src/core/nm-firewall-manager.c                |  2 +-
 src/core/nm-hostname-manager.c                |  2 +-
 src/core/nm-iface-helper.c                    |  2 +-
 src/core/nm-ip-config.c                       |  2 +-
 src/core/nm-ip4-config.c                      |  2 +-
 src/core/nm-ip6-config.c                      |  2 +-
 src/core/nm-keep-alive.c                      |  2 +-
 src/core/nm-l3-config-data.c                  |  2 +-
 src/core/nm-l3-ipv4ll.c                       |  2 +-
 src/core/nm-l3cfg.c                           |  2 +-
 src/core/nm-manager.c                         |  2 +-
 src/core/nm-netns.c                           |  2 +-
 src/core/nm-pacrunner-manager.c               |  2 +-
 src/core/nm-policy.c                          |  2 +-
 src/core/nm-proxy-config.c                    |  2 +-
 src/core/nm-rfkill-manager.c                  |  2 +-
 src/core/nm-session-monitor.c                 |  2 +-
 src/core/nm-sleep-monitor.c                   |  2 +-
 src/core/platform/nm-fake-platform.c          |  2 +-
 src/core/platform/nm-linux-platform.c         |  2 +-
 src/core/platform/nm-platform.c               |  2 +-
 src/core/platform/nmp-object.c                |  2 +-
 src/core/platform/nmp-rules-manager.c         |  2 +-
 src/core/platform/tests/monitor.c             |  2 +-
 src/core/platform/tests/test-address.c        |  2 +-
 src/core/platform/tests/test-cleanup.c        |  2 +-
 src/core/platform/tests/test-common.c         |  2 +-
 src/core/platform/tests/test-link.c           |  2 +-
 src/core/platform/tests/test-nmp-object.c     |  2 +-
 .../platform/tests/test-platform-general.c    |  2 +-
 src/core/platform/tests/test-route.c          |  2 +-
 src/core/platform/tests/test-tc.c             |  2 +-
 .../platform/wifi/nm-wifi-utils-nl80211.c     |  2 +-
 src/core/platform/wifi/nm-wifi-utils-wext.c   |  2 +-
 src/core/platform/wifi/nm-wifi-utils.c        |  2 +-
 src/core/platform/wpan/nm-wpan-utils.c        |  2 +-
 src/core/ppp/nm-ppp-manager-call.c            |  2 +-
 src/core/ppp/nm-ppp-manager.c                 |  2 +-
 src/core/settings/nm-agent-manager.c          |  2 +-
 src/core/settings/nm-secret-agent.c           |  2 +-
 src/core/settings/nm-settings-connection.c    |  2 +-
 src/core/settings/nm-settings-plugin.c        |  2 +-
 src/core/settings/nm-settings-storage.c       |  2 +-
 src/core/settings/nm-settings-utils.c         |  2 +-
 src/core/settings/nm-settings.c               |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c    |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c    |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-storage.c   |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-utils.c     |  2 +-
 .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c    |  2 +-
 src/core/settings/plugins/ifcfg-rh/shvar.c    |  2 +-
 .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c    |  2 +-
 .../ifupdown/nms-ifupdown-interface-parser.c  |  2 +-
 .../plugins/ifupdown/nms-ifupdown-parser.c    |  2 +-
 .../plugins/ifupdown/nms-ifupdown-plugin.c    |  2 +-
 .../plugins/ifupdown/tests/test-ifupdown.c    |  2 +-
 .../plugins/keyfile/nms-keyfile-plugin.c      |  2 +-
 .../plugins/keyfile/nms-keyfile-reader.c      |  2 +-
 .../plugins/keyfile/nms-keyfile-storage.c     |  2 +-
 .../plugins/keyfile/nms-keyfile-utils.c       |  2 +-
 .../plugins/keyfile/nms-keyfile-writer.c      |  2 +-
 .../keyfile/tests/test-keyfile-settings.c     |  2 +-
 src/core/supplicant/nm-supplicant-config.c    |  2 +-
 src/core/supplicant/nm-supplicant-interface.c |  2 +-
 src/core/supplicant/nm-supplicant-manager.c   |  2 +-
 .../nm-supplicant-settings-verify.c           |  2 +-
 .../supplicant/tests/test-supplicant-config.c |  2 +-
 src/core/tests/config/nm-test-device.c        |  2 +-
 src/core/tests/config/test-config.c           |  2 +-
 src/core/tests/test-core-with-expect.c        |  2 +-
 src/core/tests/test-core.c                    |  2 +-
 src/core/tests/test-dcb.c                     |  2 +-
 src/core/tests/test-ip4-config.c              |  2 +-
 src/core/tests/test-ip6-config.c              |  2 +-
 src/core/tests/test-l3cfg.c                   |  2 +-
 src/core/tests/test-utils.c                   |  2 +-
 src/core/tests/test-wired-defname.c           |  2 +-
 src/core/vpn/nm-vpn-connection.c              |  2 +-
 src/core/vpn/nm-vpn-manager.c                 |  2 +-
 194 files changed, 224 insertions(+), 199 deletions(-)
 create mode 100644 src/core/nm-default-daemon.h

diff --git a/Makefile.am b/Makefile.am
index eb7d8dc99b..714b341697 100644
--- a/Makefile.am
+++ b/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)
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 38ce56a1b3..90968b4a4c 100644
--- a/shared/nm-default.h
+++ b/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
 
diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index d55df95e13..5407221097 100644
--- a/src/core/NetworkManagerUtils.c
+++ b/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"
 
diff --git a/src/core/devices/adsl/nm-atm-manager.c b/src/core/devices/adsl/nm-atm-manager.c
index eab723d5f1..9be9b5ce43 100644
--- a/src/core/devices/adsl/nm-atm-manager.c
+++ b/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>
diff --git a/src/core/devices/adsl/nm-device-adsl.c b/src/core/devices/adsl/nm-device-adsl.c
index 29a73ba14e..34c062a8db 100644
--- a/src/core/devices/adsl/nm-device-adsl.c
+++ b/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"
 
diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c
index 3343b6ede9..dd998d29b0 100644
--- a/src/core/devices/bluetooth/nm-bluez-manager.c
+++ b/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"
 
diff --git a/src/core/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c
index d803b748e0..e29884d8b9 100644
--- a/src/core/devices/bluetooth/nm-bluez5-dun.c
+++ b/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>
diff --git a/src/core/devices/bluetooth/nm-bt-error.c b/src/core/devices/bluetooth/nm-bt-error.c
index ed091474aa..2e49eb7acf 100644
--- a/src/core/devices/bluetooth/nm-bt-error.c
+++ b/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"
 
diff --git a/src/core/devices/bluetooth/nm-device-bt.c b/src/core/devices/bluetooth/nm-device-bt.c
index 0515d29c11..c07be2d3b9 100644
--- a/src/core/devices/bluetooth/nm-device-bt.c
+++ b/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"
 
diff --git a/src/core/devices/bluetooth/tests/nm-bt-test.c b/src/core/devices/bluetooth/tests/nm-bt-test.c
index 546c06a77e..0fc8aa872c 100644
--- a/src/core/devices/bluetooth/tests/nm-bt-test.c
+++ b/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>
 
diff --git a/src/core/devices/nm-acd-manager.c b/src/core/devices/nm-acd-manager.c
index 82b7146d86..b95f90fd45 100644
--- a/src/core/devices/nm-acd-manager.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-6lowpan.c b/src/core/devices/nm-device-6lowpan.c
index 7c0be5978b..fe116dd47a 100644
--- a/src/core/devices/nm-device-6lowpan.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-bond.c b/src/core/devices/nm-device-bond.c
index 5671a42ef5..f68c080b18 100644
--- a/src/core/devices/nm-device-bond.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index 6557558d4c..c919d85dfb 100644
--- a/src/core/devices/nm-device-bridge.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-dummy.c b/src/core/devices/nm-device-dummy.c
index 5ec0b7fe7f..13cfd3b0a3 100644
--- a/src/core/devices/nm-device-dummy.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-ethernet-utils.c b/src/core/devices/nm-device-ethernet-utils.c
index 50da2678e3..a36d12b723 100644
--- a/src/core/devices/nm-device-ethernet-utils.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-ethernet.c b/src/core/devices/nm-device-ethernet.c
index 1c6c300e15..44428869cd 100644
--- a/src/core/devices/nm-device-ethernet.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-factory.c b/src/core/devices/nm-device-factory.c
index 7034202823..81124a8dc3 100644
--- a/src/core/devices/nm-device-factory.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-generic.c b/src/core/devices/nm-device-generic.c
index 17ff407099..a319666a9c 100644
--- a/src/core/devices/nm-device-generic.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-infiniband.c b/src/core/devices/nm-device-infiniband.c
index af1a49b2a4..f54ffcf038 100644
--- a/src/core/devices/nm-device-infiniband.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-ip-tunnel.c b/src/core/devices/nm-device-ip-tunnel.c
index 9124c44643..da6afb3b50 100644
--- a/src/core/devices/nm-device-ip-tunnel.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-macsec.c b/src/core/devices/nm-device-macsec.c
index 390cc6dccd..51b820a165 100644
--- a/src/core/devices/nm-device-macsec.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-macvlan.c b/src/core/devices/nm-device-macvlan.c
index 051f9d6784..e8b39ed6b0 100644
--- a/src/core/devices/nm-device-macvlan.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-ppp.c b/src/core/devices/nm-device-ppp.c
index e8a2cb8a09..4040f2d316 100644
--- a/src/core/devices/nm-device-ppp.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-tun.c b/src/core/devices/nm-device-tun.c
index c4dd4b47bb..edca69e9fa 100644
--- a/src/core/devices/nm-device-tun.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-veth.c b/src/core/devices/nm-device-veth.c
index 0fc76b1b86..e0ba843df7 100644
--- a/src/core/devices/nm-device-veth.c
+++ b/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>
 
diff --git a/src/core/devices/nm-device-vlan.c b/src/core/devices/nm-device-vlan.c
index edb16ed1ed..bfde60efec 100644
--- a/src/core/devices/nm-device-vlan.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-vrf.c b/src/core/devices/nm-device-vrf.c
index 6e672b665f..4fec59ba5a 100644
--- a/src/core/devices/nm-device-vrf.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-vxlan.c b/src/core/devices/nm-device-vxlan.c
index 763aee95e5..f16a52c4b1 100644
--- a/src/core/devices/nm-device-vxlan.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c
index 1b109969ee..fd057ded9c 100644
--- a/src/core/devices/nm-device-wireguard.c
+++ b/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"
 
diff --git a/src/core/devices/nm-device-wpan.c b/src/core/devices/nm-device-wpan.c
index 05b48a70d3..2f3b16ff8a 100644
--- a/src/core/devices/nm-device-wpan.c
+++ b/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"
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index e572e8143a..040dd0b4d3 100644
--- a/src/core/devices/nm-device.c
+++ b/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"
 
diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index e645b9d620..c60fb3ada6 100644
--- a/src/core/devices/nm-lldp-listener.c
+++ b/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"
 
diff --git a/src/core/devices/ovs/nm-device-ovs-bridge.c b/src/core/devices/ovs/nm-device-ovs-bridge.c
index 1b7035bd9d..3ae8a4813c 100644
--- a/src/core/devices/ovs/nm-device-ovs-bridge.c
+++ b/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"
 
diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index b9d3d509e9..5d07c2117e 100644
--- a/src/core/devices/ovs/nm-device-ovs-interface.c
+++ b/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"
 
diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c
index 5f7a697d8f..2ecb95e881 100644
--- a/src/core/devices/ovs/nm-device-ovs-port.c
+++ b/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"
 
diff --git a/src/core/devices/ovs/nm-ovs-factory.c b/src/core/devices/ovs/nm-ovs-factory.c
index d5875bc118..e7af38d83d 100644
--- a/src/core/devices/ovs/nm-ovs-factory.c
+++ b/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"
diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index de54a2e6c9..da3a7989a8 100644
--- a/src/core/devices/ovs/nm-ovsdb.c
+++ b/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"
 
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index 7b7a679617..d2d717298d 100644
--- a/src/core/devices/team/nm-device-team.c
+++ b/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"
 
diff --git a/src/core/devices/team/nm-team-factory.c b/src/core/devices/team/nm-team-factory.c
index ce623e29e2..57b51bf843 100644
--- a/src/core/devices/team/nm-team-factory.c
+++ b/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>
 
diff --git a/src/core/devices/tests/test-acd.c b/src/core/devices/tests/test-acd.c
index 875dfff9e1..b0af59db43 100644
--- a/src/core/devices/tests/test-acd.c
+++ b/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"
 
diff --git a/src/core/devices/tests/test-lldp.c b/src/core/devices/tests/test-lldp.c
index 04c3b5b6fe..27f0b4be8f 100644
--- a/src/core/devices/tests/test-lldp.c
+++ b/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>
diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
index 8bfdcaa309..63c5255607 100644
--- a/src/core/devices/wifi/nm-device-iwd.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-device-olpc-mesh.c b/src/core/devices/wifi/nm-device-olpc-mesh.c
index 1554411617..af83c4a334 100644
--- a/src/core/devices/wifi/nm-device-olpc-mesh.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c
index b2f071fb55..fb9876005f 100644
--- a/src/core/devices/wifi/nm-device-wifi-p2p.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index d9fdb4cc68..042d48871a 100644
--- a/src/core/devices/wifi/nm-device-wifi.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
index 70c2448ae2..3aa29e6d45 100644
--- a/src/core/devices/wifi/nm-iwd-manager.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c
index 4df2f35c00..08fa10ec33 100644
--- a/src/core/devices/wifi/nm-wifi-ap.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-wifi-common.c b/src/core/devices/wifi/nm-wifi-common.c
index 053537af7f..c715c07ce3 100644
--- a/src/core/devices/wifi/nm-wifi-common.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-wifi-factory.c b/src/core/devices/wifi/nm-wifi-factory.c
index c4afd3fe24..40375e1c1f 100644
--- a/src/core/devices/wifi/nm-wifi-factory.c
+++ b/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>
 
diff --git a/src/core/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c
index 01f4f9bba5..8488f32dca 100644
--- a/src/core/devices/wifi/nm-wifi-p2p-peer.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-wifi-utils.c b/src/core/devices/wifi/nm-wifi-utils.c
index f0b772c647..5887cafb96 100644
--- a/src/core/devices/wifi/nm-wifi-utils.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/tests/test-devices-wifi.c b/src/core/devices/wifi/tests/test-devices-wifi.c
index 3ff09639d8..bc0ba126dc 100644
--- a/src/core/devices/wifi/tests/test-devices-wifi.c
+++ b/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"
diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c
index a715cebb61..3ea89d2c69 100644
--- a/src/core/devices/wwan/nm-device-modem.c
+++ b/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"
 
diff --git a/src/core/devices/wwan/nm-modem-broadband.c b/src/core/devices/wwan/nm-modem-broadband.c
index d2debac5bf..ca02880417 100644
--- a/src/core/devices/wwan/nm-modem-broadband.c
+++ b/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"
diff --git a/src/core/devices/wwan/nm-modem-manager.c b/src/core/devices/wwan/nm-modem-manager.c
index d05c77a148..598c689810 100644
--- a/src/core/devices/wwan/nm-modem-manager.c
+++ b/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"
 
diff --git a/src/core/devices/wwan/nm-modem-ofono.c b/src/core/devices/wwan/nm-modem-ofono.c
index ec43cd82d0..21734cee77 100644
--- a/src/core/devices/wwan/nm-modem-ofono.c
+++ b/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"
 
diff --git a/src/core/devices/wwan/nm-modem.c b/src/core/devices/wwan/nm-modem.c
index 4e4412279e..0d334fa465 100644
--- a/src/core/devices/wwan/nm-modem.c
+++ b/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"
 
diff --git a/src/core/devices/wwan/nm-service-providers.c b/src/core/devices/wwan/nm-service-providers.c
index b9187036a2..89add6c51c 100644
--- a/src/core/devices/wwan/nm-service-providers.c
+++ b/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"
 
diff --git a/src/core/devices/wwan/nm-wwan-factory.c b/src/core/devices/wwan/nm-wwan-factory.c
index 7418d7aaca..5d2ce2b320 100644
--- a/src/core/devices/wwan/nm-wwan-factory.c
+++ b/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>
 
diff --git a/src/core/devices/wwan/tests/test-service-providers.c b/src/core/devices/wwan/tests/test-service-providers.c
index 2c54a76401..f95cccf8b0 100644
--- a/src/core/devices/wwan/tests/test-service-providers.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index 3ee8510b58..f5047244ed 100644
--- a/src/core/dhcp/nm-dhcp-client.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c
index 14a2b96e64..ad1e097f39 100644
--- a/src/core/dhcp/nm-dhcp-dhclient-utils.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c
index 431ef4135d..c42a0ba53e 100644
--- a/src/core/dhcp/nm-dhcp-dhclient.c
+++ b/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
 
diff --git a/src/core/dhcp/nm-dhcp-dhcpcanon.c b/src/core/dhcp/nm-dhcp-dhcpcanon.c
index db75958f1e..3504a04825 100644
--- a/src/core/dhcp/nm-dhcp-dhcpcanon.c
+++ b/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
 
diff --git a/src/core/dhcp/nm-dhcp-dhcpcd.c b/src/core/dhcp/nm-dhcp-dhcpcd.c
index 4f45c3a7e5..cf9fe5c2f6 100644
--- a/src/core/dhcp/nm-dhcp-dhcpcd.c
+++ b/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
 
diff --git a/src/core/dhcp/nm-dhcp-listener.c b/src/core/dhcp/nm-dhcp-listener.c
index 279ce4984c..1673bbb7a5 100644
--- a/src/core/dhcp/nm-dhcp-listener.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index ca99122ae5..bc114ad80c 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index f94c9cde78..d1451a5319 100644
--- a/src/core/dhcp/nm-dhcp-nettools.c
+++ b/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>
diff --git a/src/core/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c
index 13d85015d3..09dd6f363f 100644
--- a/src/core/dhcp/nm-dhcp-options.c
+++ b/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"
 
diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index ec4a80e644..d558a62628 100644
--- a/src/core/dhcp/nm-dhcp-systemd.c
+++ b/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>
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index ed11a6ea30..a6555bce24 100644
--- a/src/core/dhcp/nm-dhcp-utils.c
+++ b/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>
diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c
index 6b3ec7a127..77626f6962 100644
--- a/src/core/dhcp/tests/test-dhcp-dhclient.c
+++ b/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>
diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c
index dc58688f97..02fe640660 100644
--- a/src/core/dhcp/tests/test-dhcp-utils.c
+++ b/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>
diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
index 82470e02f7..dcff98e913 100644
--- a/src/core/dns/nm-dns-dnsmasq.c
+++ b/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"
 
diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index 92f0ef3947..f318b9b89b 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/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>
diff --git a/src/core/dns/nm-dns-plugin.c b/src/core/dns/nm-dns-plugin.c
index 3233b6f0d7..74d4eb2bd9 100644
--- a/src/core/dns/nm-dns-plugin.c
+++ b/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"
 
diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c
index 3535d3dcad..f6e116f375 100644
--- a/src/core/dns/nm-dns-systemd-resolved.c
+++ b/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"
 
diff --git a/src/core/dns/nm-dns-unbound.c b/src/core/dns/nm-dns-unbound.c
index ee162c333b..15df3acf45 100644
--- a/src/core/dns/nm-dns-unbound.c
+++ b/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"
 
diff --git a/src/core/dnsmasq/nm-dnsmasq-manager.c b/src/core/dnsmasq/nm-dnsmasq-manager.c
index 00b02a05aa..82c002b0d0 100644
--- a/src/core/dnsmasq/nm-dnsmasq-manager.c
+++ b/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"
 
diff --git a/src/core/dnsmasq/nm-dnsmasq-utils.c b/src/core/dnsmasq/nm-dnsmasq-utils.c
index 3bd7c93ff9..ea23a78d41 100644
--- a/src/core/dnsmasq/nm-dnsmasq-utils.c
+++ b/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>
 
diff --git a/src/core/dnsmasq/tests/test-dnsmasq-utils.c b/src/core/dnsmasq/tests/test-dnsmasq-utils.c
index 6eadf294ef..4c1279f03d 100644
--- a/src/core/dnsmasq/tests/test-dnsmasq-utils.c
+++ b/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>
 
diff --git a/src/core/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c
index 654adf9497..2ec09d3414 100644
--- a/src/core/initrd/nm-initrd-generator.c
+++ b/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"
diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c
index 662b98055d..d95b0f9bef 100644
--- a/src/core/initrd/nmi-cmdline-reader.c
+++ b/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>
diff --git a/src/core/initrd/nmi-dt-reader.c b/src/core/initrd/nmi-dt-reader.c
index 5c406a4963..63e4524b5a 100644
--- a/src/core/initrd/nmi-dt-reader.c
+++ b/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"
 
diff --git a/src/core/initrd/nmi-ibft-reader.c b/src/core/initrd/nmi-ibft-reader.c
index 4080ede5ff..9895cda43f 100644
--- a/src/core/initrd/nmi-ibft-reader.c
+++ b/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"
 
diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c
index 7b8c2b0d0b..cb65cd33b1 100644
--- a/src/core/initrd/tests/test-cmdline-reader.c
+++ b/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>
diff --git a/src/core/initrd/tests/test-dt-reader.c b/src/core/initrd/tests/test-dt-reader.c
index 5e87d952fd..619a4e6fc1 100644
--- a/src/core/initrd/tests/test-dt-reader.c
+++ b/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>
diff --git a/src/core/initrd/tests/test-ibft-reader.c b/src/core/initrd/tests/test-ibft-reader.c
index 3e59fe85de..1d263b9e2e 100644
--- a/src/core/initrd/tests/test-ibft-reader.c
+++ b/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>
diff --git a/src/core/main-utils.c b/src/core/main-utils.c
index 357f20f6c0..9bc497ca46 100644
--- a/src/core/main-utils.c
+++ b/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>
diff --git a/src/core/main.c b/src/core/main.c
index 18a6333e6e..9b79bcbb7c 100644
--- a/src/core/main.c
+++ b/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>
diff --git a/src/core/meson.build b/src/core/meson.build
index ada4d7ab01..be5f09e5ca 100644
--- a/src/core/meson.build
+++ b/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
diff --git a/src/core/ndisc/nm-fake-ndisc.c b/src/core/ndisc/nm-fake-ndisc.c
index 5bcdb0de7a..ffe07ab6b7 100644
--- a/src/core/ndisc/nm-fake-ndisc.c
+++ b/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"
 
diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index 7abd197c99..d846411e0b 100644
--- a/src/core/ndisc/nm-lndp-ndisc.c
+++ b/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"
 
diff --git a/src/core/ndisc/nm-ndisc.c b/src/core/ndisc/nm-ndisc.c
index 05da8eb7d1..a5c1b935fc 100644
--- a/src/core/ndisc/nm-ndisc.c
+++ b/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"
 
diff --git a/src/core/ndisc/tests/test-ndisc-fake.c b/src/core/ndisc/tests/test-ndisc-fake.c
index 3c4bc1f2f7..f201bc5641 100644
--- a/src/core/ndisc/tests/test-ndisc-fake.c
+++ b/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>
 
diff --git a/src/core/ndisc/tests/test-ndisc-linux.c b/src/core/ndisc/tests/test-ndisc-linux.c
index 2517e2b7b4..9a5df60b1c 100644
--- a/src/core/ndisc/tests/test-ndisc-linux.c
+++ b/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>
 
diff --git a/src/core/nm-act-request.c b/src/core/nm-act-request.c
index 248b57b861..defe3e8c93 100644
--- a/src/core/nm-act-request.c
+++ b/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"
 
diff --git a/src/core/nm-active-connection.c b/src/core/nm-active-connection.c
index 9049eea92f..3c8c472e74 100644
--- a/src/core/nm-active-connection.c
+++ b/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"
 
diff --git a/src/core/nm-audit-manager.c b/src/core/nm-audit-manager.c
index 4a67f2eebd..8f41947264 100644
--- a/src/core/nm-audit-manager.c
+++ b/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"
 
diff --git a/src/core/nm-auth-manager.c b/src/core/nm-auth-manager.c
index 046282c230..9470838c8f 100644
--- a/src/core/nm-auth-manager.c
+++ b/src/core/nm-auth-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-auth-manager.h"
 
diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c
index 41ddd3a4b8..12da5749a5 100644
--- a/src/core/nm-auth-utils.c
+++ b/src/core/nm-auth-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-auth-utils.h"
 
diff --git a/src/core/nm-checkpoint-manager.c b/src/core/nm-checkpoint-manager.c
index b4c00f9d8b..b8c9101a6e 100644
--- a/src/core/nm-checkpoint-manager.c
+++ b/src/core/nm-checkpoint-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-checkpoint-manager.h"
 
diff --git a/src/core/nm-checkpoint.c b/src/core/nm-checkpoint.c
index 0bee16ece5..2088c24760 100644
--- a/src/core/nm-checkpoint.c
+++ b/src/core/nm-checkpoint.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-checkpoint.h"
 
diff --git a/src/core/nm-config-data.c b/src/core/nm-config-data.c
index b3cd5e986f..b91dc5efe4 100644
--- a/src/core/nm-config-data.c
+++ b/src/core/nm-config-data.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-config-data.h"
 
diff --git a/src/core/nm-config.c b/src/core/nm-config.c
index 3c0c78eb8b..c700f18949 100644
--- a/src/core/nm-config.c
+++ b/src/core/nm-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-config.h"
 
diff --git a/src/core/nm-connectivity.c b/src/core/nm-connectivity.c
index 4e38e77e82..f847c8f4ef 100644
--- a/src/core/nm-connectivity.c
+++ b/src/core/nm-connectivity.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2016 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-connectivity.h"
 
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index 660f6f4317..9075c30dd0 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-core-utils.h"
 
diff --git a/src/core/nm-dbus-manager.c b/src/core/nm-dbus-manager.c
index e05ae39288..4f34ee52af 100644
--- a/src/core/nm-dbus-manager.c
+++ b/src/core/nm-dbus-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-dbus-manager.h"
 
diff --git a/src/core/nm-dbus-object.c b/src/core/nm-dbus-object.c
index 4f6d2af343..6f294fe2ec 100644
--- a/src/core/nm-dbus-object.c
+++ b/src/core/nm-dbus-object.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dbus-object.h"
 
diff --git a/src/core/nm-dbus-utils.c b/src/core/nm-dbus-utils.c
index 40e10e2811..5890bdf29f 100644
--- a/src/core/nm-dbus-utils.c
+++ b/src/core/nm-dbus-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dbus-utils.h"
 
diff --git a/src/core/nm-dcb.c b/src/core/nm-dcb.c
index df345434e6..b3958caa51 100644
--- a/src/core/nm-dcb.c
+++ b/src/core/nm-dcb.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <sys/wait.h>
 
diff --git a/src/core/nm-default-daemon.h b/src/core/nm-default-daemon.h
new file mode 100644
index 0000000000..65ca4b5428
--- /dev/null
+++ b/src/core/nm-default-daemon.h
@@ -0,0 +1,26 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEFAULT_DAEMON_H__
+#define __NM_DEFAULT_DAEMON_H__
+
+/*****************************************************************************/
+
+#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
+
+#undef NETWORKMANAGER_COMPILATION
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DAEMON
+
+/*****************************************************************************/
+
+#include "nm-version.h"
+
+#include "nm-core-types.h"
+#include "nm-types.h"
+#include "nm-log-core/nm-logging.h"
+
+/*****************************************************************************/
+
+#endif /* __NM_DEFAULT_DAEMON_H__ */
diff --git a/src/core/nm-dhcp-config.c b/src/core/nm-dhcp-config.c
index 390a73f428..718d3c90ec 100644
--- a/src/core/nm-dhcp-config.c
+++ b/src/core/nm-dhcp-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dhcp-config.h"
 
diff --git a/src/core/nm-dispatcher.c b/src/core/nm-dispatcher.c
index a848d41d8d..0ab409f5ed 100644
--- a/src/core/nm-dispatcher.c
+++ b/src/core/nm-dispatcher.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dispatcher.h"
 
diff --git a/src/core/nm-firewall-manager.c b/src/core/nm-firewall-manager.c
index ff0c1a0d2b..8f476e511a 100644
--- a/src/core/nm-firewall-manager.c
+++ b/src/core/nm-firewall-manager.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-firewall-manager.h"
 
diff --git a/src/core/nm-hostname-manager.c b/src/core/nm-hostname-manager.c
index ca23b97ce1..c99c83267c 100644
--- a/src/core/nm-hostname-manager.c
+++ b/src/core/nm-hostname-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-hostname-manager.h"
 
diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c
index 42483cf756..b6e9981da9 100644
--- a/src/core/nm-iface-helper.c
+++ b/src/core/nm-iface-helper.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <glib-unix.h>
 #include <getopt.h>
diff --git a/src/core/nm-ip-config.c b/src/core/nm-ip-config.c
index 040483ed53..2426eb4941 100644
--- a/src/core/nm-ip-config.c
+++ b/src/core/nm-ip-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ip-config.h"
 
diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c
index 8014549f4d..c49dfb4c34 100644
--- a/src/core/nm-ip4-config.c
+++ b/src/core/nm-ip4-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ip4-config.h"
 
diff --git a/src/core/nm-ip6-config.c b/src/core/nm-ip6-config.c
index d48c6e30c8..1f7def3465 100644
--- a/src/core/nm-ip6-config.c
+++ b/src/core/nm-ip6-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ip6-config.h"
 
diff --git a/src/core/nm-keep-alive.c b/src/core/nm-keep-alive.c
index d0cce40714..197e30eaf4 100644
--- a/src/core/nm-keep-alive.c
+++ b/src/core/nm-keep-alive.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-keep-alive.h"
 
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 0f689d409b..5f9af7ac59 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.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 "nm-l3-config-data.h"
 
diff --git a/src/core/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c
index edd6671a9f..28ceb39e91 100644
--- a/src/core/nm-l3-ipv4ll.c
+++ b/src/core/nm-l3-ipv4ll.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 "nm-l3-ipv4ll.h"
 
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 44023aad57..839213ad51 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.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 "nm-l3cfg.h"
 
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 5e5f4e7ff2..5a6e05a934 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-manager.h"
 
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index 9f62643686..88ea09b6ce 100644
--- a/src/core/nm-netns.c
+++ b/src/core/nm-netns.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-netns.h"
 
diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c
index 50551116f3..b58aef0649 100644
--- a/src/core/nm-pacrunner-manager.c
+++ b/src/core/nm-pacrunner-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-pacrunner-manager.h"
 
diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
index 98ff704102..db4983f889 100644
--- a/src/core/nm-policy.c
+++ b/src/core/nm-policy.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-policy.h"
 
diff --git a/src/core/nm-proxy-config.c b/src/core/nm-proxy-config.c
index 7487afaf00..f41601c900 100644
--- a/src/core/nm-proxy-config.c
+++ b/src/core/nm-proxy-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-proxy-config.h"
 
diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index 1b1bd9987a..f032851e41 100644
--- a/src/core/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-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 "nm-rfkill-manager.h"
 
diff --git a/src/core/nm-session-monitor.c b/src/core/nm-session-monitor.c
index 8e66dbe7c9..88de1a0069 100644
--- a/src/core/nm-session-monitor.c
+++ b/src/core/nm-session-monitor.c
@@ -6,7 +6,7 @@
  * Author: Matthias Clasen
  * Author: Pavel Šimerda <psimerda@redhat.com>
  */
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-session-monitor.h"
 
diff --git a/src/core/nm-sleep-monitor.c b/src/core/nm-sleep-monitor.c
index cc3d72ee67..ffb4db4ea8 100644
--- a/src/core/nm-sleep-monitor.c
+++ b/src/core/nm-sleep-monitor.c
@@ -4,7 +4,7 @@
  * Author: Matthias Clasen <mclasen@redhat.com>
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-sleep-monitor.h"
 
diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c
index fbd3e3fbc7..81c9f06ca9 100644
--- a/src/core/platform/nm-fake-platform.c
+++ b/src/core/platform/nm-fake-platform.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-fake-platform.h"
 
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index ae6c4f44c2..7bd42bbab5 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-linux-platform.h"
 
diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c
index 6411abbacc..0e5f8ab548 100644
--- a/src/core/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-platform.h"
 
diff --git a/src/core/platform/nmp-object.c b/src/core/platform/nmp-object.c
index 9520013ad7..6a26595e6a 100644
--- a/src/core/platform/nmp-object.c
+++ b/src/core/platform/nmp-object.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nmp-object.h"
 
diff --git a/src/core/platform/nmp-rules-manager.c b/src/core/platform/nmp-rules-manager.c
index ab329c9578..0c617b8040 100644
--- a/src/core/platform/nmp-rules-manager.c
+++ b/src/core/platform/nmp-rules-manager.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 "nmp-rules-manager.h"
 
diff --git a/src/core/platform/tests/monitor.c b/src/core/platform/tests/monitor.c
index b67d50b44b..abdf2cd54b 100644
--- a/src/core/platform/tests/monitor.c
+++ b/src/core/platform/tests/monitor.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdlib.h>
 #include <syslog.h>
diff --git a/src/core/platform/tests/test-address.c b/src/core/platform/tests/test-address.c
index b9eabbd1db..d4d67105aa 100644
--- a/src/core/platform/tests/test-address.c
+++ b/src/core/platform/tests/test-address.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "test-common.h"
 
diff --git a/src/core/platform/tests/test-cleanup.c b/src/core/platform/tests/test-cleanup.c
index 2fd6a4e57c..b54eca34b1 100644
--- a/src/core/platform/tests/test-cleanup.c
+++ b/src/core/platform/tests/test-cleanup.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "test-common.h"
 
diff --git a/src/core/platform/tests/test-common.c b/src/core/platform/tests/test-common.c
index 529100b9f2..87e5329a96 100644
--- a/src/core/platform/tests/test-common.c
+++ b/src/core/platform/tests/test-common.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "test-common.h"
 
diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 895b89a09b..3aaa3759aa 100644
--- a/src/core/platform/tests/test-link.c
+++ b/src/core/platform/tests/test-link.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <sched.h>
 #include <sys/mount.h>
diff --git a/src/core/platform/tests/test-nmp-object.c b/src/core/platform/tests/test-nmp-object.c
index 590f41c6d7..310611ee6c 100644
--- a/src/core/platform/tests/test-nmp-object.c
+++ b/src/core/platform/tests/test-nmp-object.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <libudev.h>
 #include <linux/pkt_sched.h>
diff --git a/src/core/platform/tests/test-platform-general.c b/src/core/platform/tests/test-platform-general.c
index 00671cfba0..b426cc658b 100644
--- a/src/core/platform/tests/test-platform-general.c
+++ b/src/core/platform/tests/test-platform-general.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <linux/rtnetlink.h>
 
diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c
index 0aa94ecd2d..47587865b3 100644
--- a/src/core/platform/tests/test-route.c
+++ b/src/core/platform/tests/test-route.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <linux/rtnetlink.h>
 #include <linux/fib_rules.h>
diff --git a/src/core/platform/tests/test-tc.c b/src/core/platform/tests/test-tc.c
index c005b069f0..d15c3d7621 100644
--- a/src/core/platform/tests/test-tc.c
+++ b/src/core/platform/tests/test-tc.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 <linux/pkt_sched.h>
 
diff --git a/src/core/platform/wifi/nm-wifi-utils-nl80211.c b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
index aae6af1ec8..ad0672488a 100644
--- a/src/core/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/core/platform/wifi/nm-wifi-utils-nl80211.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2011 Intel Corporation. All rights reserved.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wifi-utils-nl80211.h"
 
diff --git a/src/core/platform/wifi/nm-wifi-utils-wext.c b/src/core/platform/wifi/nm-wifi-utils-wext.c
index 2b070b5abe..a44fcf6239 100644
--- a/src/core/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/core/platform/wifi/nm-wifi-utils-wext.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-utils-wext.h"
 
diff --git a/src/core/platform/wifi/nm-wifi-utils.c b/src/core/platform/wifi/nm-wifi-utils.c
index 66d6a05a75..49ae1811f6 100644
--- a/src/core/platform/wifi/nm-wifi-utils.c
+++ b/src/core/platform/wifi/nm-wifi-utils.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-utils.h"
 
diff --git a/src/core/platform/wpan/nm-wpan-utils.c b/src/core/platform/wpan/nm-wpan-utils.c
index 96897ae04d..efb199794d 100644
--- a/src/core/platform/wpan/nm-wpan-utils.c
+++ b/src/core/platform/wpan/nm-wpan-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-wpan-utils.h"
 
diff --git a/src/core/ppp/nm-ppp-manager-call.c b/src/core/ppp/nm-ppp-manager-call.c
index b07c3df714..f791e8b028 100644
--- a/src/core/ppp/nm-ppp-manager-call.c
+++ b/src/core/ppp/nm-ppp-manager-call.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ppp-manager-call.h"
 
diff --git a/src/core/ppp/nm-ppp-manager.c b/src/core/ppp/nm-ppp-manager.c
index 939eca31d4..396a49aeb5 100644
--- a/src/core/ppp/nm-ppp-manager.c
+++ b/src/core/ppp/nm-ppp-manager.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-ppp-manager.h"
 
diff --git a/src/core/settings/nm-agent-manager.c b/src/core/settings/nm-agent-manager.c
index cd96808e7b..7e61790998 100644
--- a/src/core/settings/nm-agent-manager.c
+++ b/src/core/settings/nm-agent-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-agent-manager.h"
 
diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c
index 7d31272199..7e7c5d7dfd 100644
--- a/src/core/settings/nm-secret-agent.c
+++ b/src/core/settings/nm-secret-agent.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-secret-agent.h"
 
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index a5761bf635..0ff0718997 100644
--- a/src/core/settings/nm-settings-connection.c
+++ b/src/core/settings/nm-settings-connection.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-settings-connection.h"
 
diff --git a/src/core/settings/nm-settings-plugin.c b/src/core/settings/nm-settings-plugin.c
index 74ae314df6..9e81caabb5 100644
--- a/src/core/settings/nm-settings-plugin.c
+++ b/src/core/settings/nm-settings-plugin.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-settings-plugin.h"
 
diff --git a/src/core/settings/nm-settings-storage.c b/src/core/settings/nm-settings-storage.c
index bea440cb5a..c56ba075de 100644
--- a/src/core/settings/nm-settings-storage.c
+++ b/src/core/settings/nm-settings-storage.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-settings-storage.h"
 
diff --git a/src/core/settings/nm-settings-utils.c b/src/core/settings/nm-settings-utils.c
index f6c2f60810..775d0396e6 100644
--- a/src/core/settings/nm-settings-utils.c
+++ b/src/core/settings/nm-settings-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-settings-utils.h"
 
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c
index eda3789f40..6b174599a5 100644
--- a/src/core/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
@@ -7,7 +7,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-settings.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index b5c205c2fd..d114db0f82 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2007 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifcfg-rh-plugin.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index bce47efc8e..209957d9b8 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifcfg-rh-reader.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
index 3c2682830f..3f674deab3 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-storage.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifcfg-rh-storage.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index b4a23d448b..8da5de473b 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifcfg-rh-utils.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index a268c58c58..f9912dc57b 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2009 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifcfg-rh-writer.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c
index 6c1cd41837..386bcac707 100644
--- a/src/core/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/core/settings/plugins/ifcfg-rh/shvar.c
@@ -3,7 +3,7 @@
  * Copyright (C) 1999, 2000 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "shvar.h"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 10d498edac..59127d0103 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index c766a358e0..a8a9c40a9f 100644
--- a/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2004 Tom Parker
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifupdown-interface-parser.h"
 
diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 767e0daa09..a4974a9600 100644
--- a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Canonical Ltd.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifupdown-parser.h"
 
diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index 8c22e3b6d7..34523f8d5a 100644
--- a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-ifupdown-plugin.h"
 
diff --git a/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
index c3c5bb5432..6e3eb0e74b 100644
--- a/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/core/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-core-internal.h"
 
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index 400c175191..bfa5819fec 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-keyfile-plugin.h"
 
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-reader.c b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
index 6978c10596..88c687e085 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-reader.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-keyfile-reader.h"
 
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-storage.c b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
index 8fb9861cd2..89be817a7e 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-storage.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-keyfile-storage.h"
 
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
index a62e0ae018..5620b917da 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-keyfile-utils.h"
 
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
index be1bf158b3..78fb1b1584 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nms-keyfile-writer.h"
 
diff --git a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
index 4d9c86c3d1..348b0ed6ad 100644
--- a/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
+++ b/src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 1754bfff59..eab494b022 100644
--- a/src/core/supplicant/nm-supplicant-config.c
+++ b/src/core/supplicant/nm-supplicant-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-supplicant-config.h"
 
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index ec278c31fc..6d9c604f80 100644
--- a/src/core/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-supplicant-interface.h"
 
diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index 30b15cc010..325541876c 100644
--- a/src/core/supplicant/nm-supplicant-manager.c
+++ b/src/core/supplicant/nm-supplicant-manager.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-supplicant-manager.h"
 
diff --git a/src/core/supplicant/nm-supplicant-settings-verify.c b/src/core/supplicant/nm-supplicant-settings-verify.c
index fe4cb1c1b0..3f0a33e0af 100644
--- a/src/core/supplicant/nm-supplicant-settings-verify.c
+++ b/src/core/supplicant/nm-supplicant-settings-verify.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2006 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-supplicant-settings-verify.h"
 
diff --git a/src/core/supplicant/tests/test-supplicant-config.c b/src/core/supplicant/tests/test-supplicant-config.c
index 1dde90bd18..99729c18e5 100644
--- a/src/core/supplicant/tests/test-supplicant-config.c
+++ b/src/core/supplicant/tests/test-supplicant-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/core/tests/config/nm-test-device.c b/src/core/tests/config/nm-test-device.c
index c6b894d429..f724b03a5d 100644
--- a/src/core/tests/config/nm-test-device.c
+++ b/src/core/tests/config/nm-test-device.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-test-device.h"
 
diff --git a/src/core/tests/config/test-config.c b/src/core/tests/config/test-config.c
index 526c713852..3bb148152b 100644
--- a/src/core/tests/config/test-config.c
+++ b/src/core/tests/config/test-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <unistd.h>
 
diff --git a/src/core/tests/test-core-with-expect.c b/src/core/tests/test-core-with-expect.c
index d9750cd676..022cf8f39e 100644
--- a/src/core/tests/test-core-with-expect.c
+++ b/src/core/tests/test-core-with-expect.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <time.h>
 #include <sys/types.h>
diff --git a/src/core/tests/test-core.c b/src/core/tests/test-core.c
index 87136dc3f1..8698c40607 100644
--- a/src/core/tests/test-core.c
+++ b/src/core/tests/test-core.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <net/if.h>
 #include <byteswap.h>
diff --git a/src/core/tests/test-dcb.c b/src/core/tests/test-dcb.c
index 9ee1fda6fb..fc591fcbc4 100644
--- a/src/core/tests/test-dcb.c
+++ b/src/core/tests/test-dcb.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-dcb.h"
 
diff --git a/src/core/tests/test-ip4-config.c b/src/core/tests/test-ip4-config.c
index 008201a2bf..27b1d61139 100644
--- a/src/core/tests/test-ip4-config.c
+++ b/src/core/tests/test-ip4-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <arpa/inet.h>
 
diff --git a/src/core/tests/test-ip6-config.c b/src/core/tests/test-ip6-config.c
index 7ba79731c4..3b48fb7f38 100644
--- a/src/core/tests/test-ip6-config.c
+++ b/src/core/tests/test-ip6-config.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>
 #include <linux/if_addr.h>
diff --git a/src/core/tests/test-l3cfg.c b/src/core/tests/test-l3cfg.c
index 92e596a09e..43132c6d93 100644
--- a/src/core/tests/test-l3cfg.c
+++ b/src/core/tests/test-l3cfg.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 "nm-l3cfg.h"
 #include "nm-l3-ipv4ll.h"
diff --git a/src/core/tests/test-utils.c b/src/core/tests/test-utils.c
index 7750109279..1d562bde09 100644
--- a/src/core/tests/test-utils.c
+++ b/src/core/tests/test-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include <arpa/inet.h>
 #include <linux/if_ether.h>
diff --git a/src/core/tests/test-wired-defname.c b/src/core/tests/test-wired-defname.c
index 7fb8cbab99..f810c56f17 100644
--- a/src/core/tests/test-wired-defname.c
+++ b/src/core/tests/test-wired-defname.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-simple-connection.h"
 #include "nm-setting-connection.h"
diff --git a/src/core/vpn/nm-vpn-connection.c b/src/core/vpn/nm-vpn-connection.c
index b6513497a0..02831b0838 100644
--- a/src/core/vpn/nm-vpn-connection.c
+++ b/src/core/vpn/nm-vpn-connection.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "src/core/nm-default-daemon.h"
 
 #include "nm-vpn-connection.h"
 
diff --git a/src/core/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 65f9e56918..53fe58dd36 100644
--- a/src/core/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-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-vpn-manager.h"