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

179 files changed, 308 insertions, 279 deletions

diff --git a/clients/cli/common.c b/clients/cli/common.c
index 934ff70ef0..9414a81299 100644
--- a/clients/cli/common.c
+++ b/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"
 
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index eea82653c0..baee44d250 100644
--- a/clients/cli/devices.c
+++ b/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"
diff --git a/clients/cloud-setup/nm-cloud-setup-utils.c b/clients/cloud-setup/nm-cloud-setup-utils.c
index f5550a1286..1eb644a7f0 100644
--- a/clients/cloud-setup/nm-cloud-setup-utils.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/clients/cloud-setup/nm-cloud-setup-utils.h b/clients/cloud-setup/nm-cloud-setup-utils.h
index 52edd27994..d863170160 100644
--- a/clients/cloud-setup/nm-cloud-setup-utils.h
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/clients/cloud-setup/nm-http-client.c b/clients/cloud-setup/nm-http-client.c
index 144513fce5..a2f24059c8 100644
--- a/clients/cloud-setup/nm-http-client.c
+++ b/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
 
diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c
index 0e1a6bf5cf..db0ddec242 100644
--- a/clients/common/nm-client-utils.c
+++ b/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"
diff --git a/clients/common/nm-meta-setting-base-impl.c b/clients/common/nm-meta-setting-base-impl.c
index 523c0d5db3..da85e5683b 100644
--- a/clients/common/nm-meta-setting-base-impl.c
+++ b/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"
 
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index c0d086e433..233626b879 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/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"
 
diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h
index 0cfe68e757..29416dcbf8 100644
--- a/clients/common/nm-meta-setting-desc.h
+++ b/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"
 
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index c83aa128bb..b0e200757a 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/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"
 
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 1857432538..04f43885e9 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index 15c47c3ecc..4038ca7b21 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index a2d953cee0..83eb9b8de9 100644
--- a/libnm/nm-client.c
+++ b/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"
diff --git a/libnm/nm-default-client.h b/libnm/nm-default-client.h
index b5d1a6d318..a770ae567d 100644
--- a/libnm/nm-default-client.h
+++ b/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
diff --git a/libnm/nm-default-libnm.h b/libnm/nm-default-libnm.h
index 799547bc84..5b3a8e5179 100644
--- a/libnm/nm-default-libnm.h
+++ b/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
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index d946977383..adc86a8d0d 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/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"
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 76a6e824ab..55951ba47d 100644
--- a/libnm/nm-device-wifi.c
+++ b/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"
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 9222b897a2..f825f84532 100644
--- a/libnm/nm-device.c
+++ b/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"
diff --git a/libnm/nm-libnm-utils.c b/libnm/nm-libnm-utils.c
index 02abd560c6..27ff704136 100644
--- a/libnm/nm-libnm-utils.c
+++ b/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"
 
diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h
index 7b9f0e6b83..3fd3b679e8 100644
--- a/libnm/nm-libnm-utils.h
+++ b/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"
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 8ad1e51c72..b2686010de 100644
--- a/libnm/nm-remote-connection.c
+++ b/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"
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 771706610d..54caa8631d 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/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
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index f89ea4ce7f..a3da796fb7 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/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"
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 0e7b744d52..93df340922 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/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"
 
diff --git a/shared/meson.build b/shared/meson.build
index fb9d8d38cb..a3c62abfcb 100644
--- a/shared/meson.build
+++ b/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
diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h
index 5772b843ab..be0a6772e2 100644
--- a/shared/nm-utils/nm-vpn-editor-plugin-call.h
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index 1b44c68134..bb72aaf8d7 100644
--- a/src/core/NetworkManagerUtils.c
+++ b/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"
diff --git a/src/core/NetworkManagerUtils.h b/src/core/NetworkManagerUtils.h
index 2afb5a3ecc..28b0531ac0 100644
--- a/src/core/NetworkManagerUtils.h
+++ b/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"
diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c
index fe0350c7f9..3f10d80bba 100644
--- a/src/core/devices/bluetooth/nm-bluez-manager.c
+++ b/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"
diff --git a/src/core/devices/nm-device-wireguard.c b/src/core/devices/nm-device-wireguard.c
index f9bd8ad8f8..4ad75d1db5 100644
--- a/src/core/devices/nm-device-wireguard.c
+++ b/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"
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index b1418e24ac..3d4e58a958 100644
--- a/src/core/devices/nm-device.c
+++ b/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"
diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index c60fb3ada6..9ce1781a9c 100644
--- a/src/core/devices/nm-lldp-listener.c
+++ b/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"
diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index 0aa613bd75..b8d5311a7a 100644
--- a/src/core/devices/ovs/nm-ovsdb.c
+++ b/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"
diff --git a/src/core/devices/team/nm-device-team.c b/src/core/devices/team/nm-device-team.c
index e6e230eed1..5559bd1ef4 100644
--- a/src/core/devices/team/nm-device-team.c
+++ b/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"
diff --git a/src/core/devices/wifi/nm-device-iwd.c b/src/core/devices/wifi/nm-device-iwd.c
index dc5bc54a10..d9c4f797b9 100644
--- a/src/core/devices/wifi/nm-device-iwd.c
+++ b/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"
diff --git a/src/core/devices/wifi/nm-device-wifi-p2p.c b/src/core/devices/wifi/nm-device-wifi-p2p.c
index 74eba64c39..0a0955deda 100644
--- a/src/core/devices/wifi/nm-device-wifi-p2p.c
+++ b/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"
diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index 3f55d9f15f..19d340a3af 100644
--- a/src/core/devices/wifi/nm-device-wifi.c
+++ b/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"
diff --git a/src/core/devices/wifi/nm-iwd-manager.c b/src/core/devices/wifi/nm-iwd-manager.c
index b0b208ac52..71da3bdfd2 100644
--- a/src/core/devices/wifi/nm-iwd-manager.c
+++ b/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"
 
diff --git a/src/core/devices/wifi/nm-wifi-ap.c b/src/core/devices/wifi/nm-wifi-ap.c
index 7d39e913d5..e07ea0afe4 100644
--- a/src/core/devices/wifi/nm-wifi-ap.c
+++ b/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"
diff --git a/src/core/devices/wifi/nm-wifi-p2p-peer.c b/src/core/devices/wifi/nm-wifi-p2p-peer.c
index 40532bb142..6b04204cb1 100644
--- a/src/core/devices/wifi/nm-wifi-p2p-peer.c
+++ b/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"
diff --git a/src/core/dhcp/meson.build b/src/core/dhcp/meson.build
index 6743568ea6..1788f864dc 100644
--- a/src/core/dhcp/meson.build
+++ b/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,
diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c
index c38c814ead..1b5aa1060e 100644
--- a/src/core/dhcp/nm-dhcp-client.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-dhclient-utils.c b/src/core/dhcp/nm-dhcp-dhclient-utils.c
index ad1e097f39..59682fb5ae 100644
--- a/src/core/dhcp/nm-dhcp-dhclient-utils.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c
index c42a0ba53e..6384f3920c 100644
--- a/src/core/dhcp/nm-dhcp-dhclient.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-helper.c b/src/core/dhcp/nm-dhcp-helper.c
index 0f98add127..c81d1a4815 100644
--- a/src/core/dhcp/nm-dhcp-helper.c
+++ b/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>
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index aeaac63571..9be32e014c 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index 783d0be2cd..044223fb96 100644
--- a/src/core/dhcp/nm-dhcp-nettools.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-options.c b/src/core/dhcp/nm-dhcp-options.c
index 3537cd147e..8f0d7408a9 100644
--- a/src/core/dhcp/nm-dhcp-options.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/dhcp/nm-dhcp-systemd.c b/src/core/dhcp/nm-dhcp-systemd.c
index b92a9073fa..2d0af1ca3a 100644
--- a/src/core/dhcp/nm-dhcp-systemd.c
+++ b/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"
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index 26de6d6276..9b72998b6a 100644
--- a/src/core/dhcp/nm-dhcp-utils.c
+++ b/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"
diff --git a/src/core/dhcp/tests/test-dhcp-dhclient.c b/src/core/dhcp/tests/test-dhcp-dhclient.c
index 77626f6962..24ea9a448f 100644
--- a/src/core/dhcp/tests/test-dhcp-dhclient.c
+++ b/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"
diff --git a/src/core/dhcp/tests/test-dhcp-utils.c b/src/core/dhcp/tests/test-dhcp-utils.c
index 9b54e2cd02..9fd224e339 100644
--- a/src/core/dhcp/tests/test-dhcp-utils.c
+++ b/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"
diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
index 7ecd785f5f..6ef9f924ee 100644
--- a/src/core/dns/nm-dns-dnsmasq.c
+++ b/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"
diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c
index bbf212b135..4be77c8c92 100644
--- a/src/core/dns/nm-dns-systemd-resolved.c
+++ b/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"
diff --git a/src/core/initrd/nm-initrd-generator.c b/src/core/initrd/nm-initrd-generator.c
index f9756df29b..9d4e3656e2 100644
--- a/src/core/initrd/nm-initrd-generator.c
+++ b/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"
 
 /*****************************************************************************/
diff --git a/src/core/meson.build b/src/core/meson.build
index b466771eb0..2208209c58 100644
--- a/src/core/meson.build
+++ b/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: [
diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index 00f666c12b..8b63f92c91 100644
--- a/src/core/ndisc/nm-lndp-ndisc.c
+++ b/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"
diff --git a/src/core/nm-auth-manager.c b/src/core/nm-auth-manager.c
index 4a7542ccfe..5c0e465aff 100644
--- a/src/core/nm-auth-manager.c
+++ b/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"
diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c
index 96c48cc336..006264dd28 100644
--- a/src/core/nm-auth-utils.c
+++ b/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"
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index 49dd1af64b..13c095d98b 100644
--- a/src/core/nm-core-utils.c
+++ b/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"
diff --git a/src/core/nm-core-utils.h b/src/core/nm-core-utils.h
index 5dc4d43202..01d8322568 100644
--- a/src/core/nm-core-utils.h
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/nm-dbus-manager.c b/src/core/nm-dbus-manager.c
index cae2d71344..d52023fb15 100644
--- a/src/core/nm-dbus-manager.c
+++ b/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"
diff --git a/src/core/nm-default-daemon.h b/src/core/nm-default-daemon.h
index 65ca4b5428..57d4c6afd8 100644
--- a/src/core/nm-default-daemon.h
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/nm-firewall-manager.c b/src/core/nm-firewall-manager.c
index 8f476e511a..8094261f19 100644
--- a/src/core/nm-firewall-manager.c
+++ b/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"
diff --git a/src/core/nm-iface-helper.c b/src/core/nm-iface-helper.c
index 8b3fb959f6..9dfee8d9e7 100644
--- a/src/core/nm-iface-helper.c
+++ b/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"
diff --git a/src/core/nm-ip4-config.c b/src/core/nm-ip4-config.c
index 23cb2b06b9..575d2876f3 100644
--- a/src/core/nm-ip4-config.c
+++ b/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"
diff --git a/src/core/nm-ip4-config.h b/src/core/nm-ip4-config.h
index a795e152ca..1196a724cd 100644
--- a/src/core/nm-ip4-config.h
+++ b/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"
 
diff --git a/src/core/nm-ip6-config.c b/src/core/nm-ip6-config.c
index e085edb68e..5501e02f5f 100644
--- a/src/core/nm-ip6-config.c
+++ b/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"
diff --git a/src/core/nm-ip6-config.h b/src/core/nm-ip6-config.h
index 398186da79..7cc00a83f3 100644
--- a/src/core/nm-ip6-config.h
+++ b/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"
 
diff --git a/src/core/nm-keep-alive.c b/src/core/nm-keep-alive.c
index 197e30eaf4..6275544ca7 100644
--- a/src/core/nm-keep-alive.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 9ce20d2377..cce7364cd4 100644
--- a/src/core/nm-l3-config-data.c
+++ b/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"
diff --git a/src/core/nm-l3-config-data.h b/src/core/nm-l3-config-data.h
index b3d9cd32ec..f89095f9b9 100644
--- a/src/core/nm-l3-config-data.h
+++ b/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"
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 8d2e8a8fe1..c9c040d668 100644
--- a/src/core/nm-manager.c
+++ b/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"
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index 8e3a984a25..17ba5d6453 100644
--- a/src/core/nm-netns.c
+++ b/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"
diff --git a/src/core/nm-pacrunner-manager.c b/src/core/nm-pacrunner-manager.c
index b58aef0649..492580a071 100644
--- a/src/core/nm-pacrunner-manager.c
+++ b/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"
diff --git a/src/core/nm-test-utils-core.h b/src/core/nm-test-utils-core.h
index a765e1a3c2..f145904ef7 100644
--- a/src/core/nm-test-utils-core.h
+++ b/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)
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index ef5a54a16a..cae13d60de 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/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"
 
 /*****************************************************************************/
diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c
index 68c5db149e..3a76a1e5a6 100644
--- a/src/core/platform/nm-platform.c
+++ b/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"
diff --git a/src/core/platform/nmp-object.c b/src/core/platform/nmp-object.c
index 174e016824..49a8f5987b 100644
--- a/src/core/platform/nmp-object.c
+++ b/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"
diff --git a/src/core/platform/nmp-object.h b/src/core/platform/nmp-object.h
index 19f6bcd7ba..14cf1e3f09 100644
--- a/src/core/platform/nmp-object.h
+++ b/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;
diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 79437a09c6..d1ca405f97 100644
--- a/src/core/platform/tests/test-link.c
+++ b/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"
diff --git a/src/core/ppp/nm-pppd-plugin.c b/src/core/ppp/nm-pppd-plugin.c
index c9016dac54..13c4e512df 100644
--- a/src/core/ppp/nm-pppd-plugin.c
+++ b/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"
 
diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c
index b0d71886b4..5493984b7b 100644
--- a/src/core/settings/nm-secret-agent.c
+++ b/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"
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index 0f0beef068..6f400f7e85 100644
--- a/src/core/settings/nm-settings-connection.c
+++ b/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"
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c
index 858df29883..6d7ea6a65a 100644
--- a/src/core/settings/nm-settings.c
+++ b/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"
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index 2cc1d373de..bfe2f40380 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -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"
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index f02f33d3f2..cbe363de02 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -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"
diff --git a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 70147a9cd7..b513c98388 100644
--- a/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/core/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -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"
diff --git a/src/core/settings/plugins/ifcfg-rh/shvar.c b/src/core/settings/plugins/ifcfg-rh/shvar.c
index dc26da759c..c6099dd173 100644
--- a/src/core/settings/plugins/ifcfg-rh/shvar.c
+++ b/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"
 
diff --git a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index c6ad8874d0..ad96d0c4be 100644
--- a/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -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"
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index 902270158a..27a219d8e8 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/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"
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
index 4b69dc79aa..c26b8676f1 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/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"
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c b/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
index 0dae91ae76..661a828058 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/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"
 
 /*****************************************************************************/
 
diff --git a/src/core/supplicant/nm-supplicant-config.c b/src/core/supplicant/nm-supplicant-config.c
index 1f27ab80dd..4dc029aa3f 100644
--- a/src/core/supplicant/nm-supplicant-config.c
+++ b/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"
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index 176e4d2f61..8e284f1774 100644
--- a/src/core/supplicant/nm-supplicant-interface.c
+++ b/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
 
diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index d4806161e8..c7401ff07c 100644
--- a/src/core/supplicant/nm-supplicant-manager.c
+++ b/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"
diff --git a/src/libnm-base/nm-ethtool-base.c b/src/libnm-base/nm-ethtool-base.c
index 52ff28714a..03cbf56007 100644
--- a/src/libnm-base/nm-ethtool-base.c
+++ b/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"
 
diff --git a/src/libnm-core-aux-extern/nm-libnm-core-aux.c b/src/libnm-core-aux-extern/nm-libnm-core-aux.c
index 8f3bbef0b9..6c45ecf728 100644
--- a/src/libnm-core-aux-extern/nm-libnm-core-aux.c
+++ b/src/libnm-core-aux-extern/nm-libnm-core-aux.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2019 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-libnm-core-aux.h"
 
diff --git a/src/libnm-core-aux-intern/nm-auth-subject.c b/src/libnm-core-aux-intern/nm-auth-subject.c
index 2862356052..536b4e474d 100644
--- a/src/libnm-core-aux-intern/nm-auth-subject.c
+++ b/src/libnm-core-aux-intern/nm-auth-subject.c
@@ -11,7 +11,7 @@
  * makes requests, like process identifier and user UID.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-auth-subject.h"
 
diff --git a/src/libnm-core-aux-intern/nm-libnm-core-utils.c b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
index e3d7b7b183..87dc1e9ebd 100644
--- a/src/libnm-core-aux-intern/nm-libnm-core-utils.c
+++ b/src/libnm-core-aux-intern/nm-libnm-core-utils.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-libnm-core-utils.h"
 
diff --git a/src/libnm-core-impl/nm-crypto-gnutls.c b/src/libnm-core-impl/nm-crypto-gnutls.c
index 0f6da6175e..db4be8a721 100644
--- a/src/libnm-core-impl/nm-crypto-gnutls.c
+++ b/src/libnm-core-impl/nm-crypto-gnutls.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2015 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-crypto-impl.h"
 
@@ -13,7 +13,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-errors.h"
 
 /*****************************************************************************/
diff --git a/src/libnm-core-impl/nm-crypto-nss.c b/src/libnm-core-impl/nm-crypto-nss.c
index 24a53f5dfe..6f4322813a 100644
--- a/src/libnm-core-impl/nm-crypto-nss.c
+++ b/src/libnm-core-impl/nm-crypto-nss.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2007 - 2009 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-crypto-impl.h"
 
@@ -20,7 +20,7 @@ NM_PRAGMA_WARNING_DISABLE("-Wstrict-prototypes")
 #include <p12plcy.h>
 NM_PRAGMA_WARNING_REENABLE
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-errors.h"
 
 /*****************************************************************************/
diff --git a/src/libnm-core-impl/nm-crypto.c b/src/libnm-core-impl/nm-crypto.c
index 46888d45b8..d84a2b100d 100644
--- a/src/libnm-core-impl/nm-crypto.c
+++ b/src/libnm-core-impl/nm-crypto.c
@@ -12,8 +12,8 @@
 #include <unistd.h>
 #include <stdlib.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-crypto-impl.h"
 #include "nm-utils.h"
diff --git a/src/libnm-core-impl/nm-default-libnm-core.h b/src/libnm-core-impl/nm-default-libnm-core.h
index 6eb84b947a..0f27f82d52 100644
--- a/src/libnm-core-impl/nm-default-libnm-core.h
+++ b/src/libnm-core-impl/nm-default-libnm-core.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_CORE
diff --git a/src/libnm-core-impl/nm-keyfile-utils.c b/src/libnm-core-impl/nm-keyfile-utils.c
index 6e1a255314..9c4a981ae5 100644
--- a/src/libnm-core-impl/nm-keyfile-utils.c
+++ b/src/libnm-core-impl/nm-keyfile-utils.c
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 
 #include "nm-keyfile.h"
 #include "nm-setting-wired.h"
diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c
index f15e004f61..1de18180a3 100644
--- a/src/libnm-core-impl/nm-keyfile.c
+++ b/src/libnm-core-impl/nm-keyfile.c
@@ -18,8 +18,8 @@
 #include <linux/if_ether.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 
diff --git a/src/libnm-core-impl/nm-meta-setting-base-impl.c b/src/libnm-core-impl/nm-meta-setting-base-impl.c
index 523c0d5db3..da85e5683b 100644
--- a/src/libnm-core-impl/nm-meta-setting-base-impl.c
+++ b/src/libnm-core-impl/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"
 
diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c
index 96935b5f08..39afa3aaeb 100644
--- a/src/libnm-core-impl/nm-setting-8021x.c
+++ b/src/libnm-core-impl/nm-setting-8021x.c
@@ -8,7 +8,7 @@
 
 #include "nm-setting-8021x.h"
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-crypto.h"
 #include "nm-utils-private.h"
diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c
index 95ae5bfbcc..202a8791ed 100644
--- a/src/libnm-core-impl/nm-setting-bridge.c
+++ b/src/libnm-core-impl/nm-setting-bridge.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <linux/if_ether.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
index d55ebbf78f..0c3d75d0bc 100644
--- a/src/libnm-core-impl/nm-setting-ip-config.c
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
@@ -11,7 +11,7 @@
 #include <arpa/inet.h>
 #include <linux/fib_rules.h>
 
-#include "nm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-str-buf.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-utils.h"
diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c
index e2a87ffc18..f9a3a7818c 100644
--- a/src/libnm-core-impl/nm-setting-macsec.c
+++ b/src/libnm-core-impl/nm-setting-macsec.c
@@ -9,7 +9,7 @@
 
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-types-internal.h"
diff --git a/src/libnm-core-impl/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c
index 19aafd4f19..ce6e73f5b4 100644
--- a/src/libnm-core-impl/nm-setting-vpn.c
+++ b/src/libnm-core-impl/nm-setting-vpn.c
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
diff --git a/src/libnm-core-impl/nm-setting-wireguard.c b/src/libnm-core-impl/nm-setting-wireguard.c
index ea723a5b2e..644b36d698 100644
--- a/src/libnm-core-impl/nm-setting-wireguard.c
+++ b/src/libnm-core-impl/nm-setting-wireguard.c
@@ -10,7 +10,7 @@
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 #include "nm-connection-private.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-core-impl/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c
index f5bbe185f3..6104aea575 100644
--- a/src/libnm-core-impl/nm-setting-wireless-security.c
+++ b/src/libnm-core-impl/nm-setting-wireless-security.c
@@ -13,7 +13,7 @@
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-setting-wireless.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 
 /**
  * SECTION:nm-setting-wireless-security
diff --git a/src/libnm-core-impl/nm-team-utils.c b/src/libnm-core-impl/nm-team-utils.c
index 9546ababfd..88983d0b64 100644
--- a/src/libnm-core-impl/nm-team-utils.c
+++ b/src/libnm-core-impl/nm-team-utils.c
@@ -11,7 +11,7 @@
 
 #include "nm-errors.h"
 #include "nm-utils-private.h"
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-setting-team.h"
 #include "nm-setting-team-port.h"
diff --git a/src/libnm-core-impl/nm-team-utils.h b/src/libnm-core-impl/nm-team-utils.h
index 1488eb9da5..2039c16ec7 100644
--- a/src/libnm-core-impl/nm-team-utils.h
+++ b/src/libnm-core-impl/nm-team-utils.h
@@ -10,7 +10,7 @@
     #error Cannot use this header.
 #endif
 
-#include "nm-glib-aux/nm-value-type.h"
+#include "libnm-glib-aux/nm-value-type.h"
 #include "libnm-core-intern/nm-core-internal.h"
 
 struct _NMSetting;
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index 7a1789caef..b493b06f50 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -18,11 +18,11 @@
 #include <linux/pkt_sched.h>
 #include <linux/if_infiniband.h>
 
-#include "nm-glib-aux/nm-json-aux.h"
-#include "nm-glib-aux/nm-str-buf.h"
-#include "nm-glib-aux/nm-enum-utils.h"
-#include "nm-glib-aux/nm-time-utils.h"
-#include "nm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index dc9945f8a3..5f43695eee 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -14,9 +14,9 @@
 #include <linux/if_infiniband.h>
 
 #include "nm-std-aux/c-list-util.h"
-#include "nm-glib-aux/nm-enum-utils.h"
-#include "nm-glib-aux/nm-str-buf.h"
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-enum-utils.h"
+#include "libnm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 #include "libnm-base/nm-base.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
@@ -58,7 +58,7 @@
 #include "nm-setting-wpan.h"
 #include "nm-simple-connection.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
-#include "nm-glib-aux/nm-dedup-multi.h"
+#include "libnm-glib-aux/nm-dedup-multi.h"
 #include "libnm-base/nm-ethtool-base.h"
 #include "libnm-base/nm-ethtool-utils-base.h"
 
diff --git a/src/libnm-core-impl/tests/test-keyfile.c b/src/libnm-core-impl/tests/test-keyfile.c
index 755a40ae29..3b1ee09155 100644
--- a/src/libnm-core-impl/tests/test-keyfile.c
+++ b/src/libnm-core-impl/tests/test-keyfile.c
@@ -5,7 +5,7 @@
 
 #include "libnm-core-impl/nm-default-libnm-core.h"
 
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 #include "libnm-core-intern/nm-keyfile-utils.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 #include "nm-simple-connection.h"
diff --git a/src/libnm-core-impl/tests/test-setting.c b/src/libnm-core-impl/tests/test-setting.c
index 6188a2d4d2..0b622ec877 100644
--- a/src/libnm-core-impl/tests/test-setting.c
+++ b/src/libnm-core-impl/tests/test-setting.c
@@ -8,7 +8,7 @@
 #include <linux/pkt_sched.h>
 #include <net/if.h>
 
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 #include "libnm-base/nm-ethtool-utils-base.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-utils.h"
diff --git a/src/libnm-core-intern/nm-keyfile-utils.h b/src/libnm-core-intern/nm-keyfile-utils.h
index 1555c11244..450cc81cd9 100644
--- a/src/libnm-core-intern/nm-keyfile-utils.h
+++ b/src/libnm-core-intern/nm-keyfile-utils.h
@@ -12,7 +12,7 @@
 
 /*****************************************************************************/
 
-#include "nm-glib-aux/nm-shared-utils.h"
+#include "libnm-glib-aux/nm-shared-utils.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-glib-aux/meson.build b/src/libnm-glib-aux/meson.build
new file mode 100644
index 0000000000..3a601dcb57
--- /dev/null
+++ b/src/libnm-glib-aux/meson.build
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_glib_aux = static_library(
+  'nm-glib-aux',
+  sources: files(
+    'nm-dbus-aux.c',
+    'nm-dedup-multi.c',
+    'nm-enum-utils.c',
+    'nm-errno.c',
+    'nm-hash-utils.c',
+    'nm-io-utils.c',
+    'nm-json-aux.c',
+    'nm-keyfile-aux.c',
+    'nm-logging-base.c',
+    'nm-random-utils.c',
+    'nm-ref-string.c',
+    'nm-secret-utils.c',
+    'nm-shared-utils.c',
+    'nm-time-utils.c',
+  ),
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
+  dependencies: glib_nm_default_dep,
+  link_with: [
+    libc_siphash,
+    libnm_std_aux,
+  ],
+)
+
+libnm_glib_aux_dep = declare_dependency(
+  include_directories: [
+    shared_inc,
+    src_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,
+)
diff --git a/shared/nm-glib-aux/nm-c-list.h b/src/libnm-glib-aux/nm-c-list.h
index 6dd3ac720f..6dd3ac720f 100644
--- a/shared/nm-glib-aux/nm-c-list.h
+++ b/src/libnm-glib-aux/nm-c-list.h
diff --git a/shared/nm-glib-aux/nm-dbus-aux.c b/src/libnm-glib-aux/nm-dbus-aux.c
index ec409ff1fa..48864a0c41 100644
--- a/shared/nm-glib-aux/nm-dbus-aux.c
+++ b/src/libnm-glib-aux/nm-dbus-aux.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2019 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-dbus-aux.h"
 
diff --git a/shared/nm-glib-aux/nm-dbus-aux.h b/src/libnm-glib-aux/nm-dbus-aux.h
index 4e3ae22d82..4e3ae22d82 100644
--- a/shared/nm-glib-aux/nm-dbus-aux.h
+++ b/src/libnm-glib-aux/nm-dbus-aux.h
diff --git a/shared/nm-glib-aux/nm-dedup-multi.c b/src/libnm-glib-aux/nm-dedup-multi.c
index 99da3b3502..f77bb3cd7f 100644
--- a/shared/nm-glib-aux/nm-dedup-multi.c
+++ b/src/libnm-glib-aux/nm-dedup-multi.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 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-dedup-multi.h"
 
diff --git a/shared/nm-glib-aux/nm-dedup-multi.h b/src/libnm-glib-aux/nm-dedup-multi.h
index 1c0761bf1e..1c0761bf1e 100644
--- a/shared/nm-glib-aux/nm-dedup-multi.h
+++ b/src/libnm-glib-aux/nm-dedup-multi.h
diff --git a/shared/nm-glib-aux/nm-default-glib-i18n-lib.h b/src/libnm-glib-aux/nm-default-glib-i18n-lib.h
index 9393d1921e..4b04da9e46 100644
--- a/shared/nm-glib-aux/nm-default-glib-i18n-lib.h
+++ b/src/libnm-glib-aux/nm-default-glib-i18n-lib.h
@@ -10,7 +10,7 @@
 
 #define _NETWORKMANAGER_COMPILATION_GLIB_I18N_LIB
 
-#include "nm-glib-aux/nm-default-glib.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION \
diff --git a/shared/nm-glib-aux/nm-default-glib-i18n-prog.h b/src/libnm-glib-aux/nm-default-glib-i18n-prog.h
index 0abe807b9d..ebd31f966e 100644
--- a/shared/nm-glib-aux/nm-default-glib-i18n-prog.h
+++ b/src/libnm-glib-aux/nm-default-glib-i18n-prog.h
@@ -10,7 +10,7 @@
 
 #define _NETWORKMANAGER_COMPILATION_GLIB_I18N_PROG
 
-#include "nm-glib-aux/nm-default-glib.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION \
diff --git a/shared/nm-glib-aux/nm-default-glib.h b/src/libnm-glib-aux/nm-default-glib.h
index 34b23f7761..001be170fb 100644
--- a/shared/nm-glib-aux/nm-default-glib.h
+++ b/src/libnm-glib-aux/nm-default-glib.h
@@ -65,10 +65,10 @@
 
 #include "nm-std-aux/nm-std-aux.h"
 #include "nm-std-aux/nm-std-utils.h"
-#include "nm-glib-aux/nm-macros-internal.h"
-#include "nm-glib-aux/nm-shared-utils.h"
-#include "nm-glib-aux/nm-errno.h"
-#include "nm-glib-aux/nm-hash-utils.h"
+#include "libnm-glib-aux/nm-macros-internal.h"
+#include "libnm-glib-aux/nm-shared-utils.h"
+#include "libnm-glib-aux/nm-errno.h"
+#include "libnm-glib-aux/nm-hash-utils.h"
 
 /*****************************************************************************/
 
diff --git a/shared/nm-glib-aux/nm-enum-utils.c b/src/libnm-glib-aux/nm-enum-utils.c
index b06f2bb2fb..f97cdfcbb5 100644
--- a/shared/nm-glib-aux/nm-enum-utils.c
+++ b/src/libnm-glib-aux/nm-enum-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 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-enum-utils.h"
 #include "nm-str-buf.h"
diff --git a/shared/nm-glib-aux/nm-enum-utils.h b/src/libnm-glib-aux/nm-enum-utils.h
index 89be54e77f..89be54e77f 100644
--- a/shared/nm-glib-aux/nm-enum-utils.h
+++ b/src/libnm-glib-aux/nm-enum-utils.h
diff --git a/shared/nm-glib-aux/nm-errno.c b/src/libnm-glib-aux/nm-errno.c
index 668606cacd..283173e328 100644
--- a/shared/nm-glib-aux/nm-errno.c
+++ b/src/libnm-glib-aux/nm-errno.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-errno.h"
 
diff --git a/shared/nm-glib-aux/nm-errno.h b/src/libnm-glib-aux/nm-errno.h
index 62c8379f83..62c8379f83 100644
--- a/shared/nm-glib-aux/nm-errno.h
+++ b/src/libnm-glib-aux/nm-errno.h
diff --git a/shared/nm-glib-aux/nm-gassert-patch.h b/src/libnm-glib-aux/nm-gassert-patch.h
index bac8697c0e..bac8697c0e 100644
--- a/shared/nm-glib-aux/nm-gassert-patch.h
+++ b/src/libnm-glib-aux/nm-gassert-patch.h
diff --git a/shared/nm-glib-aux/nm-glib.h b/src/libnm-glib-aux/nm-glib.h
index befb8d9013..befb8d9013 100644
--- a/shared/nm-glib-aux/nm-glib.h
+++ b/src/libnm-glib-aux/nm-glib.h
diff --git a/shared/nm-glib-aux/nm-hash-utils.c b/src/libnm-glib-aux/nm-hash-utils.c
index 29349b1d0d..9e168dccc7 100644
--- a/shared/nm-glib-aux/nm-hash-utils.c
+++ b/src/libnm-glib-aux/nm-hash-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 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-hash-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-hash-utils.h b/src/libnm-glib-aux/nm-hash-utils.h
index a7b8677bf5..a7b8677bf5 100644
--- a/shared/nm-glib-aux/nm-hash-utils.h
+++ b/src/libnm-glib-aux/nm-hash-utils.h
diff --git a/shared/nm-glib-aux/nm-io-utils.c b/src/libnm-glib-aux/nm-io-utils.c
index 429591ad22..e02049af1a 100644
--- a/shared/nm-glib-aux/nm-io-utils.c
+++ b/src/libnm-glib-aux/nm-io-utils.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-io-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-io-utils.h b/src/libnm-glib-aux/nm-io-utils.h
index 8182f5cf60..8182f5cf60 100644
--- a/shared/nm-glib-aux/nm-io-utils.h
+++ b/src/libnm-glib-aux/nm-io-utils.h
diff --git a/shared/nm-glib-aux/nm-jansson.h b/src/libnm-glib-aux/nm-jansson.h
index 6173a7ac61..6173a7ac61 100644
--- a/shared/nm-glib-aux/nm-jansson.h
+++ b/src/libnm-glib-aux/nm-jansson.h
diff --git a/shared/nm-glib-aux/nm-json-aux.c b/src/libnm-glib-aux/nm-json-aux.c
index 97ee606fe0..dc67d6d593 100644
--- a/shared/nm-glib-aux/nm-json-aux.c
+++ b/src/libnm-glib-aux/nm-json-aux.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 - 2019 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-json-aux.h"
 
diff --git a/shared/nm-glib-aux/nm-json-aux.h b/src/libnm-glib-aux/nm-json-aux.h
index 99759a8d27..99759a8d27 100644
--- a/shared/nm-glib-aux/nm-json-aux.h
+++ b/src/libnm-glib-aux/nm-json-aux.h
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.c b/src/libnm-glib-aux/nm-keyfile-aux.c
index b59627128f..75abe53848 100644
--- a/shared/nm-glib-aux/nm-keyfile-aux.c
+++ b/src/libnm-glib-aux/nm-keyfile-aux.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2019 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-keyfile-aux.h"
 
diff --git a/shared/nm-glib-aux/nm-keyfile-aux.h b/src/libnm-glib-aux/nm-keyfile-aux.h
index 72d2f418f9..72d2f418f9 100644
--- a/shared/nm-glib-aux/nm-keyfile-aux.h
+++ b/src/libnm-glib-aux/nm-keyfile-aux.h
diff --git a/shared/nm-glib-aux/nm-logging-base.c b/src/libnm-glib-aux/nm-logging-base.c
index 66b591b21e..24d97adc8d 100644
--- a/shared/nm-glib-aux/nm-logging-base.c
+++ b/src/libnm-glib-aux/nm-logging-base.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-logging-base.h"
 
diff --git a/shared/nm-glib-aux/nm-logging-base.h b/src/libnm-glib-aux/nm-logging-base.h
index d9ac03c796..d9ac03c796 100644
--- a/shared/nm-glib-aux/nm-logging-base.h
+++ b/src/libnm-glib-aux/nm-logging-base.h
diff --git a/shared/nm-glib-aux/nm-logging-fwd.h b/src/libnm-glib-aux/nm-logging-fwd.h
index df0bb161e1..df0bb161e1 100644
--- a/shared/nm-glib-aux/nm-logging-fwd.h
+++ b/src/libnm-glib-aux/nm-logging-fwd.h
diff --git a/shared/nm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h
index 113a67a0d2..113a67a0d2 100644
--- a/shared/nm-glib-aux/nm-macros-internal.h
+++ b/src/libnm-glib-aux/nm-macros-internal.h
diff --git a/shared/nm-glib-aux/nm-obj.h b/src/libnm-glib-aux/nm-obj.h
index 2062f66180..2062f66180 100644
--- a/shared/nm-glib-aux/nm-obj.h
+++ b/src/libnm-glib-aux/nm-obj.h
diff --git a/shared/nm-glib-aux/nm-random-utils.c b/src/libnm-glib-aux/nm-random-utils.c
index c95d368dd3..56b99d5e3c 100644
--- a/shared/nm-glib-aux/nm-random-utils.c
+++ b/src/libnm-glib-aux/nm-random-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 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-random-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-random-utils.h b/src/libnm-glib-aux/nm-random-utils.h
index d0eae1033b..d0eae1033b 100644
--- a/shared/nm-glib-aux/nm-random-utils.h
+++ b/src/libnm-glib-aux/nm-random-utils.h
diff --git a/shared/nm-glib-aux/nm-ref-string.c b/src/libnm-glib-aux/nm-ref-string.c
index 1084c47f8a..0804a05782 100644
--- a/shared/nm-glib-aux/nm-ref-string.c
+++ b/src/libnm-glib-aux/nm-ref-string.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-ref-string.h"
 
diff --git a/shared/nm-glib-aux/nm-ref-string.h b/src/libnm-glib-aux/nm-ref-string.h
index 97c263b08f..97c263b08f 100644
--- a/shared/nm-glib-aux/nm-ref-string.h
+++ b/src/libnm-glib-aux/nm-ref-string.h
diff --git a/shared/nm-glib-aux/nm-secret-utils.c b/src/libnm-glib-aux/nm-secret-utils.c
index 8188b503a3..c764b6e575 100644
--- a/shared/nm-glib-aux/nm-secret-utils.c
+++ b/src/libnm-glib-aux/nm-secret-utils.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2015 - 2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-secret-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-secret-utils.h b/src/libnm-glib-aux/nm-secret-utils.h
index ac27963571..ac27963571 100644
--- a/shared/nm-glib-aux/nm-secret-utils.h
+++ b/src/libnm-glib-aux/nm-secret-utils.h
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index 3215a33b5b..9477cc3e74 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 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-shared-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h
index 7d330458c1..7d330458c1 100644
--- a/shared/nm-glib-aux/nm-shared-utils.h
+++ b/src/libnm-glib-aux/nm-shared-utils.h
diff --git a/shared/nm-glib-aux/nm-str-buf.h b/src/libnm-glib-aux/nm-str-buf.h
index cb0d3fb189..cb0d3fb189 100644
--- a/shared/nm-glib-aux/nm-str-buf.h
+++ b/src/libnm-glib-aux/nm-str-buf.h
diff --git a/shared/nm-glib-aux/nm-time-utils.c b/src/libnm-glib-aux/nm-time-utils.c
index df98176a12..f30e6a1994 100644
--- a/shared/nm-glib-aux/nm-time-utils.c
+++ b/src/libnm-glib-aux/nm-time-utils.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-time-utils.h"
 
diff --git a/shared/nm-glib-aux/nm-time-utils.h b/src/libnm-glib-aux/nm-time-utils.h
index 3c3e935f8d..3c3e935f8d 100644
--- a/shared/nm-glib-aux/nm-time-utils.h
+++ b/src/libnm-glib-aux/nm-time-utils.h
diff --git a/shared/nm-glib-aux/nm-value-type.h b/src/libnm-glib-aux/nm-value-type.h
index f9edebdb6c..f9edebdb6c 100644
--- a/shared/nm-glib-aux/nm-value-type.h
+++ b/src/libnm-glib-aux/nm-value-type.h
diff --git a/shared/nm-glib-aux/tests/meson.build b/src/libnm-glib-aux/tests/meson.build
index 38dfff0c6c..38dfff0c6c 100644
--- a/shared/nm-glib-aux/tests/meson.build
+++ b/src/libnm-glib-aux/tests/meson.build
diff --git a/shared/nm-glib-aux/tests/test-json-aux.c b/src/libnm-glib-aux/tests/test-json-aux.c
index b07d673fa6..b27504482d 100644
--- a/shared/nm-glib-aux/tests/test-json-aux.c
+++ b/src/libnm-glib-aux/tests/test-json-aux.c
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-prog.h"
 
 #include <jansson.h>
 
-#include "nm-glib-aux/nm-json-aux.h"
+#include "libnm-glib-aux/nm-json-aux.h"
 
 #include "nm-utils/nm-test-utils.h"
 
diff --git a/shared/nm-glib-aux/tests/test-shared-general.c b/src/libnm-glib-aux/tests/test-shared-general.c
index f42c6fb108..c98cce1595 100644
--- a/shared/nm-glib-aux/tests/test-shared-general.c
+++ b/src/libnm-glib-aux/tests/test-shared-general.c
@@ -3,13 +3,13 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-prog.h"
 
 #include "nm-std-aux/unaligned.h"
-#include "nm-glib-aux/nm-random-utils.h"
-#include "nm-glib-aux/nm-str-buf.h"
-#include "nm-glib-aux/nm-time-utils.h"
-#include "nm-glib-aux/nm-ref-string.h"
+#include "libnm-glib-aux/nm-random-utils.h"
+#include "libnm-glib-aux/nm-str-buf.h"
+#include "libnm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-ref-string.h"
 
 #include "nm-utils/nm-test-utils.h"
 
diff --git a/src/libnm-log-core/meson.build b/src/libnm-log-core/meson.build
new file mode 100644
index 0000000000..2cbf294312
--- /dev/null
+++ b/src/libnm-log-core/meson.build
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_log_core = static_library(
+  'nm-log-core',
+  sources: 'nm-logging.c',
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
+  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,
+)
diff --git a/shared/nm-log-core/nm-logging.c b/src/libnm-log-core/nm-logging.c
index cf3c3a8657..7a23344b94 100644
--- a/shared/nm-log-core/nm-logging.c
+++ b/src/libnm-log-core/nm-logging.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nm-logging.h"
 
@@ -22,8 +22,8 @@
     #include <systemd/sd-journal.h>
 #endif
 
-#include "nm-glib-aux/nm-logging-base.h"
-#include "nm-glib-aux/nm-time-utils.h"
+#include "libnm-glib-aux/nm-logging-base.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 
 /*****************************************************************************/
 
diff --git a/shared/nm-log-core/nm-logging.h b/src/libnm-log-core/nm-logging.h
index d3143d3973..574c225c2e 100644
--- a/shared/nm-log-core/nm-logging.h
+++ b/src/libnm-log-core/nm-logging.h
@@ -11,7 +11,7 @@
     #error nm-test-utils.h must be included as last header
 #endif
 
-#include "nm-glib-aux/nm-logging-fwd.h"
+#include "libnm-glib-aux/nm-logging-fwd.h"
 
 #define NM_LOG_CONFIG_BACKEND_DEBUG   "debug"
 #define NM_LOG_CONFIG_BACKEND_SYSLOG  "syslog"
diff --git a/src/libnm-log-null/meson.build b/src/libnm-log-null/meson.build
new file mode 100644
index 0000000000..6208708260
--- /dev/null
+++ b/src/libnm-log-null/meson.build
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_log_null = static_library(
+  'nm-log-null',
+  sources: 'nm-logging-null.c',
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
+  dependencies: glib_nm_default_dep,
+)
diff --git a/shared/nm-log-null/nm-logging-null.c b/src/libnm-log-null/nm-logging-null.c
index 63f1a82f44..a454c5bc6a 100644
--- a/shared/nm-log-null/nm-logging-null.c
+++ b/src/libnm-log-null/nm-logging-null.c
@@ -3,9 +3,9 @@
  * 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-glib-aux/nm-logging-fwd.h"
+#include "libnm-glib-aux/nm-logging-fwd.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/nm-netlink.c b/src/libnm-platform/nm-netlink.c
index 7a6d7e045b..95010c0257 100644
--- a/src/libnm-platform/nm-netlink.c
+++ b/src/libnm-platform/nm-netlink.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-netlink.h"
 
diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
index dbb4864f1d..7c101213d9 100644
--- a/src/libnm-platform/nm-platform-utils.c
+++ b/src/libnm-platform/nm-platform-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 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-platform-utils.h"
 
@@ -19,7 +19,7 @@
 #include <libudev.h>
 
 #include "libnm-base/nm-ethtool-base.h"
-#include "nm-log-core/nm-logging.h"
+#include "libnm-log-core/nm-logging.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/nmp-netns.c b/src/libnm-platform/nmp-netns.c
index f97339a756..aea5b3b6dc 100644
--- a/src/libnm-platform/nmp-netns.c
+++ b/src/libnm-platform/nmp-netns.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
 
 #include "nmp-netns.h"
 
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <pthread.h>
 
-#include "nm-log-core/nm-logging.h"
+#include "libnm-log-core/nm-logging.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/tests/test-nm-platform.c b/src/libnm-platform/tests/test-nm-platform.c
index d68dc772eb..f4b32d4693 100644
--- a/src/libnm-platform/tests/test-nm-platform.c
+++ b/src/libnm-platform/tests/test-nm-platform.c
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
+#include "libnm-glib-aux/nm-default-glib-i18n-prog.h"
 
-#include "nm-log-core/nm-logging.h"
+#include "libnm-log-core/nm-logging.h"
 #include "libnm-platform/nm-netlink.h"
 #include "libnm-platform/nmp-netns.h"
 
diff --git a/src/libnm-systemd-shared/nm-default-systemd-shared.h b/src/libnm-systemd-shared/nm-default-systemd-shared.h
index bc0e6c4ca0..8b312f9aa7 100644
--- a/src/libnm-systemd-shared/nm-default-systemd-shared.h
+++ b/src/libnm-systemd-shared/nm-default-systemd-shared.h
@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-glib-aux/nm-default-glib.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED
diff --git a/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
index 83531e230e..2fc8b83176 100644
--- a/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -8,7 +8,7 @@
 
 #include "libnm-systemd-shared/nm-default-systemd-shared.h"
 
-#include "nm-glib-aux/nm-logging-fwd.h"
+#include "libnm-glib-aux/nm-logging-fwd.h"
 
 /*****************************************************************************/
 
diff --git a/src/libnm-udev-aux/meson.build b/src/libnm-udev-aux/meson.build
index 4577a83a93..55acbaab06 100644
--- a/src/libnm-udev-aux/meson.build
+++ b/src/libnm-udev-aux/meson.build
@@ -3,6 +3,11 @@
 libnm_udev_aux = static_library(
   'nm-udev-aux',
   sources: 'nm-udev-utils.c',
+  include_directories: [
+    shared_inc,
+    src_inc,
+    top_inc,
+  ],
   dependencies: [
     glib_nm_default_dep,
     libudev_dep,
diff --git a/src/libnm-udev-aux/nm-udev-utils.c b/src/libnm-udev-aux/nm-udev-utils.c
index 0b941dff53..ef1cf26b2d 100644
--- a/src/libnm-udev-aux/nm-udev-utils.c
+++ b/src/libnm-udev-aux/nm-udev-utils.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2017 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-udev-utils.h"
 
diff --git a/src/meson.build b/src/meson.build
index 32925d5b77..fbe9765756 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,6 +2,9 @@
 
 src_inc = include_directories('.')
 
+subdir('libnm-glib-aux')
+subdir('libnm-log-null')
+subdir('libnm-log-core')
 subdir('libnm-systemd-shared')
 subdir('libnm-udev-aux')
 subdir('libnm-base')
@@ -14,6 +17,7 @@ subdir('libnm-core-aux-extern')
 subdir('core')
 
 if enable_tests
+  subdir('libnm-glib-aux/tests')
   subdir('libnm-platform/tests')
   subdir('libnm-core-impl/tests')
 endif