build: move "shared/systemd" to "src/libnm-systemd-shared"

147 files changed, 231 insertions, 223 deletions

diff --git a/Makefile.am b/Makefile.am
index e1ba7834bf..96a056d75c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,9 +122,9 @@ shared/nm-platform/.dirstamp:                 config-extra.h
 shared/nm-platform/tests/.dirstamp:           config-extra.h
 shared/nm-std-aux/.dirstamp:                  config-extra.h
 shared/nm-udev-aux/.dirstamp:                 config-extra.h
-shared/systemd/.dirstamp:                     config-extra.h
-shared/systemd/src/basic/.dirstamp:           config-extra.h
-shared/systemd/src/shared/.dirstamp:          config-extra.h
+src/libnm-systemd-shared/.dirstamp:                 config-extra.h
+src/libnm-systemd-shared/src/basic/.dirstamp:       config-extra.h
+src/libnm-systemd-shared/src/shared/.dirstamp:      config-extra.h
 src/core/dhcp/.dirstamp:                      config-extra.h
 
 ###############################################################################
@@ -1380,7 +1380,7 @@ src_libnm_core_impl_tests_ldadd = \
 	$(libnm_crypto_lib) \
 	src/libnm-core-aux-intern/libnm-core-aux-intern.la \
 	shared/nm-base/libnm-base.la \
-	shared/systemd/libnm-systemd-shared.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 \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -1610,7 +1610,7 @@ libnm_libnm_static_la_LIBADD = \
 	shared/nm-base/libnm-base.la \
 	introspection/libnmdbus.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
-	shared/systemd/libnm-systemd-shared.la \
+	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/nm-log-null/libnm-log-null.la \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
@@ -1949,152 +1949,154 @@ libsystemd_cppflags = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
-	-I$(srcdir)/shared/systemd/ \
-	-I$(srcdir)/shared/systemd/sd-adapt-shared \
-	-I$(srcdir)/shared/systemd/src/basic \
-	-I$(srcdir)/shared/systemd/src/shared \
+	-I$(srcdir)/src/ \
+	-I$(builddir)/src/ \
+	-I$(srcdir)/src/libnm-systemd-shared/ \
+	-I$(srcdir)/src/libnm-systemd-shared/sd-adapt-shared \
+	-I$(srcdir)/src/libnm-systemd-shared/src/basic \
+	-I$(srcdir)/src/libnm-systemd-shared/src/shared \
 	$(LIBSYSTEMD_NM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(NULL)
 
-noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la
+noinst_LTLIBRARIES += src/libnm-systemd-shared/libnm-systemd-shared.la
 
-shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
+src_libnm_systemd_shared_libnm_systemd_shared_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
 	$(NULL)
 
-shared_systemd_libnm_systemd_shared_la_SOURCES = \
-	shared/systemd/nm-default-systemd-shared.h \
-	shared/systemd/nm-sd-utils-shared.c \
-	shared/systemd/nm-sd-utils-shared.h \
-	shared/systemd/sd-adapt-shared/architecture.h \
-	shared/systemd/sd-adapt-shared/arphrd-list.h \
-	shared/systemd/sd-adapt-shared/blockdev-util.h \
-	shared/systemd/sd-adapt-shared/build.h \
-	shared/systemd/sd-adapt-shared/copy.h \
-	shared/systemd/sd-adapt-shared/def.h \
-	shared/systemd/sd-adapt-shared/dhcp-server-internal.h \
-	shared/systemd/sd-adapt-shared/dirent-util.h \
-	shared/systemd/sd-adapt-shared/errno-list.h \
-	shared/systemd/sd-adapt-shared/glob-util.h \
-	shared/systemd/sd-adapt-shared/gunicode.h \
-	shared/systemd/sd-adapt-shared/idn-util.h \
-	shared/systemd/sd-adapt-shared/ioprio.h \
-	shared/systemd/sd-adapt-shared/locale-util.h \
-	shared/systemd/sd-adapt-shared/memfd-util.h \
-	shared/systemd/sd-adapt-shared/missing_fs.h \
-	shared/systemd/sd-adapt-shared/missing_keyctl.h \
-	shared/systemd/sd-adapt-shared/missing_magic.h \
-	shared/systemd/sd-adapt-shared/missing_network.h \
-	shared/systemd/sd-adapt-shared/missing_sched.h \
-	shared/systemd/sd-adapt-shared/missing_timerfd.h \
-	shared/systemd/sd-adapt-shared/mkdir.h \
-	shared/systemd/sd-adapt-shared/namespace-util.h \
-	shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \
-	shared/systemd/sd-adapt-shared/nulstr-util.h \
-	shared/systemd/sd-adapt-shared/raw-clone.h \
-	shared/systemd/sd-adapt-shared/rlimit-util.h \
-	shared/systemd/sd-adapt-shared/terminal-util.h \
-	shared/systemd/sd-adapt-shared/unaligned.h \
-	shared/systemd/sd-adapt-shared/user-util.h \
-	shared/systemd/sd-adapt-shared/virt.h \
-	shared/systemd/src/basic/alloc-util.c \
-	shared/systemd/src/basic/alloc-util.h \
-	shared/systemd/src/basic/async.h \
-	shared/systemd/src/basic/cgroup-util.h \
-	shared/systemd/src/basic/env-file.c \
-	shared/systemd/src/basic/env-file.h \
-	shared/systemd/src/basic/env-util.c \
-	shared/systemd/src/basic/env-util.h \
-	shared/systemd/src/basic/errno-util.h \
-	shared/systemd/src/basic/escape.c \
-	shared/systemd/src/basic/escape.h \
-	shared/systemd/src/basic/ether-addr-util.c \
-	shared/systemd/src/basic/ether-addr-util.h \
-	shared/systemd/src/basic/extract-word.c \
-	shared/systemd/src/basic/extract-word.h \
-	shared/systemd/src/basic/fd-util.c \
-	shared/systemd/src/basic/fd-util.h \
-	shared/systemd/src/basic/fileio.c \
-	shared/systemd/src/basic/fileio.h \
-	shared/systemd/src/basic/format-util.c \
-	shared/systemd/src/basic/format-util.h \
-	shared/systemd/src/basic/fs-util.c \
-	shared/systemd/src/basic/fs-util.h \
-	shared/systemd/src/basic/hash-funcs.c \
-	shared/systemd/src/basic/hash-funcs.h \
-	shared/systemd/src/basic/hashmap.c \
-	shared/systemd/src/basic/hashmap.h \
-	shared/systemd/src/basic/hexdecoct.c \
-	shared/systemd/src/basic/hexdecoct.h \
-	shared/systemd/src/basic/hostname-util.c \
-	shared/systemd/src/basic/hostname-util.h \
-	shared/systemd/src/basic/in-addr-util.c \
-	shared/systemd/src/basic/in-addr-util.h \
-	shared/systemd/src/basic/io-util.c \
-	shared/systemd/src/basic/io-util.h \
-	shared/systemd/src/basic/list.h \
-	shared/systemd/src/basic/log.h \
-	shared/systemd/src/basic/macro.h \
-	shared/systemd/src/basic/memory-util.c \
-	shared/systemd/src/basic/memory-util.h \
-	shared/systemd/src/basic/mempool.c \
-	shared/systemd/src/basic/mempool.h \
-	shared/systemd/src/basic/missing_fcntl.h \
-	shared/systemd/src/basic/missing_random.h \
-	shared/systemd/src/basic/missing_socket.h \
-	shared/systemd/src/basic/missing_stat.h \
-	shared/systemd/src/basic/missing_syscall.h \
-	shared/systemd/src/basic/missing_type.h \
-	shared/systemd/src/basic/parse-util.c \
-	shared/systemd/src/basic/parse-util.h \
-	shared/systemd/src/basic/path-util.c \
-	shared/systemd/src/basic/path-util.h \
-	shared/systemd/src/basic/prioq.c \
-	shared/systemd/src/basic/prioq.h \
-	shared/systemd/src/basic/process-util.c \
-	shared/systemd/src/basic/process-util.h \
-	shared/systemd/src/basic/random-util.c \
-	shared/systemd/src/basic/random-util.h \
-	shared/systemd/src/basic/ratelimit.c \
-	shared/systemd/src/basic/ratelimit.h \
-	shared/systemd/src/basic/set.h \
-	shared/systemd/src/basic/signal-util.c \
-	shared/systemd/src/basic/signal-util.h \
-	shared/systemd/src/basic/siphash24.h \
-	shared/systemd/src/basic/socket-util.c \
-	shared/systemd/src/basic/socket-util.h \
-	shared/systemd/src/basic/sort-util.h \
-	shared/systemd/src/basic/sparse-endian.h \
-	shared/systemd/src/basic/stat-util.c \
-	shared/systemd/src/basic/stat-util.h \
-	shared/systemd/src/basic/stdio-util.h \
-	shared/systemd/src/basic/string-table.c \
-	shared/systemd/src/basic/string-table.h \
-	shared/systemd/src/basic/string-util.c \
-	shared/systemd/src/basic/string-util.h \
-	shared/systemd/src/basic/strv.c \
-	shared/systemd/src/basic/strv.h \
-	shared/systemd/src/basic/strxcpyx.c \
-	shared/systemd/src/basic/strxcpyx.h \
-	shared/systemd/src/basic/time-util.c \
-	shared/systemd/src/basic/time-util.h \
-	shared/systemd/src/basic/tmpfile-util.c \
-	shared/systemd/src/basic/tmpfile-util.h \
-	shared/systemd/src/basic/umask-util.h \
-	shared/systemd/src/basic/utf8.c \
-	shared/systemd/src/basic/utf8.h \
-	shared/systemd/src/basic/util.c \
-	shared/systemd/src/basic/util.h \
-	shared/systemd/src/shared/dns-domain.c \
-	shared/systemd/src/shared/dns-domain.h \
-	shared/systemd/src/shared/log-link.h \
-	shared/systemd/src/shared/web-util.c \
-	shared/systemd/src/shared/web-util.h \
-	$(NULL)
-
-shared_systemd_libnm_systemd_shared_la_LIBADD = \
+src_libnm_systemd_shared_libnm_systemd_shared_la_SOURCES = \
+	src/libnm-systemd-shared/nm-default-systemd-shared.h \
+	src/libnm-systemd-shared/nm-sd-utils-shared.c \
+	src/libnm-systemd-shared/nm-sd-utils-shared.h \
+	src/libnm-systemd-shared/sd-adapt-shared/architecture.h \
+	src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h \
+	src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/build.h \
+	src/libnm-systemd-shared/sd-adapt-shared/copy.h \
+	src/libnm-systemd-shared/sd-adapt-shared/def.h \
+	src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h \
+	src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/errno-list.h \
+	src/libnm-systemd-shared/sd-adapt-shared/glob-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/gunicode.h \
+	src/libnm-systemd-shared/sd-adapt-shared/idn-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/ioprio.h \
+	src/libnm-systemd-shared/sd-adapt-shared/locale-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_network.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h \
+	src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h \
+	src/libnm-systemd-shared/sd-adapt-shared/mkdir.h \
+	src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h \
+	src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h \
+	src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/unaligned.h \
+	src/libnm-systemd-shared/sd-adapt-shared/user-util.h \
+	src/libnm-systemd-shared/sd-adapt-shared/virt.h \
+	src/libnm-systemd-shared/src/basic/alloc-util.c \
+	src/libnm-systemd-shared/src/basic/alloc-util.h \
+	src/libnm-systemd-shared/src/basic/async.h \
+	src/libnm-systemd-shared/src/basic/cgroup-util.h \
+	src/libnm-systemd-shared/src/basic/env-file.c \
+	src/libnm-systemd-shared/src/basic/env-file.h \
+	src/libnm-systemd-shared/src/basic/env-util.c \
+	src/libnm-systemd-shared/src/basic/env-util.h \
+	src/libnm-systemd-shared/src/basic/errno-util.h \
+	src/libnm-systemd-shared/src/basic/escape.c \
+	src/libnm-systemd-shared/src/basic/escape.h \
+	src/libnm-systemd-shared/src/basic/ether-addr-util.c \
+	src/libnm-systemd-shared/src/basic/ether-addr-util.h \
+	src/libnm-systemd-shared/src/basic/extract-word.c \
+	src/libnm-systemd-shared/src/basic/extract-word.h \
+	src/libnm-systemd-shared/src/basic/fd-util.c \
+	src/libnm-systemd-shared/src/basic/fd-util.h \
+	src/libnm-systemd-shared/src/basic/fileio.c \
+	src/libnm-systemd-shared/src/basic/fileio.h \
+	src/libnm-systemd-shared/src/basic/format-util.c \
+	src/libnm-systemd-shared/src/basic/format-util.h \
+	src/libnm-systemd-shared/src/basic/fs-util.c \
+	src/libnm-systemd-shared/src/basic/fs-util.h \
+	src/libnm-systemd-shared/src/basic/hash-funcs.c \
+	src/libnm-systemd-shared/src/basic/hash-funcs.h \
+	src/libnm-systemd-shared/src/basic/hashmap.c \
+	src/libnm-systemd-shared/src/basic/hashmap.h \
+	src/libnm-systemd-shared/src/basic/hexdecoct.c \
+	src/libnm-systemd-shared/src/basic/hexdecoct.h \
+	src/libnm-systemd-shared/src/basic/hostname-util.c \
+	src/libnm-systemd-shared/src/basic/hostname-util.h \
+	src/libnm-systemd-shared/src/basic/in-addr-util.c \
+	src/libnm-systemd-shared/src/basic/in-addr-util.h \
+	src/libnm-systemd-shared/src/basic/io-util.c \
+	src/libnm-systemd-shared/src/basic/io-util.h \
+	src/libnm-systemd-shared/src/basic/list.h \
+	src/libnm-systemd-shared/src/basic/log.h \
+	src/libnm-systemd-shared/src/basic/macro.h \
+	src/libnm-systemd-shared/src/basic/memory-util.c \
+	src/libnm-systemd-shared/src/basic/memory-util.h \
+	src/libnm-systemd-shared/src/basic/mempool.c \
+	src/libnm-systemd-shared/src/basic/mempool.h \
+	src/libnm-systemd-shared/src/basic/missing_fcntl.h \
+	src/libnm-systemd-shared/src/basic/missing_random.h \
+	src/libnm-systemd-shared/src/basic/missing_socket.h \
+	src/libnm-systemd-shared/src/basic/missing_stat.h \
+	src/libnm-systemd-shared/src/basic/missing_syscall.h \
+	src/libnm-systemd-shared/src/basic/missing_type.h \
+	src/libnm-systemd-shared/src/basic/parse-util.c \
+	src/libnm-systemd-shared/src/basic/parse-util.h \
+	src/libnm-systemd-shared/src/basic/path-util.c \
+	src/libnm-systemd-shared/src/basic/path-util.h \
+	src/libnm-systemd-shared/src/basic/prioq.c \
+	src/libnm-systemd-shared/src/basic/prioq.h \
+	src/libnm-systemd-shared/src/basic/process-util.c \
+	src/libnm-systemd-shared/src/basic/process-util.h \
+	src/libnm-systemd-shared/src/basic/random-util.c \
+	src/libnm-systemd-shared/src/basic/random-util.h \
+	src/libnm-systemd-shared/src/basic/ratelimit.c \
+	src/libnm-systemd-shared/src/basic/ratelimit.h \
+	src/libnm-systemd-shared/src/basic/set.h \
+	src/libnm-systemd-shared/src/basic/signal-util.c \
+	src/libnm-systemd-shared/src/basic/signal-util.h \
+	src/libnm-systemd-shared/src/basic/siphash24.h \
+	src/libnm-systemd-shared/src/basic/socket-util.c \
+	src/libnm-systemd-shared/src/basic/socket-util.h \
+	src/libnm-systemd-shared/src/basic/sort-util.h \
+	src/libnm-systemd-shared/src/basic/sparse-endian.h \
+	src/libnm-systemd-shared/src/basic/stat-util.c \
+	src/libnm-systemd-shared/src/basic/stat-util.h \
+	src/libnm-systemd-shared/src/basic/stdio-util.h \
+	src/libnm-systemd-shared/src/basic/string-table.c \
+	src/libnm-systemd-shared/src/basic/string-table.h \
+	src/libnm-systemd-shared/src/basic/string-util.c \
+	src/libnm-systemd-shared/src/basic/string-util.h \
+	src/libnm-systemd-shared/src/basic/strv.c \
+	src/libnm-systemd-shared/src/basic/strv.h \
+	src/libnm-systemd-shared/src/basic/strxcpyx.c \
+	src/libnm-systemd-shared/src/basic/strxcpyx.h \
+	src/libnm-systemd-shared/src/basic/time-util.c \
+	src/libnm-systemd-shared/src/basic/time-util.h \
+	src/libnm-systemd-shared/src/basic/tmpfile-util.c \
+	src/libnm-systemd-shared/src/basic/tmpfile-util.h \
+	src/libnm-systemd-shared/src/basic/umask-util.h \
+	src/libnm-systemd-shared/src/basic/utf8.c \
+	src/libnm-systemd-shared/src/basic/utf8.h \
+	src/libnm-systemd-shared/src/basic/util.c \
+	src/libnm-systemd-shared/src/basic/util.h \
+	src/libnm-systemd-shared/src/shared/dns-domain.c \
+	src/libnm-systemd-shared/src/shared/dns-domain.h \
+	src/libnm-systemd-shared/src/shared/log-link.h \
+	src/libnm-systemd-shared/src/shared/web-util.c \
+	src/libnm-systemd-shared/src/shared/web-util.h \
+	$(NULL)
+
+src_libnm_systemd_shared_libnm_systemd_shared_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
@@ -2482,7 +2484,7 @@ src_core_libNetworkManager_la_LIBADD = \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
-	shared/systemd/libnm-systemd-shared.la \
+	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
 	shared/libcrbtree.la \
@@ -2595,7 +2597,7 @@ src_core_nm_iface_helper_LDADD = \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	src/core/libnm-systemd-core.la \
-	shared/systemd/libnm-systemd-shared.la \
+	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/libnacd.la \
 	shared/libndhcp4.la \
 	shared/libcrbtree.la \
@@ -2648,7 +2650,7 @@ src_core_initrd_nm_initrd_generator_LDADD = \
 	shared/nm-udev-aux/libnm-udev-aux.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
-	shared/systemd/libnm-systemd-shared.la \
+	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/nm-glib-aux/libnm-glib-aux.la \
 	shared/nm-std-aux/libnm-std-aux.la \
 	shared/libndhcp4.la \
@@ -4307,7 +4309,7 @@ src_core_tests_test_systemd_LDFLAGS = \
 
 src_core_tests_test_systemd_LDADD = \
 	src/core/libnm-systemd-core.la \
-	shared/systemd/libnm-systemd-shared.la \
+	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	shared/libcsiphash.la \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
diff --git a/contrib/scripts/nm-code-format.sh b/contrib/scripts/nm-code-format.sh
index 2de32aafc6..b4a83c6940 100755
--- a/contrib/scripts/nm-code-format.sh
+++ b/contrib/scripts/nm-code-format.sh
@@ -17,8 +17,8 @@ EXCLUDE=(
     ":(exclude)shared/n-acd"
     ":(exclude)shared/n-dhcp4"
     ":(exclude)shared/nm-std-aux/unaligned.h"
-    ":(exclude)shared/systemd/src"
     ":(exclude)src/core/systemd/src"
+    ":(exclude)src/libnm-systemd-shared/src"
 )
 
 NM_ROOT="$(git rev-parse --show-toplevel)" || die "not inside a git repository"
diff --git a/shared/meson.build b/shared/meson.build
index 7462216fb2..955d80eadb 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -222,66 +222,6 @@ libnm_platform_dep = declare_dependency(
   link_with: libnm_platform,
 )
 
-libnm_systemd_shared = static_library(
-  'nm-systemd-shared',
-  sources: files(
-    'systemd/nm-sd-utils-shared.c',
-    'systemd/src/basic/alloc-util.c',
-    'systemd/src/basic/env-file.c',
-    'systemd/src/basic/env-util.c',
-    'systemd/src/basic/escape.c',
-    'systemd/src/basic/ether-addr-util.c',
-    'systemd/src/basic/extract-word.c',
-    'systemd/src/basic/fd-util.c',
-    'systemd/src/basic/fileio.c',
-    'systemd/src/basic/format-util.c',
-    'systemd/src/basic/fs-util.c',
-    'systemd/src/basic/hash-funcs.c',
-    'systemd/src/basic/hashmap.c',
-    'systemd/src/basic/hexdecoct.c',
-    'systemd/src/basic/hostname-util.c',
-    'systemd/src/basic/in-addr-util.c',
-    'systemd/src/basic/io-util.c',
-    'systemd/src/basic/memory-util.c',
-    'systemd/src/basic/mempool.c',
-    'systemd/src/basic/parse-util.c',
-    'systemd/src/basic/path-util.c',
-    'systemd/src/basic/prioq.c',
-    'systemd/src/basic/process-util.c',
-    'systemd/src/basic/random-util.c',
-    'systemd/src/basic/ratelimit.c',
-    'systemd/src/basic/signal-util.c',
-    'systemd/src/basic/socket-util.c',
-    'systemd/src/basic/stat-util.c',
-    'systemd/src/basic/string-table.c',
-    'systemd/src/basic/string-util.c',
-    'systemd/src/basic/strv.c',
-    'systemd/src/basic/strxcpyx.c',
-    'systemd/src/basic/time-util.c',
-    'systemd/src/basic/tmpfile-util.c',
-    'systemd/src/basic/utf8.c',
-    'systemd/src/basic/util.c',
-    'systemd/src/shared/dns-domain.c',
-    'systemd/src/shared/web-util.c',
-  ),
-  include_directories: include_directories(
-    'systemd/sd-adapt-shared',
-    'systemd/src/basic',
-    'systemd/src/shared',
-  ),
-  dependencies: glib_nm_default_dep,
-)
-
-libnm_systemd_shared_dep = declare_dependency(
-  include_directories: include_directories(
-    'systemd/sd-adapt-shared',
-    'systemd/src/basic',
-    'systemd/src/shared',
-  ),
-  dependencies: glib_dep,
-  link_with: libnm_systemd_shared,
-)
-
 if enable_tests
   subdir('nm-glib-aux/tests')
   subdir('nm-platform/tests')
diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c
index 08402729f9..1b44c68134 100644
--- a/src/core/NetworkManagerUtils.c
+++ b/src/core/NetworkManagerUtils.c
@@ -24,7 +24,7 @@
 
 #include "platform/nm-platform.h"
 #include "nm-auth-utils.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 28ba196b60..e5271bac77 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -26,7 +26,7 @@
 #include "nm-std-aux/unaligned.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
 #include "nm-glib-aux/nm-random-utils.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-base/nm-ethtool-base.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index bc114ad80c..aeaac63571 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 
 #include "nm-glib-aux/nm-dedup-multi.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/core/dhcp/nm-dhcp-nettools.c b/src/core/dhcp/nm-dhcp-nettools.c
index 116e1bdb24..783d0be2cd 100644
--- a/src/core/dhcp/nm-dhcp-nettools.c
+++ b/src/core/dhcp/nm-dhcp-nettools.c
@@ -26,7 +26,7 @@
 #include "platform/nm-platform.h"
 #include "nm-dhcp-client-logging.h"
 #include "n-dhcp4/src/n-dhcp4.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "systemd/nm-sd-utils-dhcp.h"
 
 /*****************************************************************************/
diff --git a/src/core/dhcp/nm-dhcp-utils.c b/src/core/dhcp/nm-dhcp-utils.c
index 9867e4c16e..26de6d6276 100644
--- a/src/core/dhcp/nm-dhcp-utils.c
+++ b/src/core/dhcp/nm-dhcp-utils.c
@@ -11,7 +11,7 @@
 #include "nm-std-aux/unaligned.h"
 #include "nm-glib-aux/nm-dedup-multi.h"
 #include "nm-glib-aux/nm-str-buf.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-dhcp-utils.h"
 #include "nm-utils.h"
diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c
index 3bde667888..646faefbd3 100644
--- a/src/core/initrd/nmi-cmdline-reader.c
+++ b/src/core/initrd/nmi-cmdline-reader.c
@@ -10,7 +10,7 @@
 
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-initrd-generator.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/ndisc/nm-lndp-ndisc.c b/src/core/ndisc/nm-lndp-ndisc.c
index f773478f51..31f6081463 100644
--- a/src/core/ndisc/nm-lndp-ndisc.c
+++ b/src/core/ndisc/nm-lndp-ndisc.c
@@ -14,7 +14,7 @@
 #include <ndp.h>
 
 #include "nm-glib-aux/nm-str-buf.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "nm-ndisc-private.h"
 #include "NetworkManagerUtils.h"
 #include "platform/nm-platform.h"
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index 6d3e879611..902270158a 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -25,7 +25,7 @@
 #include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-core-intern/nm-keyfile-internal.h"
 
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "settings/nm-settings-plugin.h"
 #include "settings/nm-settings-storage.h"
diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
index f627d7d471..ceedfdb06b 100644
--- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h
@@ -13,7 +13,7 @@
 #include <time.h>
 
 #undef NETWORKMANAGER_COMPILATION
-#include "systemd/sd-adapt-shared/nm-sd-adapt-shared.h"
+#include "libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h"
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD
 
diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c
index 03576c133c..c6711f0b2b 100644
--- a/src/core/tests/test-systemd.c
+++ b/src/core/tests/test-systemd.c
@@ -6,7 +6,7 @@
 #include "src/core/systemd/nm-default-systemd.h"
 
 #include "systemd/nm-sd.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/libnm-core-impl/nm-keyfile.c b/src/libnm-core-impl/nm-keyfile.c
index 4e12f13c7e..f15e004f61 100644
--- a/src/libnm-core-impl/nm-keyfile.c
+++ b/src/libnm-core-impl/nm-keyfile.c
@@ -20,7 +20,7 @@
 
 #include "nm-glib-aux/nm-str-buf.h"
 #include "nm-glib-aux/nm-secret-utils.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 
 #include "libnm-core-intern/nm-core-internal.h"
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index 38ba6663fb..241a871e05 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -17,7 +17,7 @@
 #include "nm-setting-bridge.h"
 #include "nm-setting-team.h"
 #include "nm-setting-vlan.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 /**
  * SECTION:nm-setting-connection
diff --git a/src/libnm-core-impl/nm-utils.c b/src/libnm-core-impl/nm-utils.c
index d4ab51df5f..7a1789caef 100644
--- a/src/libnm-core-impl/nm-utils.c
+++ b/src/libnm-core-impl/nm-utils.c
@@ -23,7 +23,7 @@
 #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 "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 #include "libnm-core-aux-intern/nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index 80ec0e0c77..b8a3def342 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -18,7 +18,7 @@
 #include "nm-glib-aux/nm-str-buf.h"
 #include "nm-glib-aux/nm-json-aux.h"
 #include "nm-base/nm-base.h"
-#include "systemd/nm-sd-utils-shared.h"
+#include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
 #include "nm-utils.h"
 #include "nm-setting-private.h"
diff --git a/src/libnm-systemd-shared/meson.build b/src/libnm-systemd-shared/meson.build
new file mode 100644
index 0000000000..cb4c49b7a5
--- /dev/null
+++ b/src/libnm-systemd-shared/meson.build
@@ -0,0 +1,65 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+libnm_systemd_shared = static_library(
+  'nm-systemd-shared',
+  sources: files(
+    'nm-sd-utils-shared.c',
+    'src/basic/alloc-util.c',
+    'src/basic/env-file.c',
+    'src/basic/env-util.c',
+    'src/basic/escape.c',
+    'src/basic/ether-addr-util.c',
+    'src/basic/extract-word.c',
+    'src/basic/fd-util.c',
+    'src/basic/fileio.c',
+    'src/basic/format-util.c',
+    'src/basic/fs-util.c',
+    'src/basic/hash-funcs.c',
+    'src/basic/hashmap.c',
+    'src/basic/hexdecoct.c',
+    'src/basic/hostname-util.c',
+    'src/basic/in-addr-util.c',
+    'src/basic/io-util.c',
+    'src/basic/memory-util.c',
+    'src/basic/mempool.c',
+    'src/basic/parse-util.c',
+    'src/basic/path-util.c',
+    'src/basic/prioq.c',
+    'src/basic/process-util.c',
+    'src/basic/random-util.c',
+    'src/basic/ratelimit.c',
+    'src/basic/signal-util.c',
+    'src/basic/socket-util.c',
+    'src/basic/stat-util.c',
+    'src/basic/string-table.c',
+    'src/basic/string-util.c',
+    'src/basic/strv.c',
+    'src/basic/strxcpyx.c',
+    'src/basic/time-util.c',
+    'src/basic/tmpfile-util.c',
+    'src/basic/utf8.c',
+    'src/basic/util.c',
+    'src/shared/dns-domain.c',
+    'src/shared/web-util.c',
+  ),
+  include_directories: [
+    include_directories(
+      'sd-adapt-shared',
+      'src/basic',
+      'src/shared',
+    ),
+    top_inc,
+    src_inc,
+  ],
+  dependencies: glib_nm_default_dep,
+)
+
+libnm_systemd_shared_dep = declare_dependency(
+  include_directories: include_directories(
+    'sd-adapt-shared',
+    'src/basic',
+    'src/shared',
+  ),
+  dependencies: glib_dep,
+  link_with: libnm_systemd_shared,
+)
diff --git a/shared/systemd/nm-default-systemd-shared.h b/src/libnm-systemd-shared/nm-default-systemd-shared.h
index bc0e6c4ca0..bc0e6c4ca0 100644
--- a/shared/systemd/nm-default-systemd-shared.h
+++ b/src/libnm-systemd-shared/nm-default-systemd-shared.h
diff --git a/shared/systemd/nm-sd-utils-shared.c b/src/libnm-systemd-shared/nm-sd-utils-shared.c
index f0504aa937..8c8934b1a4 100644
--- a/shared/systemd/nm-sd-utils-shared.c
+++ b/src/libnm-systemd-shared/nm-sd-utils-shared.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "shared/systemd/nm-default-systemd-shared.h"
+#include "libnm-systemd-shared/nm-default-systemd-shared.h"
 
 #include "nm-sd-utils-shared.h"
 
diff --git a/shared/systemd/nm-sd-utils-shared.h b/src/libnm-systemd-shared/nm-sd-utils-shared.h
index 45089c074d..45089c074d 100644
--- a/shared/systemd/nm-sd-utils-shared.h
+++ b/src/libnm-systemd-shared/nm-sd-utils-shared.h
diff --git a/shared/systemd/sd-adapt-shared/architecture.h b/src/libnm-systemd-shared/sd-adapt-shared/architecture.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/architecture.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/architecture.h
diff --git a/shared/systemd/sd-adapt-shared/arphrd-list.h b/src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/arphrd-list.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/arphrd-list.h
diff --git a/shared/systemd/sd-adapt-shared/blockdev-util.h b/src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/blockdev-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/blockdev-util.h
diff --git a/shared/systemd/sd-adapt-shared/build.h b/src/libnm-systemd-shared/sd-adapt-shared/build.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/build.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/build.h
diff --git a/shared/systemd/sd-adapt-shared/copy.h b/src/libnm-systemd-shared/sd-adapt-shared/copy.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/copy.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/copy.h
diff --git a/shared/systemd/sd-adapt-shared/def.h b/src/libnm-systemd-shared/sd-adapt-shared/def.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/def.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/def.h
diff --git a/shared/systemd/sd-adapt-shared/dhcp-server-internal.h b/src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/dhcp-server-internal.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/dhcp-server-internal.h
diff --git a/shared/systemd/sd-adapt-shared/dirent-util.h b/src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h
index 7132dfcc51..7132dfcc51 100644
--- a/shared/systemd/sd-adapt-shared/dirent-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/dirent-util.h
diff --git a/shared/systemd/sd-adapt-shared/errno-list.h b/src/libnm-systemd-shared/sd-adapt-shared/errno-list.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/errno-list.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/errno-list.h
diff --git a/shared/systemd/sd-adapt-shared/glob-util.h b/src/libnm-systemd-shared/sd-adapt-shared/glob-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/glob-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/glob-util.h
diff --git a/shared/systemd/sd-adapt-shared/gunicode.h b/src/libnm-systemd-shared/sd-adapt-shared/gunicode.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/gunicode.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/gunicode.h
diff --git a/shared/systemd/sd-adapt-shared/idn-util.h b/src/libnm-systemd-shared/sd-adapt-shared/idn-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/idn-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/idn-util.h
diff --git a/shared/systemd/sd-adapt-shared/ioprio.h b/src/libnm-systemd-shared/sd-adapt-shared/ioprio.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/ioprio.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/ioprio.h
diff --git a/shared/systemd/sd-adapt-shared/locale-util.h b/src/libnm-systemd-shared/sd-adapt-shared/locale-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/locale-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/locale-util.h
diff --git a/shared/systemd/sd-adapt-shared/memfd-util.h b/src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/memfd-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/memfd-util.h
diff --git a/shared/systemd/sd-adapt-shared/missing_fs.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_fs.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_fs.h
diff --git a/shared/systemd/sd-adapt-shared/missing_keyctl.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_keyctl.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_keyctl.h
diff --git a/shared/systemd/sd-adapt-shared/missing_magic.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_magic.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_magic.h
diff --git a/shared/systemd/sd-adapt-shared/missing_network.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_network.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_network.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_network.h
diff --git a/shared/systemd/sd-adapt-shared/missing_sched.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_sched.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_sched.h
diff --git a/shared/systemd/sd-adapt-shared/missing_timerfd.h b/src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/missing_timerfd.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/missing_timerfd.h
diff --git a/shared/systemd/sd-adapt-shared/mkdir.h b/src/libnm-systemd-shared/sd-adapt-shared/mkdir.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/mkdir.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/mkdir.h
diff --git a/shared/systemd/sd-adapt-shared/namespace-util.h b/src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/namespace-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/namespace-util.h
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
index b094ce40b6..83531e230e 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -6,7 +6,7 @@
 #ifndef __NM_SD_ADAPT_SHARED_H__
 #define __NM_SD_ADAPT_SHARED_H__
 
-#include "shared/systemd/nm-default-systemd-shared.h"
+#include "libnm-systemd-shared/nm-default-systemd-shared.h"
 
 #include "nm-glib-aux/nm-logging-fwd.h"
 
diff --git a/shared/systemd/sd-adapt-shared/nulstr-util.h b/src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/nulstr-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/nulstr-util.h
diff --git a/shared/systemd/sd-adapt-shared/raw-clone.h b/src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/raw-clone.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/raw-clone.h
diff --git a/shared/systemd/sd-adapt-shared/rlimit-util.h b/src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/rlimit-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/rlimit-util.h
diff --git a/shared/systemd/sd-adapt-shared/terminal-util.h b/src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/terminal-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/terminal-util.h
diff --git a/shared/systemd/sd-adapt-shared/unaligned.h b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h
index ac1a6928c5..ac1a6928c5 100644
--- a/shared/systemd/sd-adapt-shared/unaligned.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/unaligned.h
diff --git a/shared/systemd/sd-adapt-shared/user-util.h b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/user-util.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/user-util.h
diff --git a/shared/systemd/sd-adapt-shared/virt.h b/src/libnm-systemd-shared/sd-adapt-shared/virt.h
index 637892c2d6..637892c2d6 100644
--- a/shared/systemd/sd-adapt-shared/virt.h
+++ b/src/libnm-systemd-shared/sd-adapt-shared/virt.h
diff --git a/shared/systemd/src/basic/alloc-util.c b/src/libnm-systemd-shared/src/basic/alloc-util.c
index 7f7eb43359..7f7eb43359 100644
--- a/shared/systemd/src/basic/alloc-util.c
+++ b/src/libnm-systemd-shared/src/basic/alloc-util.c
diff --git a/shared/systemd/src/basic/alloc-util.h b/src/libnm-systemd-shared/src/basic/alloc-util.h
index f3e192ddaf..f3e192ddaf 100644
--- a/shared/systemd/src/basic/alloc-util.h
+++ b/src/libnm-systemd-shared/src/basic/alloc-util.h
diff --git a/shared/systemd/src/basic/async.h b/src/libnm-systemd-shared/src/basic/async.h
index e0bbaa5658..e0bbaa5658 100644
--- a/shared/systemd/src/basic/async.h
+++ b/src/libnm-systemd-shared/src/basic/async.h
diff --git a/shared/systemd/src/basic/cgroup-util.h b/src/libnm-systemd-shared/src/basic/cgroup-util.h
index bdc0d0d086..bdc0d0d086 100644
--- a/shared/systemd/src/basic/cgroup-util.h
+++ b/src/libnm-systemd-shared/src/basic/cgroup-util.h
diff --git a/shared/systemd/src/basic/env-file.c b/src/libnm-systemd-shared/src/basic/env-file.c
index 568b742fcb..568b742fcb 100644
--- a/shared/systemd/src/basic/env-file.c
+++ b/src/libnm-systemd-shared/src/basic/env-file.c
diff --git a/shared/systemd/src/basic/env-file.h b/src/libnm-systemd-shared/src/basic/env-file.h
index de475885ac..de475885ac 100644
--- a/shared/systemd/src/basic/env-file.h
+++ b/src/libnm-systemd-shared/src/basic/env-file.h
diff --git a/shared/systemd/src/basic/env-util.c b/src/libnm-systemd-shared/src/basic/env-util.c
index a311ee0075..a311ee0075 100644
--- a/shared/systemd/src/basic/env-util.c
+++ b/src/libnm-systemd-shared/src/basic/env-util.c
diff --git a/shared/systemd/src/basic/env-util.h b/src/libnm-systemd-shared/src/basic/env-util.h
index 6684b3350f..6684b3350f 100644
--- a/shared/systemd/src/basic/env-util.h
+++ b/src/libnm-systemd-shared/src/basic/env-util.h
diff --git a/shared/systemd/src/basic/errno-util.h b/src/libnm-systemd-shared/src/basic/errno-util.h
index 5609820b88..5609820b88 100644
--- a/shared/systemd/src/basic/errno-util.h
+++ b/src/libnm-systemd-shared/src/basic/errno-util.h
diff --git a/shared/systemd/src/basic/escape.c b/src/libnm-systemd-shared/src/basic/escape.c
index 094b5c5ff0..094b5c5ff0 100644
--- a/shared/systemd/src/basic/escape.c
+++ b/src/libnm-systemd-shared/src/basic/escape.c
diff --git a/shared/systemd/src/basic/escape.h b/src/libnm-systemd-shared/src/basic/escape.h
index 691b6d802c..691b6d802c 100644
--- a/shared/systemd/src/basic/escape.h
+++ b/src/libnm-systemd-shared/src/basic/escape.h
diff --git a/shared/systemd/src/basic/ether-addr-util.c b/src/libnm-systemd-shared/src/basic/ether-addr-util.c
index ae83eade9b..ae83eade9b 100644
--- a/shared/systemd/src/basic/ether-addr-util.c
+++ b/src/libnm-systemd-shared/src/basic/ether-addr-util.c
diff --git a/shared/systemd/src/basic/ether-addr-util.h b/src/libnm-systemd-shared/src/basic/ether-addr-util.h
index 942ce55621..942ce55621 100644
--- a/shared/systemd/src/basic/ether-addr-util.h
+++ b/src/libnm-systemd-shared/src/basic/ether-addr-util.h
diff --git a/shared/systemd/src/basic/extract-word.c b/src/libnm-systemd-shared/src/basic/extract-word.c
index 1d86033f12..1d86033f12 100644
--- a/shared/systemd/src/basic/extract-word.c
+++ b/src/libnm-systemd-shared/src/basic/extract-word.c
diff --git a/shared/systemd/src/basic/extract-word.h b/src/libnm-systemd-shared/src/basic/extract-word.h
index d1de32e580..d1de32e580 100644
--- a/shared/systemd/src/basic/extract-word.h
+++ b/src/libnm-systemd-shared/src/basic/extract-word.h
diff --git a/shared/systemd/src/basic/fd-util.c b/src/libnm-systemd-shared/src/basic/fd-util.c
index e53cf18d14..e53cf18d14 100644
--- a/shared/systemd/src/basic/fd-util.c
+++ b/src/libnm-systemd-shared/src/basic/fd-util.c
diff --git a/shared/systemd/src/basic/fd-util.h b/src/libnm-systemd-shared/src/basic/fd-util.h
index 2162537b80..2162537b80 100644
--- a/shared/systemd/src/basic/fd-util.h
+++ b/src/libnm-systemd-shared/src/basic/fd-util.h
diff --git a/shared/systemd/src/basic/fileio.c b/src/libnm-systemd-shared/src/basic/fileio.c
index ea90614a05..ea90614a05 100644
--- a/shared/systemd/src/basic/fileio.c
+++ b/src/libnm-systemd-shared/src/basic/fileio.c
diff --git a/shared/systemd/src/basic/fileio.h b/src/libnm-systemd-shared/src/basic/fileio.h
index 5a02856112..5a02856112 100644
--- a/shared/systemd/src/basic/fileio.h
+++ b/src/libnm-systemd-shared/src/basic/fileio.h
diff --git a/shared/systemd/src/basic/format-util.c b/src/libnm-systemd-shared/src/basic/format-util.c
index 42224b6f97..42224b6f97 100644
--- a/shared/systemd/src/basic/format-util.c
+++ b/src/libnm-systemd-shared/src/basic/format-util.c
diff --git a/shared/systemd/src/basic/format-util.h b/src/libnm-systemd-shared/src/basic/format-util.h
index b7e18768e3..b7e18768e3 100644
--- a/shared/systemd/src/basic/format-util.h
+++ b/src/libnm-systemd-shared/src/basic/format-util.h
diff --git a/shared/systemd/src/basic/fs-util.c b/src/libnm-systemd-shared/src/basic/fs-util.c
index 2ed9ee0e90..2ed9ee0e90 100644
--- a/shared/systemd/src/basic/fs-util.c
+++ b/src/libnm-systemd-shared/src/basic/fs-util.c
diff --git a/shared/systemd/src/basic/fs-util.h b/src/libnm-systemd-shared/src/basic/fs-util.h
index 9a39473567..9a39473567 100644
--- a/shared/systemd/src/basic/fs-util.h
+++ b/src/libnm-systemd-shared/src/basic/fs-util.h
diff --git a/shared/systemd/src/basic/hash-funcs.c b/src/libnm-systemd-shared/src/basic/hash-funcs.c
index 6f540b29a4..6f540b29a4 100644
--- a/shared/systemd/src/basic/hash-funcs.c
+++ b/src/libnm-systemd-shared/src/basic/hash-funcs.c
diff --git a/shared/systemd/src/basic/hash-funcs.h b/src/libnm-systemd-shared/src/basic/hash-funcs.h
index 5672df1da4..5672df1da4 100644
--- a/shared/systemd/src/basic/hash-funcs.h
+++ b/src/libnm-systemd-shared/src/basic/hash-funcs.h
diff --git a/shared/systemd/src/basic/hashmap.c b/src/libnm-systemd-shared/src/basic/hashmap.c
index 0a5deabf2c..0a5deabf2c 100644
--- a/shared/systemd/src/basic/hashmap.c
+++ b/src/libnm-systemd-shared/src/basic/hashmap.c
diff --git a/shared/systemd/src/basic/hashmap.h b/src/libnm-systemd-shared/src/basic/hashmap.h
index e99448375e..e99448375e 100644
--- a/shared/systemd/src/basic/hashmap.h
+++ b/src/libnm-systemd-shared/src/basic/hashmap.h
diff --git a/shared/systemd/src/basic/hexdecoct.c b/src/libnm-systemd-shared/src/basic/hexdecoct.c
index 78930b3274..78930b3274 100644
--- a/shared/systemd/src/basic/hexdecoct.c
+++ b/src/libnm-systemd-shared/src/basic/hexdecoct.c
diff --git a/shared/systemd/src/basic/hexdecoct.h b/src/libnm-systemd-shared/src/basic/hexdecoct.h
index 7e2a6892c0..7e2a6892c0 100644
--- a/shared/systemd/src/basic/hexdecoct.h
+++ b/src/libnm-systemd-shared/src/basic/hexdecoct.h
diff --git a/shared/systemd/src/basic/hostname-util.c b/src/libnm-systemd-shared/src/basic/hostname-util.c
index a3cdc62e3d..a3cdc62e3d 100644
--- a/shared/systemd/src/basic/hostname-util.c
+++ b/src/libnm-systemd-shared/src/basic/hostname-util.c
diff --git a/shared/systemd/src/basic/hostname-util.h b/src/libnm-systemd-shared/src/basic/hostname-util.h
index 6cff9c1d4c..6cff9c1d4c 100644
--- a/shared/systemd/src/basic/hostname-util.h
+++ b/src/libnm-systemd-shared/src/basic/hostname-util.h
diff --git a/shared/systemd/src/basic/in-addr-util.c b/src/libnm-systemd-shared/src/basic/in-addr-util.c
index c315dcbb81..c315dcbb81 100644
--- a/shared/systemd/src/basic/in-addr-util.c
+++ b/src/libnm-systemd-shared/src/basic/in-addr-util.c
diff --git a/shared/systemd/src/basic/in-addr-util.h b/src/libnm-systemd-shared/src/basic/in-addr-util.h
index 24308b702e..24308b702e 100644
--- a/shared/systemd/src/basic/in-addr-util.h
+++ b/src/libnm-systemd-shared/src/basic/in-addr-util.h
diff --git a/shared/systemd/src/basic/io-util.c b/src/libnm-systemd-shared/src/basic/io-util.c
index f09c7fdd24..f09c7fdd24 100644
--- a/shared/systemd/src/basic/io-util.c
+++ b/src/libnm-systemd-shared/src/basic/io-util.c
diff --git a/shared/systemd/src/basic/io-util.h b/src/libnm-systemd-shared/src/basic/io-util.h
index d817714b05..d817714b05 100644
--- a/shared/systemd/src/basic/io-util.h
+++ b/src/libnm-systemd-shared/src/basic/io-util.h
diff --git a/shared/systemd/src/basic/list.h b/src/libnm-systemd-shared/src/basic/list.h
index 256b7187c2..256b7187c2 100644
--- a/shared/systemd/src/basic/list.h
+++ b/src/libnm-systemd-shared/src/basic/list.h
diff --git a/shared/systemd/src/basic/log.h b/src/libnm-systemd-shared/src/basic/log.h
index ee2e48392d..ee2e48392d 100644
--- a/shared/systemd/src/basic/log.h
+++ b/src/libnm-systemd-shared/src/basic/log.h
diff --git a/shared/systemd/src/basic/macro.h b/src/libnm-systemd-shared/src/basic/macro.h
index 34416b3daa..34416b3daa 100644
--- a/shared/systemd/src/basic/macro.h
+++ b/src/libnm-systemd-shared/src/basic/macro.h
diff --git a/shared/systemd/src/basic/memory-util.c b/src/libnm-systemd-shared/src/basic/memory-util.c
index 7ee7c94ed7..7ee7c94ed7 100644
--- a/shared/systemd/src/basic/memory-util.c
+++ b/src/libnm-systemd-shared/src/basic/memory-util.c
diff --git a/shared/systemd/src/basic/memory-util.h b/src/libnm-systemd-shared/src/basic/memory-util.h
index 179edd247b..179edd247b 100644
--- a/shared/systemd/src/basic/memory-util.h
+++ b/src/libnm-systemd-shared/src/basic/memory-util.h
diff --git a/shared/systemd/src/basic/mempool.c b/src/libnm-systemd-shared/src/basic/mempool.c
index 46c449142c..46c449142c 100644
--- a/shared/systemd/src/basic/mempool.c
+++ b/src/libnm-systemd-shared/src/basic/mempool.c
diff --git a/shared/systemd/src/basic/mempool.h b/src/libnm-systemd-shared/src/basic/mempool.h
index 0fe2f2789c..0fe2f2789c 100644
--- a/shared/systemd/src/basic/mempool.h
+++ b/src/libnm-systemd-shared/src/basic/mempool.h
diff --git a/shared/systemd/src/basic/missing_fcntl.h b/src/libnm-systemd-shared/src/basic/missing_fcntl.h
index 00937d2af0..00937d2af0 100644
--- a/shared/systemd/src/basic/missing_fcntl.h
+++ b/src/libnm-systemd-shared/src/basic/missing_fcntl.h
diff --git a/shared/systemd/src/basic/missing_random.h b/src/libnm-systemd-shared/src/basic/missing_random.h
index 443b913685..443b913685 100644
--- a/shared/systemd/src/basic/missing_random.h
+++ b/src/libnm-systemd-shared/src/basic/missing_random.h
diff --git a/shared/systemd/src/basic/missing_socket.h b/src/libnm-systemd-shared/src/basic/missing_socket.h
index a4f6836fd4..a4f6836fd4 100644
--- a/shared/systemd/src/basic/missing_socket.h
+++ b/src/libnm-systemd-shared/src/basic/missing_socket.h
diff --git a/shared/systemd/src/basic/missing_stat.h b/src/libnm-systemd-shared/src/basic/missing_stat.h
index 9c1df69822..9c1df69822 100644
--- a/shared/systemd/src/basic/missing_stat.h
+++ b/src/libnm-systemd-shared/src/basic/missing_stat.h
diff --git a/shared/systemd/src/basic/missing_syscall.h b/src/libnm-systemd-shared/src/basic/missing_syscall.h
index 42d647535e..42d647535e 100644
--- a/shared/systemd/src/basic/missing_syscall.h
+++ b/src/libnm-systemd-shared/src/basic/missing_syscall.h
diff --git a/shared/systemd/src/basic/missing_type.h b/src/libnm-systemd-shared/src/basic/missing_type.h
index f6233090a9..f6233090a9 100644
--- a/shared/systemd/src/basic/missing_type.h
+++ b/src/libnm-systemd-shared/src/basic/missing_type.h
diff --git a/shared/systemd/src/basic/parse-util.c b/src/libnm-systemd-shared/src/basic/parse-util.c
index d53bf620af..d53bf620af 100644
--- a/shared/systemd/src/basic/parse-util.c
+++ b/src/libnm-systemd-shared/src/basic/parse-util.c
diff --git a/shared/systemd/src/basic/parse-util.h b/src/libnm-systemd-shared/src/basic/parse-util.h
index ba4e727e3e..ba4e727e3e 100644
--- a/shared/systemd/src/basic/parse-util.h
+++ b/src/libnm-systemd-shared/src/basic/parse-util.h
diff --git a/shared/systemd/src/basic/path-util.c b/src/libnm-systemd-shared/src/basic/path-util.c
index ea44c32bfc..ea44c32bfc 100644
--- a/shared/systemd/src/basic/path-util.c
+++ b/src/libnm-systemd-shared/src/basic/path-util.c
diff --git a/shared/systemd/src/basic/path-util.h b/src/libnm-systemd-shared/src/basic/path-util.h
index 988f058b5a..988f058b5a 100644
--- a/shared/systemd/src/basic/path-util.h
+++ b/src/libnm-systemd-shared/src/basic/path-util.h
diff --git a/shared/systemd/src/basic/prioq.c b/src/libnm-systemd-shared/src/basic/prioq.c
index 19a9bc57e8..19a9bc57e8 100644
--- a/shared/systemd/src/basic/prioq.c
+++ b/src/libnm-systemd-shared/src/basic/prioq.c
diff --git a/shared/systemd/src/basic/prioq.h b/src/libnm-systemd-shared/src/basic/prioq.h
index 951576c021..951576c021 100644
--- a/shared/systemd/src/basic/prioq.h
+++ b/src/libnm-systemd-shared/src/basic/prioq.h
diff --git a/shared/systemd/src/basic/process-util.c b/src/libnm-systemd-shared/src/basic/process-util.c
index 0e25b02001..0e25b02001 100644
--- a/shared/systemd/src/basic/process-util.c
+++ b/src/libnm-systemd-shared/src/basic/process-util.c
diff --git a/shared/systemd/src/basic/process-util.h b/src/libnm-systemd-shared/src/basic/process-util.h
index aab2c7a135..aab2c7a135 100644
--- a/shared/systemd/src/basic/process-util.h
+++ b/src/libnm-systemd-shared/src/basic/process-util.h
diff --git a/shared/systemd/src/basic/random-util.c b/src/libnm-systemd-shared/src/basic/random-util.c
index 4f67d9af18..4f67d9af18 100644
--- a/shared/systemd/src/basic/random-util.c
+++ b/src/libnm-systemd-shared/src/basic/random-util.c
diff --git a/shared/systemd/src/basic/random-util.h b/src/libnm-systemd-shared/src/basic/random-util.h
index f661fc093a..f661fc093a 100644
--- a/shared/systemd/src/basic/random-util.h
+++ b/src/libnm-systemd-shared/src/basic/random-util.h
diff --git a/shared/systemd/src/basic/ratelimit.c b/src/libnm-systemd-shared/src/basic/ratelimit.c
index 12c8324db0..12c8324db0 100644
--- a/shared/systemd/src/basic/ratelimit.c
+++ b/src/libnm-systemd-shared/src/basic/ratelimit.c
diff --git a/shared/systemd/src/basic/ratelimit.h b/src/libnm-systemd-shared/src/basic/ratelimit.h
index ee1d17c0e7..ee1d17c0e7 100644
--- a/shared/systemd/src/basic/ratelimit.h
+++ b/src/libnm-systemd-shared/src/basic/ratelimit.h
diff --git a/shared/systemd/src/basic/set.h b/src/libnm-systemd-shared/src/basic/set.h
index 57ff713039..57ff713039 100644
--- a/shared/systemd/src/basic/set.h
+++ b/src/libnm-systemd-shared/src/basic/set.h
diff --git a/shared/systemd/src/basic/signal-util.c b/src/libnm-systemd-shared/src/basic/signal-util.c
index 0c6f58184c..0c6f58184c 100644
--- a/shared/systemd/src/basic/signal-util.c
+++ b/src/libnm-systemd-shared/src/basic/signal-util.c
diff --git a/shared/systemd/src/basic/signal-util.h b/src/libnm-systemd-shared/src/basic/signal-util.h
index bdd39d429d..bdd39d429d 100644
--- a/shared/systemd/src/basic/signal-util.h
+++ b/src/libnm-systemd-shared/src/basic/signal-util.h
diff --git a/shared/systemd/src/basic/siphash24.h b/src/libnm-systemd-shared/src/basic/siphash24.h
index e46f3cc5be..e46f3cc5be 100644
--- a/shared/systemd/src/basic/siphash24.h
+++ b/src/libnm-systemd-shared/src/basic/siphash24.h
diff --git a/shared/systemd/src/basic/socket-util.c b/src/libnm-systemd-shared/src/basic/socket-util.c
index e224091dda..e224091dda 100644
--- a/shared/systemd/src/basic/socket-util.c
+++ b/src/libnm-systemd-shared/src/basic/socket-util.c
diff --git a/shared/systemd/src/basic/socket-util.h b/src/libnm-systemd-shared/src/basic/socket-util.h
index 1de069476a..1de069476a 100644
--- a/shared/systemd/src/basic/socket-util.h
+++ b/src/libnm-systemd-shared/src/basic/socket-util.h
diff --git a/shared/systemd/src/basic/sort-util.h b/src/libnm-systemd-shared/src/basic/sort-util.h
index a8984fc164..a8984fc164 100644
--- a/shared/systemd/src/basic/sort-util.h
+++ b/src/libnm-systemd-shared/src/basic/sort-util.h
diff --git a/shared/systemd/src/basic/sparse-endian.h b/src/libnm-systemd-shared/src/basic/sparse-endian.h
index 9583dda9e5..9583dda9e5 100644
--- a/shared/systemd/src/basic/sparse-endian.h
+++ b/src/libnm-systemd-shared/src/basic/sparse-endian.h
diff --git a/shared/systemd/src/basic/stat-util.c b/src/libnm-systemd-shared/src/basic/stat-util.c
index a98800960a..a98800960a 100644
--- a/shared/systemd/src/basic/stat-util.c
+++ b/src/libnm-systemd-shared/src/basic/stat-util.c
diff --git a/shared/systemd/src/basic/stat-util.h b/src/libnm-systemd-shared/src/basic/stat-util.h
index a566114f7c..a566114f7c 100644
--- a/shared/systemd/src/basic/stat-util.h
+++ b/src/libnm-systemd-shared/src/basic/stat-util.h
diff --git a/shared/systemd/src/basic/stdio-util.h b/src/libnm-systemd-shared/src/basic/stdio-util.h
index d45d3c1a62..d45d3c1a62 100644
--- a/shared/systemd/src/basic/stdio-util.h
+++ b/src/libnm-systemd-shared/src/basic/stdio-util.h
diff --git a/shared/systemd/src/basic/string-table.c b/src/libnm-systemd-shared/src/basic/string-table.c
index bd8047e6b9..bd8047e6b9 100644
--- a/shared/systemd/src/basic/string-table.c
+++ b/src/libnm-systemd-shared/src/basic/string-table.c
diff --git a/shared/systemd/src/basic/string-table.h b/src/libnm-systemd-shared/src/basic/string-table.h
index ae4ea145d3..ae4ea145d3 100644
--- a/shared/systemd/src/basic/string-table.h
+++ b/src/libnm-systemd-shared/src/basic/string-table.h
diff --git a/shared/systemd/src/basic/string-util.c b/src/libnm-systemd-shared/src/basic/string-util.c
index 744a3606a1..744a3606a1 100644
--- a/shared/systemd/src/basic/string-util.c
+++ b/src/libnm-systemd-shared/src/basic/string-util.c
diff --git a/shared/systemd/src/basic/string-util.h b/src/libnm-systemd-shared/src/basic/string-util.h
index 593cf04ae1..593cf04ae1 100644
--- a/shared/systemd/src/basic/string-util.h
+++ b/src/libnm-systemd-shared/src/basic/string-util.h
diff --git a/shared/systemd/src/basic/strv.c b/src/libnm-systemd-shared/src/basic/strv.c
index 7d3e3fc7ca..7d3e3fc7ca 100644
--- a/shared/systemd/src/basic/strv.c
+++ b/src/libnm-systemd-shared/src/basic/strv.c
diff --git a/shared/systemd/src/basic/strv.h b/src/libnm-systemd-shared/src/basic/strv.h
index 6b3e8e7f86..6b3e8e7f86 100644
--- a/shared/systemd/src/basic/strv.h
+++ b/src/libnm-systemd-shared/src/basic/strv.h
diff --git a/shared/systemd/src/basic/strxcpyx.c b/src/libnm-systemd-shared/src/basic/strxcpyx.c
index 39aebb8897..39aebb8897 100644
--- a/shared/systemd/src/basic/strxcpyx.c
+++ b/src/libnm-systemd-shared/src/basic/strxcpyx.c
diff --git a/shared/systemd/src/basic/strxcpyx.h b/src/libnm-systemd-shared/src/basic/strxcpyx.h
index cdef492db1..cdef492db1 100644
--- a/shared/systemd/src/basic/strxcpyx.h
+++ b/src/libnm-systemd-shared/src/basic/strxcpyx.h
diff --git a/shared/systemd/src/basic/time-util.c b/src/libnm-systemd-shared/src/basic/time-util.c
index e5faa33425..e5faa33425 100644
--- a/shared/systemd/src/basic/time-util.c
+++ b/src/libnm-systemd-shared/src/basic/time-util.c
diff --git a/shared/systemd/src/basic/time-util.h b/src/libnm-systemd-shared/src/basic/time-util.h
index 89ee8b4a96..89ee8b4a96 100644
--- a/shared/systemd/src/basic/time-util.h
+++ b/src/libnm-systemd-shared/src/basic/time-util.h
diff --git a/shared/systemd/src/basic/tmpfile-util.c b/src/libnm-systemd-shared/src/basic/tmpfile-util.c
index bbd6a1ede9..bbd6a1ede9 100644
--- a/shared/systemd/src/basic/tmpfile-util.c
+++ b/src/libnm-systemd-shared/src/basic/tmpfile-util.c
diff --git a/shared/systemd/src/basic/tmpfile-util.h b/src/libnm-systemd-shared/src/basic/tmpfile-util.h
index 45255fc062..45255fc062 100644
--- a/shared/systemd/src/basic/tmpfile-util.h
+++ b/src/libnm-systemd-shared/src/basic/tmpfile-util.h
diff --git a/shared/systemd/src/basic/umask-util.h b/src/libnm-systemd-shared/src/basic/umask-util.h
index bd7c2bdb8c..bd7c2bdb8c 100644
--- a/shared/systemd/src/basic/umask-util.h
+++ b/src/libnm-systemd-shared/src/basic/umask-util.h
diff --git a/shared/systemd/src/basic/user-util.h b/src/libnm-systemd-shared/src/basic/user-util.h
index 20ff415e2e..20ff415e2e 100644
--- a/shared/systemd/src/basic/user-util.h
+++ b/src/libnm-systemd-shared/src/basic/user-util.h
diff --git a/shared/systemd/src/basic/utf8.c b/src/libnm-systemd-shared/src/basic/utf8.c
index a7679bfa26..a7679bfa26 100644
--- a/shared/systemd/src/basic/utf8.c
+++ b/src/libnm-systemd-shared/src/basic/utf8.c
diff --git a/shared/systemd/src/basic/utf8.h b/src/libnm-systemd-shared/src/basic/utf8.h
index a6ea942c62..a6ea942c62 100644
--- a/shared/systemd/src/basic/utf8.h
+++ b/src/libnm-systemd-shared/src/basic/utf8.h
diff --git a/shared/systemd/src/basic/util.c b/src/libnm-systemd-shared/src/basic/util.c
index 10a5bcff98..10a5bcff98 100644
--- a/shared/systemd/src/basic/util.c
+++ b/src/libnm-systemd-shared/src/basic/util.c
diff --git a/shared/systemd/src/basic/util.h b/src/libnm-systemd-shared/src/basic/util.h
index 942d773ff1..942d773ff1 100644
--- a/shared/systemd/src/basic/util.h
+++ b/src/libnm-systemd-shared/src/basic/util.h
diff --git a/shared/systemd/src/shared/dns-domain.c b/src/libnm-systemd-shared/src/shared/dns-domain.c
index 95e4a93afd..95e4a93afd 100644
--- a/shared/systemd/src/shared/dns-domain.c
+++ b/src/libnm-systemd-shared/src/shared/dns-domain.c
diff --git a/shared/systemd/src/shared/dns-domain.h b/src/libnm-systemd-shared/src/shared/dns-domain.h
index 984f4840b6..984f4840b6 100644
--- a/shared/systemd/src/shared/dns-domain.h
+++ b/src/libnm-systemd-shared/src/shared/dns-domain.h
diff --git a/shared/systemd/src/shared/log-link.h b/src/libnm-systemd-shared/src/shared/log-link.h
index 3a4dcaa267..3a4dcaa267 100644
--- a/shared/systemd/src/shared/log-link.h
+++ b/src/libnm-systemd-shared/src/shared/log-link.h
diff --git a/shared/systemd/src/shared/web-util.c b/src/libnm-systemd-shared/src/shared/web-util.c
index 35ba1a2e83..35ba1a2e83 100644
--- a/shared/systemd/src/shared/web-util.c
+++ b/src/libnm-systemd-shared/src/shared/web-util.c
diff --git a/shared/systemd/src/shared/web-util.h b/src/libnm-systemd-shared/src/shared/web-util.h
index ec54669f50..ec54669f50 100644
--- a/shared/systemd/src/shared/web-util.h
+++ b/src/libnm-systemd-shared/src/shared/web-util.h
diff --git a/src/meson.build b/src/meson.build
index c4bcd14d63..b8fc19f1fb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,6 +2,7 @@
 
 src_inc = include_directories('.')
 
+subdir('libnm-systemd-shared')
 subdir('libnm-core-public')
 subdir('libnm-core-intern')
 subdir('libnm-core-aux-intern')