build: move "shared/nm-{glib-aux,log-null,log-core}" to "src/libnm-{glib-aux,log-null,log-core}"

.gitignore

@@ -135,9 +135,6 @@ test-*.trs
 /examples/C/qt/monitor-nm-running
 /examples/C/qt/monitor-nm-running.moc
 
-/shared/nm-glib-aux/tests/test-json-aux
-/shared/nm-glib-aux/tests/test-shared-general
-
 /introspection/org.freedesktop.NetworkManager*.[ch]
 
 /src/libnm-core-public/nm-version-macros.h
@@ -151,6 +148,8 @@ test-*.trs
 /src/libnm-core-impl/tests/test-need-secrets
 /src/libnm-core-impl/tests/test-secrets
 /src/libnm-core-impl/tests/test-setting
+/src/libnm-glib-aux/tests/test-json-aux
+/src/libnm-glib-aux/tests/test-shared-general
 /src/libnm-platform/tests/test-nm-platform
 
 /libnm/nm-property-infos-dbus.xml
@@ -361,6 +360,8 @@ test-*.trs
 /libnm/tests/test-general
 /policy/org.freedesktop.NetworkManager.policy
 /policy/org.freedesktop.NetworkManager.policy.in
+/shared/nm-glib-aux/tests/test-json-aux
+/shared/nm-glib-aux/tests/test-shared-general
 /shared/nm-platform/tests/test-nm-platform
 /shared/nm-utils/tests/test-shared-general
 /shared/nm-version-macros.h

Makefile.am

@@ -116,8 +116,8 @@ src/libnm-core-impl/.dirstamp:                config-extra.h
 src/libnm-core-impl/.dirstamp:                config-extra.h
 shared/.dirstamp:                             config-extra.h
 src/libnm-base/.dirstamp:                     config-extra.h
-shared/nm-glib-aux/.dirstamp:                 config-extra.h
-shared/nm-glib-aux/tests/.dirstamp:           config-extra.h
+src/libnm-glib-aux/.dirstamp:                 config-extra.h
+src/libnm-glib-aux/tests/.dirstamp:           config-extra.h
 src/libnm-platform/.dirstamp:                 config-extra.h
 src/libnm-platform/tests/.dirstamp:           config-extra.h
 shared/nm-std-aux/.dirstamp:                  config-extra.h
@@ -377,78 +377,82 @@ shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \
 
 ###############################################################################
 
-shared_nm_glib_aux_cppflags = \
+src_libnm_glib_aux_cppflags = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
-noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
+noinst_LTLIBRARIES += src/libnm-glib-aux/libnm-glib-aux.la
 
-shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
-	$(shared_nm_glib_aux_cppflags) \
+src_libnm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \
+	$(src_libnm_glib_aux_cppflags) \
 	$(NULL)
 
-shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
-	shared/nm-glib-aux/nm-c-list.h \
-	shared/nm-glib-aux/nm-dbus-aux.c \
-	shared/nm-glib-aux/nm-dbus-aux.h \
-	shared/nm-glib-aux/nm-dedup-multi.c \
-	shared/nm-glib-aux/nm-dedup-multi.h \
-	shared/nm-glib-aux/nm-default-glib-i18n-lib.h \
-	shared/nm-glib-aux/nm-default-glib-i18n-prog.h \
-	shared/nm-glib-aux/nm-default-glib.h \
-	shared/nm-glib-aux/nm-enum-utils.c \
-	shared/nm-glib-aux/nm-enum-utils.h \
-	shared/nm-glib-aux/nm-errno.c \
-	shared/nm-glib-aux/nm-errno.h \
-	shared/nm-glib-aux/nm-gassert-patch.h \
-	shared/nm-glib-aux/nm-glib.h \
-	shared/nm-glib-aux/nm-hash-utils.c \
-	shared/nm-glib-aux/nm-hash-utils.h \
-	shared/nm-glib-aux/nm-io-utils.c \
-	shared/nm-glib-aux/nm-io-utils.h \
-	shared/nm-glib-aux/nm-jansson.h \
-	shared/nm-glib-aux/nm-json-aux.c \
-	shared/nm-glib-aux/nm-json-aux.h \
-	shared/nm-glib-aux/nm-keyfile-aux.c \
-	shared/nm-glib-aux/nm-keyfile-aux.h \
-	shared/nm-glib-aux/nm-logging-base.c \
-	shared/nm-glib-aux/nm-logging-base.h \
-	shared/nm-glib-aux/nm-logging-fwd.h \
-	shared/nm-glib-aux/nm-macros-internal.h \
-	shared/nm-glib-aux/nm-obj.h \
-	shared/nm-glib-aux/nm-random-utils.c \
-	shared/nm-glib-aux/nm-random-utils.h \
-	shared/nm-glib-aux/nm-ref-string.c \
-	shared/nm-glib-aux/nm-ref-string.h \
-	shared/nm-glib-aux/nm-secret-utils.c \
-	shared/nm-glib-aux/nm-secret-utils.h \
-	shared/nm-glib-aux/nm-shared-utils.c \
-	shared/nm-glib-aux/nm-shared-utils.h \
-	shared/nm-glib-aux/nm-str-buf.h \
-	shared/nm-glib-aux/nm-time-utils.c \
-	shared/nm-glib-aux/nm-time-utils.h \
-	shared/nm-glib-aux/nm-value-type.h \
+src_libnm_glib_aux_libnm_glib_aux_la_SOURCES = \
+	src/libnm-glib-aux/nm-c-list.h \
+	src/libnm-glib-aux/nm-dbus-aux.c \
+	src/libnm-glib-aux/nm-dbus-aux.h \
+	src/libnm-glib-aux/nm-dedup-multi.c \
+	src/libnm-glib-aux/nm-dedup-multi.h \
+	src/libnm-glib-aux/nm-default-glib-i18n-lib.h \
+	src/libnm-glib-aux/nm-default-glib-i18n-prog.h \
+	src/libnm-glib-aux/nm-default-glib.h \
+	src/libnm-glib-aux/nm-enum-utils.c \
+	src/libnm-glib-aux/nm-enum-utils.h \
+	src/libnm-glib-aux/nm-errno.c \
+	src/libnm-glib-aux/nm-errno.h \
+	src/libnm-glib-aux/nm-gassert-patch.h \
+	src/libnm-glib-aux/nm-glib.h \
+	src/libnm-glib-aux/nm-hash-utils.c \
+	src/libnm-glib-aux/nm-hash-utils.h \
+	src/libnm-glib-aux/nm-io-utils.c \
+	src/libnm-glib-aux/nm-io-utils.h \
+	src/libnm-glib-aux/nm-jansson.h \
+	src/libnm-glib-aux/nm-json-aux.c \
+	src/libnm-glib-aux/nm-json-aux.h \
+	src/libnm-glib-aux/nm-keyfile-aux.c \
+	src/libnm-glib-aux/nm-keyfile-aux.h \
+	src/libnm-glib-aux/nm-logging-base.c \
+	src/libnm-glib-aux/nm-logging-base.h \
+	src/libnm-glib-aux/nm-logging-fwd.h \
+	src/libnm-glib-aux/nm-macros-internal.h \
+	src/libnm-glib-aux/nm-obj.h \
+	src/libnm-glib-aux/nm-random-utils.c \
+	src/libnm-glib-aux/nm-random-utils.h \
+	src/libnm-glib-aux/nm-ref-string.c \
+	src/libnm-glib-aux/nm-ref-string.h \
+	src/libnm-glib-aux/nm-secret-utils.c \
+	src/libnm-glib-aux/nm-secret-utils.h \
+	src/libnm-glib-aux/nm-shared-utils.c \
+	src/libnm-glib-aux/nm-shared-utils.h \
+	src/libnm-glib-aux/nm-str-buf.h \
+	src/libnm-glib-aux/nm-time-utils.c \
+	src/libnm-glib-aux/nm-time-utils.h \
+	src/libnm-glib-aux/nm-value-type.h \
 	$(NULL)
 
-shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
+src_libnm_glib_aux_libnm_glib_aux_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \
+src_libnm_glib_aux_libnm_glib_aux_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-glib-aux/meson.build
+
 ###############################################################################
 
 noinst_LTLIBRARIES += src/libnm-udev-aux/libnm-udev-aux.la
 
 src_libnm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \
-	$(shared_nm_glib_aux_cppflags) \
+	$(src_libnm_glib_aux_cppflags) \
 	$(LIBUDEV_CFLAGS) \
 	$(NULL)
 
@@ -474,7 +478,7 @@ EXTRA_DIST += src/libnm-udev-aux/meson.build
 noinst_LTLIBRARIES += src/libnm-base/libnm-base.la
 
 src_libnm_base_libnm_base_la_CPPFLAGS = \
-	$(shared_nm_glib_aux_cppflags) \
+	$(src_libnm_glib_aux_cppflags) \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
 	$(NULL)
@@ -499,57 +503,65 @@ EXTRA_DIST += src/libnm-base/meson.build
 
 ###############################################################################
 
-noinst_LTLIBRARIES += shared/nm-log-core/libnm-log-core.la
+noinst_LTLIBRARIES += src/libnm-log-core/libnm-log-core.la
 
-shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
+src_libnm_log_core_libnm_log_core_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
 	$(NULL)
 
-shared_nm_log_core_libnm_log_core_la_SOURCES = \
-	shared/nm-log-core/nm-logging.c \
-	shared/nm-log-core/nm-logging.h \
+src_libnm_log_core_libnm_log_core_la_SOURCES = \
+	src/libnm-log-core/nm-logging.c \
+	src/libnm-log-core/nm-logging.h \
 	$(NULL)
 
-shared_nm_log_core_libnm_log_core_la_LDFLAGS = \
+src_libnm_log_core_libnm_log_core_la_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_LIB_LDFLAGS) \
 	$(NULL)
 
-shared_nm_log_core_libnm_log_core_la_LIBADD = \
+src_libnm_log_core_libnm_log_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(SYSTEMD_JOURNAL_LIBS) \
 	$(NULL)
 
-noinst_LTLIBRARIES += shared/nm-log-null/libnm-log-null.la
+EXTRA_DIST += src/libnm-log-core/meson.build
 
-shared_nm_log_null_libnm_log_null_la_CPPFLAGS = \
+noinst_LTLIBRARIES += src/libnm-log-null/libnm-log-null.la
+
+src_libnm_log_null_libnm_log_null_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_log_null_libnm_log_null_la_SOURCES = \
-	shared/nm-log-null/nm-logging-null.c \
+src_libnm_log_null_libnm_log_null_la_SOURCES = \
+	src/libnm-log-null/nm-logging-null.c \
 	$(NULL)
 
-shared_nm_log_null_libnm_log_null_la_LIBADD = \
+src_libnm_log_null_libnm_log_null_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
+EXTRA_DIST += src/libnm-log-null/meson.build
+
 ###############################################################################
 
 noinst_LTLIBRARIES += src/libnm-platform/libnm-platform.la
 
 src_libnm_platform_libnm_platform_la_CPPFLAGS = \
-	$(shared_nm_glib_aux_cppflags) \
+	$(src_libnm_glib_aux_cppflags) \
 	-I$(srcdir)/src \
 	-I$(builddir)/src \
 	$(NULL)
@@ -597,8 +609,8 @@ src_libnm_platform_tests_test_nm_platform_LDFLAGS = \
 
 src_libnm_platform_tests_test_nm_platform_LDADD = \
 	src/libnm-platform/libnm-platform.la \
-	shared/nm-log-core/libnm-log-core.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-log-core/libnm-log-core.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(SYSTEMD_JOURNAL_LIBS) \
@@ -617,6 +629,8 @@ src_libnm_core_aux_intern_libnm_core_aux_intern_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(builddir)/shared \
 	-I$(srcdir)/shared \
+	-I$(builddir)/src \
+	-I$(srcdir)/src \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	$(CODE_COVERAGE_CFLAGS) \
@@ -694,6 +708,8 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	-I$(srcdir)/libnm \
@@ -726,30 +742,32 @@ EXTRA_DIST += libnm/nm-libnm-aux/README.md
 ###############################################################################
 
 EXTRA_DIST += \
-	shared/nm-glib-aux/tests/meson.build \
+	src/libnm-glib-aux/tests/meson.build \
 	shared/README.md \
 	$(NULL)
 
 ###############################################################################
 
-check_programs += shared/nm-glib-aux/tests/test-shared-general
+check_programs += src/libnm-glib-aux/tests/test-shared-general
 
-shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
+src_libnm_glib_aux_tests_test_shared_general_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_glib_aux_tests_test_shared_general_LDFLAGS = \
+src_libnm_glib_aux_tests_test_shared_general_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-shared_nm_glib_aux_tests_test_shared_general_LDADD = \
-	shared/nm-glib-aux/libnm-glib-aux.la \
-	shared/nm-log-null/libnm-log-null.la \
+src_libnm_glib_aux_tests_test_shared_general_LDADD = \
+	src/libnm-glib-aux/libnm-glib-aux.la \
+	src/libnm-log-null/libnm-log-null.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -759,26 +777,28 @@ shared_nm_glib_aux_tests_test_shared_general_LDADD = \
 
 if WITH_JANSSON
 
-check_programs += shared/nm-glib-aux/tests/test-json-aux
+check_programs += src/libnm-glib-aux/tests/test-json-aux
 
-shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \
+src_libnm_glib_aux_tests_test_json_aux_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(JANSSON_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
 
-shared_nm_glib_aux_tests_test_json_aux_LDFLAGS = \
+src_libnm_glib_aux_tests_test_json_aux_LDFLAGS = \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(SANITIZER_EXEC_LDFLAGS) \
 	$(NULL)
 
-shared_nm_glib_aux_tests_test_json_aux_LDADD = \
+src_libnm_glib_aux_tests_test_json_aux_LDADD = \
 	$(JANSSON_LIBS) \
-	shared/nm-glib-aux/libnm-glib-aux.la \
-	shared/nm-log-null/libnm-log-null.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
+	src/libnm-log-null/libnm-log-null.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -1364,6 +1384,8 @@ src_libnm_core_impl_tests_cppflags = \
 	-I$(builddir)/src/libnm-core-impl/tests \
 	-I$(srcdir)/src/libnm-core-impl/tests \
 	-I$(srcdir)/src/libnm-core-impl \
+	-I$(srcdir)/src/ \
+	-I$(builddir)/src/ \
 	$(dflt_cppflags_libnm_core) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)
@@ -1393,8 +1415,8 @@ src_libnm_core_impl_tests_ldadd = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
-	shared/nm-log-null/libnm-log-null.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-log-null/libnm-log-null.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -1621,9 +1643,9 @@ libnm_libnm_static_la_LIBADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	introspection/libnmdbus.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
-	shared/nm-log-null/libnm-log-null.la \
+	src/libnm-log-null/libnm-log-null.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
@@ -1883,6 +1905,8 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	-I$(srcdir)/libnm \
@@ -2491,9 +2515,9 @@ src_core_libNetworkManager_la_LIBADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-log-core/libnm-log-core.la \
+	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
@@ -2604,9 +2628,9 @@ src_core_nm_iface_helper_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-log-core/libnm-log-core.la \
+	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
@@ -2658,12 +2682,12 @@ src_core_initrd_nm_initrd_generator_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-platform/libnm-platform.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-log-core/libnm-log-core.la \
+	src/libnm-log-core/libnm-log-core.la \
 	src/libnm-udev-aux/libnm-udev-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libndhcp4.la \
 	shared/libcsiphash.la \
@@ -2689,7 +2713,7 @@ src_core_initrd_tests_test_dt_reader_LDFLAGS = \
 src_core_initrd_tests_test_dt_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -2709,7 +2733,7 @@ src_core_initrd_tests_test_ibft_reader_LDFLAGS = \
 src_core_initrd_tests_test_ibft_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -2944,7 +2968,7 @@ src_core_initrd_tests_test_cmdline_reader_LDFLAGS = \
 src_core_initrd_tests_test_cmdline_reader_LDADD = \
 	src/core/initrd/libnmi-core.la \
 	src/core/libNetworkManagerTest.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -2973,6 +2997,8 @@ src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	$(GLIB_CFLAGS) \
 	$(NULL)
 
@@ -3033,6 +3059,8 @@ src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	$(GLIB_CFLAGS)
@@ -4400,7 +4428,7 @@ dispatcher_nm_dispatcher_LDFLAGS = \
 dispatcher_nm_dispatcher_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
 	libnm/libnm.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS)
@@ -4475,7 +4503,7 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \
 
 dispatcher_tests_test_dispatcher_envp_LDADD = \
 	dispatcher/libnm-dispatcher-core.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
@@ -4505,6 +4533,8 @@ clients_nm_online_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
+	-I$(srcdir)/src \
+	-I$(builddir)/src \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
 	-I$(srcdir)/libnm \
@@ -4520,7 +4550,7 @@ clients_nm_online_LDFLAGS = \
 clients_nm_online_LDADD = \
 	libnm/libnm.la \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -4651,7 +4681,7 @@ clients_common_tests_test_clients_common_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
@@ -4695,7 +4725,7 @@ clients_common_tests_test_libnm_core_aux_LDFLAGS = \
 clients_common_tests_test_libnm_core_aux_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
@@ -4743,7 +4773,7 @@ clients_cli_nmcli_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/nm-libnm-aux/libnm-libnm-aux.la \
@@ -4792,7 +4822,7 @@ clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
 	libnm/libnm.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
@@ -4981,7 +5011,7 @@ clients_tui_nmtui_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
@@ -5067,7 +5097,7 @@ clients_cloud_setup_nm_cloud_setup_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \
@@ -5132,7 +5162,7 @@ clients_cloud_setup_tests_test_cloud_setup_general_LDADD = \
 	src/libnm-core-aux-extern/libnm-core-aux-extern.la \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	src/libnm-base/libnm-base.la \
-	shared/nm-glib-aux/libnm-glib-aux.la \
+	src/libnm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libcsiphash.la \
 	libnm/libnm.la \

clients/cli/common.c

@@ -17,7 +17,7 @@
 
 #include "nm-vpn-helpers.h"
 #include "nm-client-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 #include "utils.h"
 

clients/cli/devices.c

@@ -12,7 +12,7 @@
 #include <readline/readline.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "common.h"
 #include "connections.h"
 #include "nm-client-utils.h"

clients/cloud-setup/nm-cloud-setup-utils.c

@@ -7,9 +7,9 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-glib-aux/nm-time-utils.h"
-#include "nm-glib-aux/nm-logging-base.h"
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-logging-base.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 /*****************************************************************************/
 

clients/cloud-setup/nm-cloud-setup-utils.h

@@ -3,7 +3,7 @@
 #ifndef __NM_CLOUD_SETUP_UTILS_H__
 #define __NM_CLOUD_SETUP_UTILS_H__
 
-#include "nm-glib-aux/nm-logging-fwd.h"
+#include "libnm-glib-aux/nm-logging-fwd.h"
 
 /*****************************************************************************/
 

clients/cloud-setup/nm-http-client.c

@@ -7,7 +7,7 @@
 #include <curl/curl.h>
 
 #include "nm-cloud-setup-utils.h"
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 #define NM_CURL_DEBUG 0
 

clients/common/nm-client-utils.c

@@ -7,8 +7,8 @@
 
 #include "nm-client-utils.h"
 
-#include "nm-glib-aux/nm-secret-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "nm-utils.h"
 #include "nm-device-bond.h"
 #include "nm-device-bridge.h"

clients/common/nm-meta-setting-base-impl.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2017 - 2018 Red Hat, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-meta-setting-base.h"
 

clients/common/nm-meta-setting-desc.c

@@ -13,8 +13,8 @@
 #include <linux/if_infiniband.h>
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
-#include "nm-glib-aux/nm-enum-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "libnm-core-aux-intern/nm-libnm-core-utils.h"
 #include "libnm-core-aux-extern/nm-libnm-core-aux.h"
 

clients/common/nm-meta-setting-desc.h

@@ -6,7 +6,7 @@
 #ifndef __NM_META_SETTING_DESC_H__
 #define __NM_META_SETTING_DESC_H__
 
-#include "nm-glib-aux/nm-obj.h"
+#include "libnm-glib-aux/nm-obj.h"
 #include "nm-meta-setting-base.h"
 #include "libnm-base/nm-ethtool-base.h"
 

clients/common/nm-polkit-listener.c

@@ -26,10 +26,10 @@
 #include <pwd.h>
 #include <fcntl.h>
 
-#include "nm-glib-aux/nm-dbus-aux.h"
-#include "nm-glib-aux/nm-str-buf.h"
-#include "nm-glib-aux/nm-secret-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-core-aux-intern/nm-auth-subject.h"
 #include "c-list/src/c-list.h"
 

clients/common/nm-secret-agent-simple.c

@@ -25,7 +25,7 @@
 
 #include "nm-vpn-service-plugin.h"
 #include "nm-vpn-helpers.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 /*****************************************************************************/
 

clients/common/nm-vpn-helpers.c

@@ -17,8 +17,8 @@
 
 #include "nm-client-utils.h"
 #include "nm-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 /*****************************************************************************/
 

libnm/nm-client.c

@@ -11,8 +11,8 @@
 #include <libudev.h>
 
 #include "nm-std-aux/c-list-util.h"
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 
 #include "nm-access-point.h"

libnm/nm-default-client.h

@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_CLIENT

libnm/nm-default-libnm.h

@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_LIBNM

libnm/nm-device-wifi-p2p.c

@@ -7,7 +7,7 @@
 
 #include "nm-device-wifi-p2p.h"
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wifi-p2p.h"
 #include "nm-utils.h"

libnm/nm-device-wifi.c

@@ -10,7 +10,7 @@
 
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"

libnm/nm-device.c

@@ -10,7 +10,7 @@
 
 #include <libudev.h>
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-device-bt.h"

libnm/nm-libnm-utils.c

@@ -8,7 +8,7 @@
 
 #include "nm-libnm-utils.h"
 
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-object.h"
 

libnm/nm-libnm-utils.h

@@ -8,8 +8,8 @@
 
 #include "c-list/src/c-list.h"
 #include "nm-device.h"
-#include "nm-glib-aux/nm-ref-string.h"
-#include "nm-glib-aux/nm-logging-fwd.h"
+#include "libnm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-logging-fwd.h"
 #include "nm-types.h"
 #include "nm-object.h"
 #include "nm-client.h"

libnm/nm-remote-connection.c

@@ -8,7 +8,7 @@
 
 #include "nm-remote-connection.h"
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"

libnm/nm-secret-agent-old.c

@@ -12,9 +12,9 @@
 #include "nm-dbus-helpers.h"
 #include "nm-dbus-interface.h"
 #include "nm-enum-types.h"
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "nm-simple-connection.h"
 
 #define REGISTER_RETRY_TIMEOUT_MSEC 3000

libnm/nm-vpn-service-plugin.c

@@ -11,8 +11,8 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"

libnm/tests/test-remote-settings-client.c

@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 
 #include "nm-test-libnm-utils.h"
 

po/POTFILES.in

@@ -85,8 +85,6 @@ libnm/nm-remote-connection.c
 libnm/nm-secret-agent-old.c
 libnm/nm-vpn-plugin-old.c
 libnm/nm-vpn-service-plugin.c
-shared/nm-glib-aux/nm-shared-utils.c
-shared/nm-log-core/nm-logging.c
 src/core/NetworkManagerUtils.c
 src/core/devices/adsl/nm-device-adsl.c
 src/core/devices/bluetooth/nm-bluez-manager.c
@@ -183,3 +181,5 @@ src/libnm-core-impl/nm-team-utils.c
 src/libnm-core-impl/nm-utils.c
 src/libnm-core-impl/nm-vpn-editor-plugin.c
 src/libnm-core-impl/nm-vpn-plugin-info.c
+src/libnm-glib-aux/nm-shared-utils.c
+src/libnm-log-core/nm-logging.c

shared/meson.build

@@ -106,70 +106,3 @@ libnm_std_aux = static_library(
   ],
   include_directories: top_inc,
 )
-
-libnm_glib_aux = static_library(
-  'nm-glib-aux',
-  sources: files(
-    'nm-glib-aux/nm-dbus-aux.c',
-    'nm-glib-aux/nm-dedup-multi.c',
-    'nm-glib-aux/nm-enum-utils.c',
-    'nm-glib-aux/nm-errno.c',
-    'nm-glib-aux/nm-hash-utils.c',
-    'nm-glib-aux/nm-io-utils.c',
-    'nm-glib-aux/nm-json-aux.c',
-    'nm-glib-aux/nm-keyfile-aux.c',
-    'nm-glib-aux/nm-logging-base.c',
-    'nm-glib-aux/nm-random-utils.c',
-    'nm-glib-aux/nm-ref-string.c',
-    'nm-glib-aux/nm-secret-utils.c',
-    'nm-glib-aux/nm-shared-utils.c',
-    'nm-glib-aux/nm-time-utils.c',
-  ),
-  dependencies: glib_nm_default_dep,
-  link_with: [
-    libc_siphash,
-    libnm_std_aux,
-  ],
-)
-
-libnm_glib_aux_dep = declare_dependency(
-  include_directories: [
-    shared_inc,
-    top_inc,
-  ],
-  dependencies: [
-    glib_nm_default_dep,
-  ],
-)
-
-libnm_glib_aux_dep_link = declare_dependency(
-  dependencies: libnm_glib_aux_dep,
-  link_with: libnm_glib_aux,
-)
-
-libnm_log_core = static_library(
-  'nm-log-core',
-  sources: 'nm-log-core/nm-logging.c',
-  dependencies: [
-    glib_nm_default_dep,
-    libsystemd_dep,
-  ],
-)
-
-libnm_log_core_dep = declare_dependency(
-  include_directories: shared_inc,
-  dependencies: [
-    libnm_glib_aux_dep_link,
-  ],
-  link_with: libnm_log_core,
-)
-
-libnm_log_null = static_library(
-  'nm-log-null',
-  sources: 'nm-log-null/nm-logging-null.c',
-  dependencies: glib_nm_default_dep,
-)
-
-if enable_tests
-  subdir('nm-glib-aux/tests')
-endif

shared/nm-utils/nm-vpn-editor-plugin-call.h

@@ -17,7 +17,7 @@
 #include <NetworkManager.h>
 
 /* we make use of other internal header files, you need those too. */
-#include "nm-glib-aux/nm-macros-internal.h"
+#include "libnm-glib-aux/nm-macros-internal.h"
 
 /*****************************************************************************/
 

src/core/NetworkManagerUtils.c

@@ -12,7 +12,7 @@
 #include <linux/pkt_sched.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-utils.h"

src/core/NetworkManagerUtils.h

@@ -8,7 +8,7 @@
 #define __NETWORKMANAGER_UTILS_H__
 
 #include "nm-core-utils.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip6-config.h"
 #include "platform/nm-platform.h"

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

@@ -12,8 +12,8 @@
 #include <gmodule.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-dbus-aux.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-dbus-manager.h"
 #include "devices/nm-device-factory.h"
 #include "devices/nm-device-bridge.h"

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

@@ -12,7 +12,7 @@
 
 #include "nm-setting-wireguard.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-device-private.h"
 #include "platform/nm-platform.h"
 #include "platform/nmp-object.h"

src/core/devices/nm-device.c

@@ -24,8 +24,8 @@
 #include <linux/if_infiniband.h>
 
 #include "nm-std-aux/unaligned.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-glib-aux/nm-random-utils.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-random-utils.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "libnm-base/nm-ethtool-base.h"

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

@@ -11,7 +11,7 @@
 
 #include "nm-std-aux/unaligned.h"
 #include "platform/nm-platform.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-utils.h"
 
 #include "systemd/nm-sd.h"

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

@@ -10,8 +10,8 @@
 #include <gmodule.h>
 #include <gio/gunixsocketaddress.h>
 
-#include "nm-glib-aux/nm-jansson.h"
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-jansson.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "nm-core-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "devices/nm-device.h"

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

@@ -15,7 +15,7 @@
 #include <teamdctl.h>
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-jansson.h"
+#include "libnm-glib-aux/nm-jansson.h"
 #include "NetworkManagerUtils.h"
 #include "devices/nm-device-private.h"
 #include "platform/nm-platform.h"

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

@@ -15,7 +15,7 @@
 #include "nm-config.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 #include "nm-iwd-manager.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-setting-8021x.h"

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

@@ -16,7 +16,7 @@
 #include "devices/nm-device-private.h"
 #include "nm-act-request.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 #include "nm-ip4-config.h"
 #include "nm-manager.h"
 #include "nm-manager.h"

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

@@ -12,8 +12,8 @@
 #include <unistd.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-ref-string.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-device-wifi-p2p.h"
 #include "nm-wifi-ap.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"

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

@@ -13,7 +13,7 @@
 #include "nm-manager.h"
 #include "nm-device-iwd.h"
 #include "nm-wifi-utils.h"
-#include "nm-glib-aux/nm-random-utils.h"
+#include "libnm-glib-aux/nm-random-utils.h"
 #include "settings/nm-settings.h"
 #include "nm-std-aux/nm-dbus-compat.h"
 

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

@@ -15,7 +15,7 @@
 #include "devices/nm-device.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 #include "nm-setting-wireless.h"
 #include "nm-utils.h"
 #include "nm-wifi-utils.h"

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

@@ -14,7 +14,7 @@
 #include "devices/nm-device.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 #include "nm-setting-wireless.h"
 #include "nm-utils.h"
 #include "nm-wifi-utils.h"

src/core/dhcp/meson.build

@@ -3,6 +3,10 @@
 executable(
   'nm-dhcp-helper',
   'nm-dhcp-helper.c',
+  include_directories: [
+    src_inc,
+    top_inc,
+  ],
   dependencies: glib_nm_default_dep,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,

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

@@ -14,8 +14,8 @@
 #include <stdlib.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-glib-aux/nm-random-utils.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-random-utils.h"
 
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"

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

@@ -12,7 +12,7 @@
 #include <net/if.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 
 #include "nm-dhcp-utils.h"
 #include "nm-ip4-config.h"

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

@@ -21,7 +21,7 @@
     #include <arpa/inet.h>
     #include <ctype.h>
 
-    #include "nm-glib-aux/nm-dedup-multi.h"
+    #include "libnm-glib-aux/nm-dedup-multi.h"
 
     #include "nm-utils.h"
     #include "nm-dhcp-dhclient-utils.h"

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

@@ -3,7 +3,7 @@
  * Copyright (C) 2007 - 2013 Red Hat, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #include <unistd.h>
 #include <stdlib.h>

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

@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-config.h"

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

@@ -13,9 +13,9 @@
 #include <ctype.h>
 #include <net/if_arp.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-std-aux/unaligned.h"
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 #include "nm-utils.h"
 #include "nm-config.h"

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

@@ -7,7 +7,7 @@
 
 #include "nm-dhcp-options.h"
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 /*****************************************************************************/
 

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

@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <net/if_arp.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-std-aux/unaligned.h"
 
 #include "nm-utils.h"

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

@@ -9,8 +9,8 @@
 #include <arpa/inet.h>
 
 #include "nm-std-aux/unaligned.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-dhcp-utils.h"

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

@@ -9,7 +9,7 @@
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 
 #include "NetworkManagerUtils.h"
 #include "dhcp/nm-dhcp-dhclient-utils.h"

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

@@ -9,7 +9,7 @@
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-utils.h"
 
 #include "dhcp/nm-dhcp-utils.h"

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

@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 #include <linux/if.h>
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "platform/nm-platform.h"
 #include "nm-utils.h"

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

@@ -16,8 +16,8 @@
 #include <sys/stat.h>
 #include <linux/if.h>
 
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "platform/nm-platform.h"
 #include "nm-utils.h"

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

@@ -8,7 +8,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "nm-initrd-generator.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "nm-config.h"
 
 /*****************************************************************************/

src/core/meson.build

@@ -20,6 +20,7 @@ core_default_dep = declare_dependency(
   include_directories: [
     src_core_inc,
     shared_inc,
+    src_inc,
     top_inc,
   ],
   dependencies: [

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

@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include <ndp.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "nm-ndisc-private.h"
 #include "NetworkManagerUtils.h"

src/core/nm-auth-manager.c

@@ -8,7 +8,7 @@
 #include "nm-auth-manager.h"
 
 #include "c-list/src/c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-errors.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"

src/core/nm-auth-utils.c

@@ -7,7 +7,7 @@
 
 #include "nm-auth-utils.h"
 
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-setting-connection.h"
 #include "libnm-core-aux-intern/nm-auth-subject.h"
 #include "nm-auth-manager.h"

src/core/nm-core-utils.c

@@ -23,10 +23,10 @@
 #include <net/ethernet.h>
 
 #include "nm-std-aux/unaligned.h"
-#include "nm-glib-aux/nm-random-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-random-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-setting-connection.h"

src/core/nm-core-utils.h

@@ -12,7 +12,7 @@
 
 #include "nm-connection.h"
 
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 
 /*****************************************************************************/
 

src/core/nm-dbus-manager.c

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 
 #include "c-list/src/c-list.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-dbus-interface.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-std-aux/nm-dbus-compat.h"

src/core/nm-default-daemon.h

@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-prog.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DAEMON
@@ -19,7 +19,7 @@
 
 #include "nm-core-types.h"
 #include "nm-types.h"
-#include "nm-log-core/nm-logging.h"
+#include "libnm-log-core/nm-logging.h"
 
 /*****************************************************************************/
 

src/core/nm-firewall-manager.c

@@ -7,7 +7,7 @@
 
 #include "nm-firewall-manager.h"
 
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "c-list/src/c-list.h"
 
 #include "NetworkManagerUtils.h"

src/core/nm-iface-helper.c

@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"

src/core/nm-ip4-config.c

@@ -12,7 +12,7 @@
 #include <resolv.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 
 #include "nm-utils.h"
 #include "platform/nmp-object.h"

src/core/nm-ip4-config.h

@@ -10,7 +10,7 @@
 
 #include "nm-setting-ip4-config.h"
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "platform/nmp-object.h"
 #include "nm-ip-config.h"
 

src/core/nm-ip6-config.c

@@ -13,7 +13,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/if.h>
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 
 #include "nm-utils.h"
 #include "platform/nmp-object.h"

src/core/nm-ip6-config.h

@@ -10,7 +10,7 @@
 
 #include "nm-setting-ip6-config.h"
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "platform/nmp-object.h"
 #include "nm-ip-config.h"
 

src/core/nm-keep-alive.c

@@ -8,7 +8,7 @@
 #include "nm-keep-alive.h"
 
 #include "settings/nm-settings-connection.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 
 /*****************************************************************************/
 

src/core/nm-l3-config-data.c

@@ -8,7 +8,7 @@
 #include <linux/if_addr.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "platform/nm-platform.h"
 #include "libnm-platform/nm-platform-utils.h"

src/core/nm-l3-config-data.h

@@ -3,7 +3,7 @@
 #ifndef __NM_L3_CONFIG_DATA_H__
 #define __NM_L3_CONFIG_DATA_H__
 
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip6-config.h"
 #include "platform/nm-platform.h"

src/core/nm-manager.c

@@ -16,7 +16,7 @@
 #include <sys/sendfile.h>
 #include <limits.h>
 
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-dbus-manager.h"

src/core/nm-netns.c

@@ -7,8 +7,8 @@
 
 #include "nm-netns.h"
 
-#include "nm-glib-aux/nm-dedup-multi.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-c-list.h"
 
 #include "NetworkManagerUtils.h"
 #include "libnm-core-intern/nm-core-internal.h"

src/core/nm-pacrunner-manager.c

@@ -15,7 +15,7 @@
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "c-list/src/c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 
 #define PACRUNNER_DBUS_SERVICE   "org.pacrunner"
 #define PACRUNNER_DBUS_INTERFACE "org.pacrunner.Manager"

src/core/nm-test-utils-core.h

@@ -347,7 +347,7 @@ nmtst_platform_ip6_routes_equal_aptr(const NMPObject *const *  a,
 
 #ifdef __NETWORKMANAGER_IP4_CONFIG_H__
 
-    #include "nm-glib-aux/nm-dedup-multi.h"
+    #include "libnm-glib-aux/nm-dedup-multi.h"
 
 static inline NMIP4Config *
 nmtst_ip4_config_new(int ifindex)
@@ -361,7 +361,7 @@ nmtst_ip4_config_new(int ifindex)
 
 #ifdef __NETWORKMANAGER_IP6_CONFIG_H__
 
-    #include "nm-glib-aux/nm-dedup-multi.h"
+    #include "libnm-glib-aux/nm-dedup-multi.h"
 
 static inline NMIP6Config *
 nmtst_ip6_config_new(int ifindex)

src/core/platform/nm-linux-platform.c

@@ -38,8 +38,8 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-setting-vlan.h"
 
-#include "nm-glib-aux/nm-secret-utils.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "libnm-platform/nm-netlink.h"
 #include "nm-core-utils.h"
 #include "nmp-object.h"
@@ -49,7 +49,7 @@
 #include "wifi/nm-wifi-utils.h"
 #include "wifi/nm-wifi-utils-wext.h"
 #include "wpan/nm-wpan-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-udev-aux/nm-udev-utils.h"
 
 /*****************************************************************************/

src/core/platform/nm-platform.c

@@ -24,9 +24,9 @@
 
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "libnm-udev-aux/nm-udev-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
 #include "libnm-platform/nm-platform-utils.h"

src/core/platform/nmp-object.c

@@ -13,7 +13,7 @@
 #include <libudev.h>
 
 #include "nm-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 #include "nm-core-utils.h"
 #include "libnm-platform/nm-platform-utils.h"

src/core/platform/nmp-object.h

@@ -8,8 +8,8 @@
 
 #include <netinet/in.h>
 
-#include "nm-glib-aux/nm-obj.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-obj.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "nm-platform.h"
 
 struct udev_device;

src/core/platform/tests/test-link.c

@@ -11,7 +11,7 @@
 #include <sys/types.h>
 #include <linux/if_tun.h>
 
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-base/nm-ethtool-base.h"
 #include "platform/nmp-object.h"
 #include "libnm-platform/nmp-netns.h"

src/core/ppp/nm-pppd-plugin.c

@@ -20,7 +20,7 @@
 #include <pppd/eui64.h>
 #include <pppd/ipv6cp.h>
 
-#include "nm-glib-aux/nm-default-glib.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #include "nm-dbus-interface.h"
 

src/core/settings/nm-secret-agent.c

@@ -10,8 +10,8 @@
 #include <sys/types.h>
 #include <pwd.h>
 
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-dbus-interface.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-core-aux-intern/nm-auth-subject.h"

src/core/settings/nm-settings-connection.c

@@ -10,7 +10,7 @@
 
 #include "c-list/src/c-list.h"
 
-#include "nm-glib-aux/nm-keyfile-aux.h"
+#include "libnm-glib-aux/nm-keyfile-aux.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-config.h"
 #include "nm-config-data.h"

src/core/settings/nm-settings.c

@@ -21,7 +21,7 @@
 #endif
 
 #include "libnm-core-aux-intern/nm-common-macros.h"
-#include "nm-glib-aux/nm-keyfile-aux.h"
+#include "libnm-glib-aux/nm-keyfile-aux.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
@@ -47,7 +47,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 
 #include "nm-std-aux/c-list-util.h"
-#include "nm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-c-list.h"
 #include "nm-dbus-object.h"
 #include "devices/nm-device-ethernet.h"
 #include "nm-settings-connection.h"

src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c

@@ -14,8 +14,8 @@
 #include <unistd.h>
 
 #include "nm-std-aux/c-list-util.h"
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "nm-std-aux/nm-dbus-compat.h"
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"

src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c

@@ -18,7 +18,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-interface.h"
 #include "nm-setting-connection.h"

src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c

@@ -15,8 +15,8 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include "nm-glib-aux/nm-enum-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "nm-manager.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"

src/core/settings/plugins/ifcfg-rh/shvar.c

@@ -16,8 +16,8 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-core-utils.h"
-#include "nm-glib-aux/nm-enum-utils.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "c-list/src/c-list.h"
 #include "nms-ifcfg-rh-utils.h"
 

src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c

@@ -17,7 +17,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"

src/core/settings/plugins/keyfile/nms-keyfile-plugin.c

@@ -14,8 +14,8 @@
 #include <sys/time.h>
 
 #include "nm-std-aux/c-list-util.h"
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 
 #include "nm-connection.h"
 #include "nm-setting.h"

src/core/settings/plugins/keyfile/nms-keyfile-utils.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "nm-utils.h"
 #include "nm-setting-wired.h"

src/core/settings/plugins/keyfile/nms-keyfile-writer.c

@@ -17,7 +17,7 @@
 #include "nms-keyfile-utils.h"
 #include "nms-keyfile-reader.h"
 
-#include "nm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-io-utils.h"
 
 /*****************************************************************************/
 

src/core/supplicant/nm-supplicant-config.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-supplicant-settings-verify.h"
 #include "nm-setting.h"

src/core/supplicant/nm-supplicant-interface.c

@@ -13,12 +13,12 @@
 
 #include "NetworkManagerUtils.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "nm-glib-aux/nm-c-list.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
 #include "nm-std-aux/nm-dbus-compat.h"
 #include "nm-supplicant-config.h"
 #include "nm-supplicant-manager.h"
-#include "shared/nm-glib-aux/nm-dbus-aux.h"
 
 #define DBUS_TIMEOUT_MSEC 20000
 

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

@@ -10,8 +10,8 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-dbus-manager.h"
-#include "nm-glib-aux/nm-dbus-aux.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-dbus-aux.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 #include "nm-supplicant-interface.h"
 #include "nm-supplicant-types.h"
 #include "platform/nm-platform.h"

src/libnm-base/nm-ethtool-base.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-ethtool-base.h"