New upstream version 1.13.90 upstream/1.13.90

1 files changed, 270 insertions, 312 deletions

diff --git a/Makefile.am b/Makefile.am
index b1a2e69e..c1615108 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,12 +105,47 @@ endif
 
 endif
 
+dflt_cppflags = -std=gnu99
+
 ###############################################################################
 
-nm_build_cflags = \
-	-DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \
-	-DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \
-	$(NULL)
+# with autotools, it is not easily possible to generate these defines
+# from configure.ac.
+#
+# See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
+#
+# With meson-only, they could just be set via config.h.meson
+config-extra.h: Makefile
+	$(AM_V_GEN) \
+	echo "/* Generated by Makefile.am */"                    >$@ && \
+	echo "#define BINDIR            \"$(bindir)\""          >>$@ && \
+	echo "#define DATADIR           \"$(datadir)\""         >>$@ && \
+	echo "#define DHCLIENT_PATH     \"$(DHCLIENT_PATH)\""   >>$@ && \
+	echo "#define DHCPCANON_PATH    \"$(DHCPCANON_PATH)\""  >>$@ && \
+	echo "#define DHCPCD_PATH       \"$(DHCPCD_PATH)\""     >>$@ && \
+	echo "#define LIBEXECDIR        \"$(libexecdir)\""      >>$@ && \
+	echo "#define LOCALSTATEDIR     \"$(localstatedir)\""   >>$@ && \
+	echo "#define NMCONFDIR         \"$(nmconfdir)\""       >>$@ && \
+	echo "#define NMLIBDIR          \"$(nmlibdir)\""        >>$@ && \
+	echo "#define NMLOCALEDIR       \"$(nmlocaledir)\""     >>$@ && \
+	echo "#define NMPLUGINDIR       \"$(plugindir)\""       >>$@ && \
+	echo "#define NMRUNDIR          \"$(nmrundir)\""        >>$@ && \
+	echo "#define NMSTATEDIR        \"$(nmstatedir)\""      >>$@ && \
+	echo "#define NMVPNDIR          \"$(pkglibdir)\""       >>$@ && \
+	echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\""    >>$@ && \
+	echo "#define NM_BUILD_SRCDIR   \"$(abs_srcdir)\""      >>$@ && \
+	echo "#define PPPD_PLUGIN_DIR   \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
+	echo "#define PREFIX            \"$(prefix)\""          >>$@ && \
+	echo "#define RUNDIR            \"$(rundir)\""          >>$@ && \
+	echo "#define RUNSTATEDIR       \"$(runstatedir)\""     >>$@ && \
+	echo "#define SYSCONFDIR        \"$(sysconfdir)\""      >>$@ && \
+	true
+
+DISTCLEANFILES += config-extra.h
+
+libnm-core/.dirstamp: config-extra.h
+
+###############################################################################
 
 set_sanitizer_env = \
 	[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
@@ -204,6 +239,8 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
+	introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
+	introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.h \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
@@ -232,10 +269,14 @@ introspection_sources = \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.h \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.c \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.h \
+	introspection/org.freedesktop.NetworkManager.Device.WireGuard.c \
+	introspection/org.freedesktop.NetworkManager.Device.WireGuard.h \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.c \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.h \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.c \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.h \
+	introspection/org.freedesktop.NetworkManager.Device.Wpan.c \
+	introspection/org.freedesktop.NetworkManager.Device.Wpan.h \
 	introspection/org.freedesktop.NetworkManager.Device.c \
 	introspection/org.freedesktop.NetworkManager.Device.h \
 	introspection/org.freedesktop.NetworkManager.DHCP4Config.c \
@@ -289,6 +330,7 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.AgentManager.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wpan.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
@@ -305,9 +347,11 @@ DBUS_INTERFACE_DOCS = \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Settings.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
 	docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
-	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml
+	docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
+	docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
 
 introspection/%.c: introspection/%.xml
 	@$(MKDIR_P) introspection/
@@ -340,6 +384,7 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
 	introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
@@ -354,8 +399,10 @@ dbusinterfaces_DATA = \
 	introspection/org.freedesktop.NetworkManager.Device.Veth.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vlan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Vxlan.xml \
+	introspection/org.freedesktop.NetworkManager.Device.WireGuard.xml \
 	introspection/org.freedesktop.NetworkManager.Device.Wireless.xml \
 	introspection/org.freedesktop.NetworkManager.Device.WiMax.xml \
+	introspection/org.freedesktop.NetworkManager.Device.Wpan.xml \
 	introspection/org.freedesktop.NetworkManager.Device.xml \
 	introspection/org.freedesktop.NetworkManager.DHCP4Config.xml \
 	introspection/org.freedesktop.NetworkManager.DHCP6Config.xml \
@@ -395,6 +442,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-core-types.h \
 	libnm-core/nm-dbus-interface.h \
 	libnm-core/nm-errors.h \
+	libnm-core/nm-setting-6lowpan.h \
 	libnm-core/nm-setting-8021x.h \
 	libnm-core/nm-setting-adsl.h \
 	libnm-core/nm-setting-bluetooth.h \
@@ -405,6 +453,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-connection.h \
 	libnm-core/nm-setting-dcb.h \
 	libnm-core/nm-setting-dummy.h \
+	libnm-core/nm-setting-ethtool.h \
 	libnm-core/nm-setting-generic.h \
 	libnm-core/nm-setting-gsm.h \
 	libnm-core/nm-setting-infiniband.h \
@@ -414,6 +463,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-ip6-config.h \
 	libnm-core/nm-setting-macsec.h \
 	libnm-core/nm-setting-macvlan.h \
+	libnm-core/nm-setting-match.h \
 	libnm-core/nm-setting-olpc-mesh.h \
 	libnm-core/nm-setting-ovs-bridge.h \
 	libnm-core/nm-setting-ovs-interface.h \
@@ -423,6 +473,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-pppoe.h \
 	libnm-core/nm-setting-proxy.h \
 	libnm-core/nm-setting-serial.h \
+	libnm-core/nm-setting-sriov.h \
 	libnm-core/nm-setting-tc-config.h \
 	libnm-core/nm-setting-team-port.h \
 	libnm-core/nm-setting-team.h \
@@ -435,6 +486,7 @@ libnm_core_lib_h_pub_real = \
 	libnm-core/nm-setting-wired.h \
 	libnm-core/nm-setting-wireless-security.h \
 	libnm-core/nm-setting-wireless.h \
+	libnm-core/nm-setting-wpan.h \
 	libnm-core/nm-setting.h \
 	libnm-core/nm-simple-connection.h \
 	libnm-core/nm-utils.h \
@@ -449,11 +501,15 @@ libnm_core_lib_h_priv = \
 	shared/nm-utils/nm-dedup-multi.h \
 	shared/nm-utils/nm-enum-utils.h \
 	shared/nm-utils/nm-hash-utils.h \
+	shared/nm-utils/nm-io-utils.h \
+	shared/nm-utils/nm-secret-utils.h \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-random-utils.h \
 	shared/nm-utils/nm-udev-utils.h \
+	shared/nm-ethtool-utils.h \
 	shared/nm-meta-setting.h \
-	libnm-core/crypto.h \
+	libnm-core/nm-crypto.h \
+	libnm-core/nm-crypto-impl.h \
 	libnm-core/nm-connection-private.h \
 	libnm-core/nm-core-internal.h \
 	libnm-core/nm-core-types-internal.h \
@@ -463,6 +519,7 @@ libnm_core_lib_h_priv = \
 	libnm-core/nm-setting-private.h \
 	libnm-core/nm-utils-private.h
 libnm_core_lib_c_settings_real = \
+	libnm-core/nm-setting-6lowpan.c \
 	libnm-core/nm-setting-8021x.c \
 	libnm-core/nm-setting-adsl.c \
 	libnm-core/nm-setting-bluetooth.c \
@@ -473,6 +530,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-connection.c \
 	libnm-core/nm-setting-dcb.c \
 	libnm-core/nm-setting-dummy.c \
+	libnm-core/nm-setting-ethtool.c \
 	libnm-core/nm-setting-generic.c \
 	libnm-core/nm-setting-gsm.c \
 	libnm-core/nm-setting-infiniband.c \
@@ -482,6 +540,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-ip6-config.c \
 	libnm-core/nm-setting-macsec.c \
 	libnm-core/nm-setting-macvlan.c \
+	libnm-core/nm-setting-match.c \
 	libnm-core/nm-setting-olpc-mesh.c \
 	libnm-core/nm-setting-ovs-bridge.c \
 	libnm-core/nm-setting-ovs-interface.c \
@@ -491,6 +550,7 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-pppoe.c \
 	libnm-core/nm-setting-proxy.c \
 	libnm-core/nm-setting-serial.c \
+	libnm-core/nm-setting-sriov.c \
 	libnm-core/nm-setting-tc-config.c \
 	libnm-core/nm-setting-team-port.c \
 	libnm-core/nm-setting-team.c \
@@ -502,18 +562,22 @@ libnm_core_lib_c_settings_real = \
 	libnm-core/nm-setting-wimax.c \
 	libnm-core/nm-setting-wired.c \
 	libnm-core/nm-setting-wireless-security.c \
-	libnm-core/nm-setting-wireless.c
+	libnm-core/nm-setting-wireless.c \
+	libnm-core/nm-setting-wpan.c
 libnm_core_lib_c_real = \
 	$(libnm_core_lib_c_settings_real) \
 	shared/nm-utils/c-list-util.c \
 	shared/nm-utils/nm-dedup-multi.c \
 	shared/nm-utils/nm-enum-utils.c \
 	shared/nm-utils/nm-hash-utils.c \
+	shared/nm-utils/nm-io-utils.c \
+	shared/nm-utils/nm-secret-utils.c \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-random-utils.c \
 	shared/nm-utils/nm-udev-utils.c \
+	shared/nm-ethtool-utils.c \
 	shared/nm-meta-setting.c \
-	libnm-core/crypto.c \
+	libnm-core/nm-crypto.c \
 	libnm-core/nm-connection.c \
 	libnm-core/nm-dbus-utils.c \
 	libnm-core/nm-errors.c \
@@ -545,6 +609,7 @@ nodist_libnminclude_HEADERS += \
 ###############################################################################
 
 dflt_cppflags_libnm_core = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -552,15 +617,8 @@ dflt_cppflags_libnm_core = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBUDEV_CFLAGS) \
-	$(SANITIZER_LIB_CFLAGS)
-
-if WITH_GNUTLS
-dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS)
-endif
-
-if WITH_NSS
-dflt_cppflags_libnm_core += $(NSS_CFLAGS)
-endif
+	$(SANITIZER_LIB_CFLAGS) \
+	$(NULL)
 
 noinst_LTLIBRARIES += libnm-core/libnm-core.la
 
@@ -585,17 +643,12 @@ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS):          $(li
 $(src_devices_team_libnm_device_plugin_team_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
 $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
 $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS):                    $(libnm_core_lib_h_pub_mkenums)
+$(src_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                      $(libnm_core_lib_h_pub_mkenums)
 
 libnm_core_libnm_core_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLIBDIR=\"$(nmlibdir)\" \
-	-DNMVPNDIR=\"$(pkglibdir)\" \
-	-DNMPLUGINDIR=\"$(plugindir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
 	$(NULL)
 
 if WITH_JSON_VALIDATION
@@ -612,7 +665,6 @@ nodist_libnm_core_libnm_core_la_SOURCES = \
 	$(libnm_core_lib_c_mkenums)
 
 libnm_core_libnm_core_la_LIBADD = \
-	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(UUID_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -622,19 +674,9 @@ libnm_core_libnm_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS)
 
-if WITH_GNUTLS
-libnm_core_lib_c_real += libnm-core/crypto_gnutls.c
-libnm_core_libnm_core_la_LIBADD += $(GNUTLS_LIBS)
-endif
-
-if WITH_NSS
-libnm_core_lib_c_real += libnm-core/crypto_nss.c
-libnm_core_libnm_core_la_LIBADD += $(NSS_LIBS)
-endif
-
 EXTRA_DIST += \
-	libnm-core/crypto_gnutls.c \
-	libnm-core/crypto_nss.c \
+	libnm-core/nm-crypto-gnutls.c \
+	libnm-core/nm-crypto-nss.c \
 	libnm-core/nm-core-enum-types.c.template \
 	libnm-core/nm-core-enum-types.h.template \
 	libnm-core/meson.build
@@ -657,6 +699,46 @@ dist_dependencies += \
 
 ###############################################################################
 
+if HAVE_CRYPTO_GNUTLS
+if WITH_GNUTLS
+libnm_crypto_lib = libnm-core/libnm-crypto-gnutls.la
+else
+check_ltlibraries += libnm-core/libnm-crypto-gnutls.la
+endif
+
+libnm_core_libnm_crypto_gnutls_la_SOURCES = libnm-core/nm-crypto-gnutls.c
+libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \
+	$(libnm_core_libnm_core_la_CPPFLAGS) \
+	$(GNUTLS_CFLAGS)
+libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \
+	$(libnm_core_libnm_core_la_LDFLAGS)
+libnm_core_libnm_crypto_gnutls_la_LIBADD = \
+	$(libnm_core_libnm_core_la_LIBADD) \
+	$(GNUTLS_LIBS)
+endif
+
+if HAVE_CRYPTO_NSS
+if WITH_NSS
+libnm_crypto_lib = libnm-core/libnm-crypto-nss.la
+else
+check_ltlibraries += libnm-core/libnm-crypto-nss.la
+endif
+
+libnm_core_libnm_crypto_nss_la_SOURCES = libnm-core/nm-crypto-nss.c
+libnm_core_libnm_crypto_nss_la_CPPFLAGS = \
+	$(libnm_core_libnm_core_la_CPPFLAGS) \
+	$(NSS_CFLAGS)
+libnm_core_libnm_crypto_nss_la_LDFLAGS = \
+	$(libnm_core_libnm_core_la_LDFLAGS)
+libnm_core_libnm_crypto_nss_la_LIBADD = \
+	$(libnm_core_libnm_core_la_LIBADD) \
+	$(NSS_LIBS)
+endif
+
+noinst_LTLIBRARIES += $(libnm_crypto_lib)
+
+###############################################################################
+
 check_programs += \
 	libnm-core/tests/test-compare \
 	libnm-core/tests/test-crypto \
@@ -677,12 +759,12 @@ libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp
 $(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h
 
 libnm_core_tests_cppflags = \
-	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm-core/tests \
 	-I$(builddir)/libnm-core/tests \
-	$(nm_build_cflags) \
+	$(dflt_cppflags_libnm_core) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
+	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
@@ -703,6 +785,8 @@ nodist_libnm_core_tests_test_general_SOURCES = \
 
 libnm_core_tests_ldadd = \
 	libnm-core/libnm-core.la \
+	shared/libcsiphash.la \
+	$(libnm_crypto_lib) \
 	$(GLIB_LIBS)
 
 libnm_core_tests_ldflags = \
@@ -749,7 +833,8 @@ EXTRA_DIST += \
 	libnm-core/tests/certs/test2_ca_cert.pem \
 	libnm-core/tests/certs/test2-cert.p12 \
 	libnm-core/tests/certs/test2_key_and_cert.pem \
-	libnm-core/tests/certs/test-aes-key.pem \
+	libnm-core/tests/certs/test-aes-128-key.pem \
+	libnm-core/tests/certs/test-aes-256-key.pem \
 	libnm-core/tests/certs/test_ca_cert.der \
 	libnm-core/tests/certs/test_ca_cert.pem \
 	libnm-core/tests/certs/test-ca-cert.pem \
@@ -773,6 +858,7 @@ libnm_lib_h_pub_real = \
 	libnm/nm-autoptr.h \
 	libnm/nm-checkpoint.h \
 	libnm/nm-client.h \
+	libnm/nm-device-6lowpan.h \
 	libnm/nm-device-adsl.h \
 	libnm/nm-device-bond.h \
 	libnm/nm-device-bridge.h \
@@ -796,6 +882,8 @@ libnm_lib_h_pub_real = \
 	libnm/nm-device-vxlan.h \
 	libnm/nm-device-wifi.h \
 	libnm/nm-device-wimax.h \
+	libnm/nm-device-wireguard.h \
+	libnm/nm-device-wpan.h \
 	libnm/nm-device.h \
 	libnm/nm-dhcp-config.h \
 	libnm/nm-ip-config.h \
@@ -829,6 +917,7 @@ libnm_lib_c_real = \
 	libnm/nm-checkpoint.c \
 	libnm/nm-client.c \
 	libnm/nm-dbus-helpers.c \
+	libnm/nm-device-6lowpan.c \
 	libnm/nm-device-adsl.c \
 	libnm/nm-device-bond.c \
 	libnm/nm-device-bridge.c \
@@ -852,6 +941,8 @@ libnm_lib_c_real = \
 	libnm/nm-device-vxlan.c \
 	libnm/nm-device-wifi.c \
 	libnm/nm-device-wimax.c \
+	libnm/nm-device-wireguard.c \
+	libnm/nm-device-wpan.c \
 	libnm/nm-device.c \
 	libnm/nm-dhcp-config.c \
 	libnm/nm-dhcp4-config.c \
@@ -874,9 +965,9 @@ libnm_lib_c_mkenums = \
 	libnm/nm-enum-types.c
 
 libnm_lib_cppflags = \
-	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
+	$(dflt_cppflags_libnm_core) \
 	-DG_LOG_DOMAIN=\""libnm"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
 	$(NULL)
@@ -900,6 +991,8 @@ libnm_libnm_utils_la_SOURCES = \
 
 libnm_libnm_utils_la_LIBADD = \
 	libnm-core/libnm-core.la \
+	shared/libcsiphash.la \
+	$(libnm_crypto_lib) \
 	introspection/libnmdbus.la \
 	$(GLIB_LIBS)
 
@@ -997,7 +1090,7 @@ INTROSPECTION_GIRS += libnm/NM-1.0.gir
 if WITH_FAKE_TYPELIBS
 
 libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp
-	$(AM_V_GEN)  $(INTROSPECTION_COMPILER) $< -o $@
+	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
 
 libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp
 	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
@@ -1097,12 +1190,12 @@ check_programs_norun += $(libnm_tests_programs_req_introspection)
 endif
 
 libnm_tests_cppflags = \
-	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
-	$(nm_build_cflags) \
+	$(dflt_cppflags_libnm_core) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
+	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 libnm_tests_ldadd = \
@@ -1170,6 +1263,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
 	shared/nm-utils/nm-vpn-plugin-utils.h
 
 libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -1191,35 +1285,24 @@ EXTRA_DIST += \
 # src/
 ###############################################################################
 
-src_cppflags = \
-	$(dflt_cppflags_libnm_core) \
+src_cppflags_base = \
 	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	\
-	-DPREFIX=\"$(prefix)\" \
+	$(dflt_cppflags_libnm_core) \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+	$(SANITIZER_EXEC_CFLAGS) \
+	$(NULL)
+
+src_cppflags_base_test = \
+	$(src_cppflags_base) \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	$(NULL)
+
+src_cppflags_device_plugin = \
+	$(src_cppflags_base)
+
+src_cppflags = \
+	$(src_cppflags_base) \
 	\
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DRUNSTATEDIR=\"$(runstatedir)\" \
-	-DSBINDIR=\"$(sbindir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DRUNDIR=\"$(rundir)\" \
-	\
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
-	-DNMPLUGINDIR=\"$(plugindir)\" \
-	-DNMRUNDIR=\"$(nmrundir)\" \
-	-DNMSTATEDIR=\"$(nmstatedir)\" \
-	-DNMLIBDIR=\"$(nmlibdir)\" \
-	\
-	-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
-	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-	\
-	$(LIBUDEV_CFLAGS) \
 	$(LIBNDP_CFLAGS) \
 	$(LIBPSL_CFLAGS) \
 	$(LIBCURL_CFLAGS) \
@@ -1227,10 +1310,18 @@ src_cppflags = \
 	$(LIBAUDIT_CFLAGS) \
 	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS) \
 	\
 	$(NULL)
 
+src_cppflags_test = \
+	$(src_cppflags) \
+	-DNETWORKMANAGER_COMPILATION_TEST \
+	$(NULL)
+
+if REQUIRE_ROOT_TESTS
+src_cppflags_test += -DREQUIRE_ROOT_TESTS=1
+endif
+
 src_ldflags = $(CODE_COVERAGE_LDFLAGS)
 
 sbin_PROGRAMS += \
@@ -1279,6 +1370,7 @@ EXTRA_DIST += shared/c-list/src/c-list.h
 ###############################################################################
 
 src_libsystemd_nm_la_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -1313,14 +1405,12 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/sd-adapt/def.h \
 	src/systemd/sd-adapt/device-nodes.h \
 	src/systemd/sd-adapt/dirent-util.h \
-	src/systemd/sd-adapt/env-util.h \
 	src/systemd/sd-adapt/errno-list.h \
 	src/systemd/sd-adapt/format-util.h \
 	src/systemd/sd-adapt/glob-util.h \
 	src/systemd/sd-adapt/gunicode.h \
 	src/systemd/sd-adapt/ioprio.h \
 	src/systemd/sd-adapt/khash.h \
-	src/systemd/sd-adapt/libudev.h \
 	src/systemd/sd-adapt/locale-util.h \
 	src/systemd/sd-adapt/memfd-util.h \
 	src/systemd/sd-adapt/missing.h \
@@ -1328,16 +1418,17 @@ src_libsystemd_nm_la_SOURCES = \
 	src/systemd/sd-adapt/procfs-util.h \
 	src/systemd/sd-adapt/raw-clone.h \
 	src/systemd/sd-adapt/sd-daemon.h \
+	src/systemd/sd-adapt/sd-device.h \
 	src/systemd/sd-adapt/stat-util.h \
 	src/systemd/sd-adapt/terminal-util.h \
-	src/systemd/sd-adapt/udev-util.h \
-	src/systemd/sd-adapt/udev.h \
 	src/systemd/sd-adapt/unaligned.h \
 	src/systemd/sd-adapt/user-util.h \
 	src/systemd/sd-adapt/virt.h \
 	src/systemd/src/basic/alloc-util.c \
 	src/systemd/src/basic/alloc-util.h \
 	src/systemd/src/basic/async.h \
+	src/systemd/src/basic/env-util.c \
+	src/systemd/src/basic/env-util.h \
 	src/systemd/src/basic/escape.c \
 	src/systemd/src/basic/escape.h \
 	src/systemd/src/basic/ether-addr-util.c \
@@ -1482,11 +1573,13 @@ src_libNetworkManagerBase_la_SOURCES = \
 	src/platform/nm-platform-private.h \
 	src/platform/nm-linux-platform.c \
 	src/platform/nm-linux-platform.h \
-	src/platform/wifi/wifi-utils-nl80211.c \
-	src/platform/wifi/wifi-utils-nl80211.h \
-	src/platform/wifi/wifi-utils-private.h \
-	src/platform/wifi/wifi-utils.c \
-	src/platform/wifi/wifi-utils.h \
+	src/platform/wifi/nm-wifi-utils-nl80211.c \
+	src/platform/wifi/nm-wifi-utils-nl80211.h \
+	src/platform/wifi/nm-wifi-utils-private.h \
+	src/platform/wifi/nm-wifi-utils.c \
+	src/platform/wifi/nm-wifi-utils.h \
+	src/platform/wpan/nm-wpan-utils.c \
+	src/platform/wpan/nm-wpan-utils.h \
 	\
 	src/ndisc/nm-lndp-ndisc.c \
 	src/ndisc/nm-lndp-ndisc.h \
@@ -1519,12 +1612,14 @@ src_libNetworkManagerBase_la_SOURCES = \
 
 if WITH_WEXT
 src_libNetworkManagerBase_la_SOURCES += \
-	src/platform/wifi/wifi-utils-wext.c \
-	src/platform/wifi/wifi-utils-wext.h
+	src/platform/wifi/nm-wifi-utils-wext.c \
+	src/platform/wifi/nm-wifi-utils-wext.h
 endif
 
 src_libNetworkManagerBase_la_LIBADD = \
 	libnm-core/libnm-core.la \
+	shared/libcsiphash.la \
+	$(libnm_crypto_lib) \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(LIBUDEV_LIBS) \
@@ -1532,6 +1627,9 @@ src_libNetworkManagerBase_la_LIBADD = \
 
 $(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
+EXTRA_DIST += \
+	src/platform/linux/nl802154.h
+
 ###############################################################################
 
 src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
@@ -1558,6 +1656,8 @@ src_libNetworkManager_la_SOURCES = \
 	src/devices/nm-device-logging.h \
 	src/devices/nm-device-private.h \
 	\
+	src/devices/nm-device-6lowpan.c \
+	src/devices/nm-device-6lowpan.h \
 	src/devices/nm-device-bond.c \
 	src/devices/nm-device-bond.h \
 	src/devices/nm-device-bridge.c \
@@ -1584,6 +1684,10 @@ src_libNetworkManager_la_SOURCES = \
 	src/devices/nm-device-vlan.h \
 	src/devices/nm-device-vxlan.c \
 	src/devices/nm-device-vxlan.h \
+	src/devices/nm-device-wireguard.c \
+	src/devices/nm-device-wireguard.h \
+	src/devices/nm-device-wpan.c \
+	src/devices/nm-device-wpan.h \
 	\
 	src/dhcp/nm-dhcp-dhcpcanon.c \
 	src/dhcp/nm-dhcp-dhclient.c \
@@ -1725,19 +1829,10 @@ $(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 check_ltlibraries += src/libNetworkManagerTest.la
 
-src_tests_cppflags = \
-	$(src_cppflags) \
-	$(SANITIZER_EXEC_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION_TEST
-
-if REQUIRE_ROOT_TESTS
-src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
-endif
+src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
+src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
 
-src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup
-src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup
-
-src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags)
+src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
 
 src_libNetworkManagerTest_la_SOURCES = \
 	src/ndisc/nm-fake-ndisc.c \
@@ -1815,12 +1910,13 @@ EXTRA_DIST += \
 libexec_PROGRAMS += src/dhcp/nm-dhcp-helper
 
 src_dhcp_nm_dhcp_helper_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
-	-DNMRUNDIR=\"$(nmrundir)\"
+	$(GLIB_CFLAGS) \
+	$(NULL)
 
 src_dhcp_nm_dhcp_helper_SOURCES = \
 	src/dhcp/nm-dhcp-helper.c \
@@ -1839,10 +1935,7 @@ EXTRA_DIST += \
 # src/dhcp/tests
 ###############################################################################
 
-src_dhcp_tests_cppflags = \
-	$(src_tests_cppflags) \
-	$(nm_build_cflags) \
-	$(NULL)
+src_dhcp_tests_cppflags = $(src_cppflags_test)
 
 src_dhcp_tests_ldadd = \
 	src/libNetworkManagerTest.la
@@ -1879,6 +1972,7 @@ core_plugins += src/ppp/libnm-ppp-plugin.la
 pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la
 
 src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -1910,16 +2004,7 @@ src_ppp_libnm_ppp_plugin_la_SOURCES = \
 EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
 	src/ppp/nm-ppp-plugin.ver
 
-src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS)
+src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
 
 src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
 	-module -avoid-version \
@@ -1941,10 +2026,7 @@ EXTRA_DIST += \
 
 check_programs += src/settings/plugins/keyfile/tests/test-keyfile
 
-src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
-	$(src_tests_cppflags) \
-	$(nm_build_cflags) \
-	$(NULL)
+src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
 
 src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2008,18 +2090,7 @@ core_plugins += src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
 
 noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
 
-src_settings_plugins_ibft_cppflags = \
-	-I$(srcdir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	$(GLIB_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DSBINDIR=\"$(sbindir)\"
-
-src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
+src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_cppflags_base)
 
 src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \
 	src/settings/plugins/ibft/nms-ibft-reader.c \
@@ -2033,7 +2104,7 @@ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \
 	src/settings/plugins/ibft/nms-ibft-connection.c \
 	src/settings/plugins/ibft/nms-ibft-connection.h
 
-src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
+src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_cppflags_base)
 
 src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2046,18 +2117,7 @@ $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core
 
 check_programs += src/settings/plugins/ibft/tests/test-ibft
 
-src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/src \
-	$(nm_build_cflags) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(NULL)
+src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test)
 
 src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2104,27 +2164,13 @@ noinst_LTLIBRARIES += \
 	src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
 	src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
 
-src_settings_plugins_ifcfg_rh_cppflags = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	$(GLIB_CFLAGS) \
-	$(NSS_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DSBINDIR=\"$(sbindir)\"
-
 ###############################################################################
 
 nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
 	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
 	src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
 
-src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_settings_plugins_ifcfg_rh_cppflags))
+src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base))
 
 CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
 
@@ -2154,9 +2200,9 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
 
-src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
+src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
 
-$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS):           $(libnm_core_lib_h_pub_mkenums)
+$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 ###############################################################################
 
@@ -2166,7 +2212,7 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
 
-src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
+src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
 
 src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2193,10 +2239,7 @@ check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
 src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
 	src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
 
-src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
-	$(src_tests_cppflags) \
-	$(nm_build_cflags) \
-	$(NULL)
+src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
 
 src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
 	$(GLIB_LIBS) \
@@ -2243,6 +2286,7 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1 \
@@ -2281,6 +2325,8 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-read-proxy-basic \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \
@@ -2383,6 +2429,7 @@ EXTRA_DIST += \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-3.expected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4 \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-write-unknown-4.expected \
+	src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-dynamic-wep-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap \
 	src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep \
@@ -2456,25 +2503,13 @@ core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
 
 noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
 
-src_settings_plugins_ifupdown_cppflags = \
-	-I$(srcdir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS) \
-	$(LIBUDEV_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\"
-
-
 src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
 	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
 	src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
 	src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
 	src/settings/plugins/ifupdown/nms-ifupdown-parser.h
 
-src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
+src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
 
 src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
 	$(LIBUDEV_LIBS)
@@ -2485,7 +2520,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
 	src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
 	src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
 
-src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
+src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
 
 src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2496,6 +2531,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LIBADD = \
 	$(LIBUDEV_LIBS)
 
 $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
 check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
 	$(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so)
@@ -2506,17 +2542,7 @@ check_local += check-local-symbols-settings-ifupdown
 
 check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
 
-src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/src \
-	$(GLIB_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(nm_build_cflags) \
-	$(NULL)
+src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
 
 src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
 	$(GLIB_LDFLAGS) \
@@ -2576,16 +2602,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 	src/devices/adsl/nm-device-adsl.c \
 	src/devices/adsl/nm-device-adsl.h
 
-src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS) \
-	$(LIBUDEV_CFLAGS)
+src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
 
 src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2610,16 +2627,9 @@ EXTRA_DIST += \
 if WITH_MODEM_MANAGER_1
 
 src_devices_wwan_cppflags = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS) \
-	$(LIBSYSTEMD_CFLAGS) \
-	$(MM_GLIB_CFLAGS)
+	$(src_cppflags_device_plugin) \
+	$(MM_GLIB_CFLAGS) \
+	$(NULL)
 
 core_plugins += src/devices/wwan/libnm-wwan.la
 
@@ -2709,15 +2719,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
 	src/devices/bluetooth/nm-device-bt.c \
 	src/devices/bluetooth/nm-device-bt.h
 
-src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS)
+src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)
 
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2777,15 +2779,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \
 	src/devices/wifi/nm-iwd-manager.h
 endif
 
-src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS)
+src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
 
 src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2809,16 +2803,7 @@ src_devices_wifi_tests_test_general_SOURCES = \
 	src/devices/wifi/nm-wifi-utils.c \
 	src/devices/wifi/nm-wifi-utils.h
 
-src_devices_wifi_tests_test_general_CPPFLAGS = \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	$(GLIB_CFLAGS)
+src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
 
 src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
 src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
@@ -2845,16 +2830,10 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 	src/devices/team/nm-device-team.h
 
 src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
+	$(src_cppflags_device_plugin) \
 	$(LIBTEAMDCTL_CFLAGS) \
 	$(JANSSON_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(NULL)
 
 src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2904,18 +2883,9 @@ src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
 	src/devices/ovs/nm-device-ovs-bridge.h
 
 src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
-	-I$(srcdir)/src \
-	-I$(builddir)/src \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm-core \
-	\
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
-	-DRUNSTATEDIR=\"$(runstatedir)\" \
-	\
+	$(src_cppflags_device_plugin) \
 	$(JANSSON_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(NULL)
 
 src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
 	-module -avoid-version \
@@ -2941,9 +2911,7 @@ EXTRA_DIST += \
 
 check_programs += src/dnsmasq/tests/test-dnsmasq-utils
 
-src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
-	$(src_tests_cppflags) \
-	$(NULL)
+src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
 
 src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
 	src/libNetworkManagerTest.la
@@ -2984,7 +2952,7 @@ check_programs += \
 	src/platform/tests/test-cleanup-fake \
 	src/platform/tests/test-cleanup-linux
 
-src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags)
+src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
 
@@ -3028,11 +2996,11 @@ src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
 src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
 
-src_platform_tests_test_nmp_object_CPPFLAGS = $(src_tests_cppflags)
+src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
 
-src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
+src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
 src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
 src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
 
@@ -3063,12 +3031,12 @@ check_programs += \
 	src/devices/tests/test-lldp \
 	src/devices/tests/test-acd
 
-src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags)
+src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
 src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
 src_devices_tests_test_lldp_LDADD = \
 	src/libNetworkManagerTest.la
 
-src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags)
+src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test)
 src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
 src_devices_tests_test_acd_LDADD = \
 	src/libNetworkManagerTest.la
@@ -3094,11 +3062,11 @@ src_ndisc_tests_ldadd = \
 check_programs += src/ndisc/tests/test-ndisc-fake
 check_programs_norun += src/ndisc/tests/test-ndisc-linux
 
-src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags)
+src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
 src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
 src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
 
-src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags)
+src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test)
 src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
 src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
 
@@ -3114,10 +3082,7 @@ EXTRA_DIST += \
 
 check_programs += src/supplicant/tests/test-supplicant-config
 
-src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
-	$(src_tests_cppflags) \
-	$(nm_build_cflags) \
-	$(NULL)
+src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test)
 
 src_supplicant_tests_test_supplicant_config_LDADD = \
 	src/libNetworkManagerTest.la
@@ -3143,10 +3108,7 @@ src_tests_config_test_config_SOURCES = \
 	src/tests/config/nm-test-device.h \
 	src/tests/config/test-config.c
 
-src_tests_config_test_config_CPPFLAGS = \
-	$(src_tests_cppflags) \
-	$(nm_build_cflags) \
-	$(NULL)
+src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
 
 src_tests_config_test_config_LDADD = \
 	src/libNetworkManagerTest.la
@@ -3188,31 +3150,31 @@ check_programs += \
 	src/tests/test-wired-defname \
 	src/tests/test-utils
 
-src_tests_test_ip4_config_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
 
-src_tests_test_ip6_config_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
 
-src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_dcb_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_general_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_general_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_with_expect_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
 
-src_tests_test_wired_defname_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
 
-src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags)
+src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_utils_LDADD = $(src_tests_ldadd)
 
@@ -3251,6 +3213,7 @@ noinst_LTLIBRARIES += \
 	dispatcher/libnm-dispatcher-core.la
 
 dispatcher_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -3262,9 +3225,7 @@ dispatcher_cppflags = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\"
+	$(NULL)
 
 
 dispatcher_nmdbus_dispatcher_sources = \
@@ -3350,6 +3311,7 @@ EXTRA_DIST += \
 check_programs += dispatcher/tests/test-dispatcher-envp
 
 dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -3357,8 +3319,6 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/dispatcher \
-	-I$(builddir)/dispatcher \
-	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
@@ -3392,6 +3352,7 @@ EXTRA_DIST += \
 bin_PROGRAMS += clients/nm-online
 
 clients_nm_online_CPPFLAGS = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -3401,7 +3362,7 @@ clients_nm_online_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nm-online"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\"
+	$(NULL)
 
 clients_nm_online_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -3420,6 +3381,7 @@ EXTRA_DIST += \
 ###############################################################################
 
 clients_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-core \
@@ -3428,8 +3390,9 @@ clients_cppflags = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/clients/common \
 	-I$(builddir)/clients/common \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
 	$(GLIB_CFLAGS) \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
+	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 check_ltlibraries += clients/common/libnmc-base.la
@@ -3454,7 +3417,7 @@ clients_common_libnmc_base_la_SOURCES = \
 clients_common_libnmc_base_la_CPPFLAGS = \
 	$(clients_cppflags) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
+	$(NULL)
 
 clients_common_libnmc_base_la_LIBADD = \
 	libnm/libnm.la \
@@ -3502,6 +3465,9 @@ clients_common_libnmc_la_SOURCES = \
 	shared/nm-meta-setting.c \
 	shared/nm-meta-setting.h \
 	\
+	shared/nm-ethtool-utils.c \
+	shared/nm-ethtool-utils.h \
+	\
 	clients/common/nm-meta-setting-desc.c \
 	clients/common/nm-meta-setting-desc.h \
 	clients/common/nm-meta-setting-access.c \
@@ -3511,7 +3477,7 @@ clients_common_libnmc_la_SOURCES = \
 clients_common_libnmc_la_CPPFLAGS = \
 	$(clients_cppflags) \
 	-DG_LOG_DOMAIN=\""libnmc"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
+	$(NULL)
 
 clients_common_libnmc_la_LIBADD = \
 	libnm/libnm.la \
@@ -3534,8 +3500,7 @@ clients_common_tests_test_general_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	$(SANITIZER_EXEC_CFLAGS)
+	$(NULL)
 
 clients_common_tests_test_general_LDFLAGS = \
 	$(SANITIZER_EXEC_LDFLAGS)
@@ -3580,11 +3545,8 @@ clients_cli_nmcli_SOURCES = \
 clients_cli_nmcli_CPPFLAGS = \
 	-I$(srcdir)/clients/cli \
 	$(clients_cppflags) \
-	$(SANITIZER_EXEC_CFLAGS) \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DG_LOG_DOMAIN=\""nmcli"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\"
+	$(NULL)
 
 clients_cli_nmcli_LDADD = \
 	libnm/libnm.la \
@@ -3682,17 +3644,9 @@ clients_tui_newt_libnmt_newt_a_SOURCES = \
 	$(NULL)
 
 clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
-	-I$(srcdir)/shared \
-	-I$(builddir)/shared \
-	-I$(srcdir)/libnm-core \
-	-I$(builddir)/libnm-core \
-	-I$(srcdir)/libnm \
-	-I$(builddir)/libnm \
+	$(clients_cppflags) \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	$(GLIB_CFLAGS) \
 	$(NEWT_CFLAGS) \
-	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
 
 $(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
@@ -3787,10 +3741,9 @@ clients_tui_nmtui_SOURCES = \
 clients_tui_nmtui_CPPFLAGS = \
 	-I$(srcdir)/clients/tui/newt \
 	$(clients_cppflags) \
-	$(NEWT_CFLAGS) \
 	-DG_LOG_DOMAIN=\""nmtui"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
-	-DNMLOCALEDIR=\""$(nmlocaledir)"\"
+	$(NEWT_CFLAGS) \
+	$(NULL)
 
 clients_tui_nmtui_LDFLAGS = \
 	-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -3847,12 +3800,13 @@ check_local += check-local-clients-tests-test-client
 
 CLEANFILES += clients/tests/test-client.log
 
-include clients/tests/test-client.check-on-disk/Makefile.am
-
 EXTRA_DIST += \
 	clients/tests/test-client.py \
-	clients/tests/test-client.check-on-disk/Makefile.am \
-	$(clients_tests_expected_files)
+	clients/tests/test-client.check-on-disk/test_001.expected \
+	clients/tests/test-client.check-on-disk/test_002.expected \
+	clients/tests/test-client.check-on-disk/test_003.expected \
+	clients/tests/test-client.check-on-disk/test_004.expected \
+	$(NULL)
 
 ###############################################################################
 # data
@@ -3945,13 +3899,13 @@ lib_LTLIBRARIES += libnm-util/libnm-util.la
 libnm_util_libnm_util_includedir=$(includedir)/NetworkManager
 
 libnm_util_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/libnm-util \
 	-I$(builddir)/libnm-util \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-DG_LOG_DOMAIN=\""libnm-util"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
-	-DNMLOCALEDIR=\"$(nmlocaledir)\" \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UUID_CFLAGS)
@@ -4157,13 +4111,13 @@ dist_dependencies += libnm-util/libnm-util.la
 ###############################################################################
 
 libnm_util_tests_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-util \
 	-I$(builddir)/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
 	$(SANITIZER_EXEC_CFLAGS) \
@@ -4237,6 +4191,7 @@ EXTRA_DIST += \
 ###############################################################################
 
 libnm_glib_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-util \
@@ -4515,12 +4470,12 @@ dist_dependencies += \
 ###############################################################################
 
 libnm_glib_tests_cppflags = \
+	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
 	-I$(srcdir)/libnm-util \
 	-I$(builddir)/libnm-util \
 	-I$(srcdir)/libnm-glib \
-	$(nm_build_cflags) \
 	-DNETWORKMANAGER_COMPILATION_TEST \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
 	$(GLIB_CFLAGS) \
@@ -4806,14 +4761,17 @@ EXTRA_DIST += \
 	shared/nm-test-utils-impl.c \
 	shared/nm-utils/c-list-util.c \
 	shared/nm-utils/c-list-util.h \
-	shared/nm-utils/gsystem-local-alloc.h \
 	shared/nm-utils/nm-c-list.h \
 	shared/nm-utils/nm-compat.c \
 	shared/nm-utils/nm-compat.h \
 	shared/nm-utils/nm-glib.h \
+	shared/nm-utils/nm-io-utils.c \
+	shared/nm-utils/nm-io-utils.h \
 	shared/nm-utils/nm-jansson.h \
 	shared/nm-utils/nm-obj.h \
 	shared/nm-utils/nm-macros-internal.h \
+	shared/nm-utils/nm-secret-utils.c \
+	shared/nm-utils/nm-secret-utils.h \
 	shared/nm-utils/nm-shared-utils.c \
 	shared/nm-utils/nm-shared-utils.h \
 	shared/nm-utils/nm-test-utils.h \