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

2024-10-04 15:21:12 +00:00 · 2021-02-04 16:04:15 +01:00 · 2021-02-04 16:04:15 +01:00 · a38afcb1d9
parent 606612ea59
commit a38afcb1d9
65 changed files with 96 additions and 71 deletions
--- 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)

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

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

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

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

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

--- a/libnm/nm-default-libnm.h
+++ 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__ */
--- 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"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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