all: add "libnm/nm-default-libnm.h" as replacement for "nm-default.h"

65 files changed, 96 insertions, 71 deletions

diff --git a/Makefile.am b/Makefile.am
index 915a9a14a0..77f4e986fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1507,6 +1507,7 @@ libnm_lib_h_pub_mkenums = \
 libnm_lib_h_priv = \
 	libnm/nm-dbus-helpers.h \
 	libnm/nm-default-client.h \
+	libnm/nm-default-libnm.h \
 	libnm/nm-device-private.h \
 	libnm/nm-dhcp4-config.h \
 	libnm/nm-dhcp6-config.h \
@@ -1580,7 +1581,6 @@ libnm_lib_cppflags = \
 	-I$(builddir)/libnm \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	$(NULL)
 
 libnminclude_HEADERS += \
@@ -1641,7 +1641,7 @@ nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_real)
 nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include "nm-core-enum-types.h"\n'
-nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm/nm-default-libnm.h"\n'
 
 $(dispatcher_nm_dispatcher_OBJECTS):                    $(libnm_lib_h_pub_mkenums)
 $(dispatcher_libnm_dispatcher_core_la_OBJECTS):         $(libnm_lib_h_pub_mkenums)
@@ -1695,7 +1695,10 @@ libnm/NM-1.0.gir: libnm/libnm.la
 libnm_NM_1_0_gir_INCLUDES = Gio-2.0
 libnm_NM_1_0_gir_PACKAGES = gio-2.0
 libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm
-libnm_NM_1_0_gir_CFLAGS = $(libnm_libnm_la_CPPFLAGS)
+libnm_NM_1_0_gir_CFLAGS = \
+	$(libnm_libnm_la_CPPFLAGS) \
+	-DNETWORKMANAGER_COMPILATION \
+	$(NULL)
 libnm_NM_1_0_gir_LIBS = libnm/libnm.la
 libnm_NM_1_0_gir_FILES = \
 	$(libnm_core_lib_h_pub_mkenums) \
@@ -1794,8 +1797,7 @@ libnm_tests_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	$(dflt_cppflags_libnm_core) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
+	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
diff --git a/libnm/meson.build b/libnm/meson.build
index f1e92a4102..ac27acd8ba 100644
--- a/libnm/meson.build
+++ b/libnm/meson.build
@@ -142,8 +142,7 @@ libnm_static = static_library(
     libudev_dep,
   ],
   c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+    '-DG_LOG_DOMAIN="libnm"',
   ],
   link_with: libnm_systemd_logging_stub,
 )
@@ -206,8 +205,8 @@ if enable_introspection
     header: 'NetworkManager.h',
     export_packages: libnm_name,
     extra_args: [
-      '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+      '-DG_LOG_DOMAIN="libnm"',
+      '-DNETWORKMANAGER_COMPILATION',
     ],
     install: true,
   )
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 608ec28022..abe1a5538a 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-access-point.h"
 
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 1dfe9c90c8..80fb25115b 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-active-connection.h"
 
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index 5cdd58729a..5fd55bc1d7 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-checkpoint.h"
 
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 9f63630ccc..2c7751965a 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-client.h"
 
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index a3794b5a0b..b146185575 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-dbus-helpers.h"
 
diff --git a/libnm/nm-default-libnm.h b/libnm/nm-default-libnm.h
new file mode 100644
index 0000000000..799547bc84
--- /dev/null
+++ b/libnm/nm-default-libnm.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2015 Red Hat, Inc.
+ */
+
+#ifndef __NM_DEFAULT_LIBNM_H__
+#define __NM_DEFAULT_LIBNM_H__
+
+/*****************************************************************************/
+
+#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+
+#undef NETWORKMANAGER_COMPILATION
+#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_LIBNM
+
+/*****************************************************************************/
+
+#include "nm-version.h"
+#include "nm-libnm-utils.h"
+
+/*****************************************************************************/
+
+#endif /* __NM_DEFAULT_LIBNM_H__ */
diff --git a/libnm/nm-device-6lowpan.c b/libnm/nm-device-6lowpan.c
index b08146be69..ccb8ae0103 100644
--- a/libnm/nm-device-6lowpan.c
+++ b/libnm/nm-device-6lowpan.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-6lowpan.h"
 
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index f9600b3ad6..ff64cd3a54 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-adsl.h"
 
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 2ff91f14aa..1214964161 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-setting-bond.h"
 
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 2cc848bedc..732c5a2ceb 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-setting-bridge.h"
 
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 605e1e8e9b..55f0a942a2 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-bt.h"
 
diff --git a/libnm/nm-device-dummy.c b/libnm/nm-device-dummy.c
index dd326535e8..6b92810230 100644
--- a/libnm/nm-device-dummy.c
+++ b/libnm/nm-device-dummy.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-dummy.h"
 
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index cf5efcaf02..b7173c806b 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ethernet.h"
 
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 7a724242e0..ebc73a7e9c 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-generic.h"
 
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 9500ff353f..820a4ab438 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2011 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-infiniband.h"
 
diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c
index 005307eb3d..a6d2ef4a4c 100644
--- a/libnm/nm-device-ip-tunnel.c
+++ b/libnm/nm-device-ip-tunnel.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ip-tunnel.h"
 
diff --git a/libnm/nm-device-macsec.c b/libnm/nm-device-macsec.c
index 10d902c4b9..3d6e1d388d 100644
--- a/libnm/nm-device-macsec.c
+++ b/libnm/nm-device-macsec.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-macsec.h"
 
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
index d29fc79d17..773de99009 100644
--- a/libnm/nm-device-macvlan.c
+++ b/libnm/nm-device-macvlan.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-setting-macvlan.h"
 
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 06db196d4c..51b49feabe 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-modem.h"
 
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 573556b36a..697b3381e0 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-olpc-mesh.h"
 
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index f2f9553666..9c17554899 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017, 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ovs-bridge.h"
 
diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c
index 8148b6cd2d..1c757a5b49 100644
--- a/libnm/nm-device-ovs-interface.c
+++ b/libnm/nm-device-ovs-interface.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ovs-interface.h"
 
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index dfad8bcbab..1b3faa53f1 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017, 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ovs-port.h"
 
diff --git a/libnm/nm-device-ppp.c b/libnm/nm-device-ppp.c
index c693a4f64c..a1c1f74184 100644
--- a/libnm/nm-device-ppp.c
+++ b/libnm/nm-device-ppp.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-ppp.h"
 
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index d75acce687..d76dd5c1c1 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2013 Jiri Pirko <jiri@resnulli.us>
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-team.h"
 
diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index aed354813b..0445da9aa4 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-tun.h"
 
diff --git a/libnm/nm-device-veth.c b/libnm/nm-device-veth.c
index 34f1cdaf1d..9a9f768011 100644
--- a/libnm/nm-device-veth.c
+++ b/libnm/nm-device-veth.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2020 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-veth.h"
 
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 4b39993d63..e7419b23ee 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-vlan.h"
 
diff --git a/libnm/nm-device-vrf.c b/libnm/nm-device-vrf.c
index 3d2dcb6878..73f2770723 100644
--- a/libnm/nm-device-vrf.c
+++ b/libnm/nm-device-vrf.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-vrf.h"
 
diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c
index b31580188f..36d95f91f3 100644
--- a/libnm/nm-device-vxlan.c
+++ b/libnm/nm-device-vxlan.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-vxlan.h"
 
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index 60425806c7..019bf1cf6a 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 - 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-wifi-p2p.h"
 
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 9c602206f1..90e4a302f2 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-wifi.h"
 
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 37c55347f4..9b42354c7a 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2009 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-wimax.h"
 
diff --git a/libnm/nm-device-wireguard.c b/libnm/nm-device-wireguard.c
index 1a978845aa..a4baec4f17 100644
--- a/libnm/nm-device-wireguard.c
+++ b/libnm/nm-device-wireguard.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Javier Arteaga <jarteaga@jbeta.is>
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-wireguard.h"
 
diff --git a/libnm/nm-device-wpan.c b/libnm/nm-device-wpan.c
index 5d94c8ea76..7218a8c604 100644
--- a/libnm/nm-device-wpan.c
+++ b/libnm/nm-device-wpan.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk>
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device-wpan.h"
 
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 031ce43d30..9cb88dae8e 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-device.h"
 
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index b76cbe94e8..ec7da6ded0 100644
--- a/libnm/nm-dhcp-config.c
+++ b/libnm/nm-dhcp-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-dhcp-config.h"
 
diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c
index be280694f0..25219d45f3 100644
--- a/libnm/nm-dhcp4-config.c
+++ b/libnm/nm-dhcp4-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-dhcp4-config.h"
 
diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c
index 3659f608f8..2574b36cfd 100644
--- a/libnm/nm-dhcp6-config.c
+++ b/libnm/nm-dhcp6-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-dhcp6-config.h"
 
diff --git a/libnm/nm-dns-manager.c b/libnm/nm-dns-manager.c
index ada97871be..6261c71ac6 100644
--- a/libnm/nm-dns-manager.c
+++ b/libnm/nm-dns-manager.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-dns-manager.h"
 
diff --git a/libnm/nm-enum-types.c.template b/libnm/nm-enum-types.c.template
index 5abd5c794c..ccad218c07 100644
--- a/libnm/nm-enum-types.c.template
+++ b/libnm/nm-enum-types.c.template
@@ -2,7 +2,8 @@
 #include "config.h"
 
 #include "nm-enum-types.h"
-#include "nm-default.h"
+#
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-version-macros.h"
 #include "NetworkManager.h"
diff --git a/libnm/nm-enum-types.h.template b/libnm/nm-enum-types.h.template
index 3bd86cce00..bc70af134a 100644
--- a/libnm/nm-enum-types.h.template
+++ b/libnm/nm-enum-types.h.template
@@ -3,6 +3,7 @@
 #define __NM_ENUM_TYPES_H__
 
 #include "nm-core-enum-types.h"
+#
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index 3c2b221119..1663c62257 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-ip-config.h"
 
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c
index a73fc9f80b..6c4a4ab3ad 100644
--- a/libnm/nm-ip4-config.c
+++ b/libnm/nm-ip4-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-ip4-config.h"
 
diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c
index a58da8efa3..19c869c6f6 100644
--- a/libnm/nm-ip6-config.c
+++ b/libnm/nm-ip6-config.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-ip6-config.h"
 
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
index fc843bc951..1fb6a47c3d 100644
--- a/libnm/nm-libnm-utils.c
+++ b/libnm/nm-libnm-utils.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2018 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-libnm-utils.h"
 
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 8b8dfd4950..00e520d7e5 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-object.h"
 
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 70e43bacee..b5b12bf020 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-remote-connection.h"
 
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 3b64c665db..8f826ed86b 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-secret-agent-old.h"
 
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index e7ae3bf1d0..cdbaefc032 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-vpn-connection.h"
 
diff --git a/libnm/nm-vpn-editor.c b/libnm/nm-vpn-editor.c
index c2b9f1f761..e326958881 100644
--- a/libnm/nm-vpn-editor.c
+++ b/libnm/nm-vpn-editor.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2008 Novell, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-vpn-editor.h"
 
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index b082663098..f45d0c09e9 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2008 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-vpn-plugin-old.h"
 
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index 52e065784b..34de21b875 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-vpn-service-plugin.h"
 
diff --git a/libnm/nm-wifi-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index 75a37757f7..cab4648ecf 100644
--- a/libnm/nm-wifi-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 - 2019 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-wifi-p2p-peer.h"
 
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 0a853d83e7..421fe9e7ab 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-wimax-nsp.h"
 
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index f3da897eca..08eecfbdee 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -20,8 +20,7 @@ foreach test_unit: test_units
       libnm_nm_default_dep,
     ],
     c_args: [
-      '-DNETWORKMANAGER_COMPILATION_TEST',
-      '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
+      '-DG_LOG_DOMAIN="test"',
     ],
     link_with: libnm_static,
   )
diff --git a/libnm/tests/test-libnm.c b/libnm/tests/test-libnm.c
index 48f4bc789f..a90acd9b10 100644
--- a/libnm/tests/test-libnm.c
+++ b/libnm/tests/test-libnm.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #if defined(HAVE_DECL_MEMFD_CREATE) && HAVE_DECL_MEMFD_CREATE
     #include <linux/memfd.h>
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 42eafae20b..5452c623b2 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 9a99cfac85..0e7b744d52 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index bc1e6247e5..08c77f8c87 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2014 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/shared/nm-default.h b/shared/nm-default.h
index a101067a3e..269472d9e1 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_LIBNM
+#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE
     #error Dont include this header with such NETWORKMANAGER_COMPILATION
 #endif
 
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
index 36ef190552..f8f98d8170 100644
--- a/shared/nm-test-utils-impl.c
+++ b/shared/nm-test-utils-impl.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2010 - 2015 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include <sys/wait.h>
 
diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
index 62e6ea3bb6..dad4822755 100644
--- a/shared/nm-utils/nm-compat.c
+++ b/shared/nm-utils/nm-compat.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-libnm.h"
 
 #include "nm-compat.h"