diff --git a/src/analyze/analyze-calendar.c b/src/analyze/analyze-calendar.c
index b3afa1d4b0..21e7c79c80 100644
--- a/src/analyze/analyze-calendar.c
+++ b/src/analyze/analyze-calendar.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-calendar.h"
 #include "calendarspec.h"
diff --git a/src/analyze/analyze-chid.c b/src/analyze/analyze-chid.c
index 43ca408af0..01e49965f8 100644
--- a/src/analyze/analyze-chid.c
+++ b/src/analyze/analyze-chid.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-chid.h"
 #include "chid-fundamental.h"
diff --git a/src/analyze/analyze-dot.c b/src/analyze/analyze-dot.c
index b93bf4a9a5..4a87c0c1f1 100644
--- a/src/analyze/analyze-dot.c
+++ b/src/analyze/analyze-dot.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-dot.h"
 #include "bus-error.h"
diff --git a/src/analyze/analyze-fdstore.c b/src/analyze/analyze-fdstore.c
index 01ee241fc9..8eb09dbd15 100644
--- a/src/analyze/analyze-fdstore.c
+++ b/src/analyze/analyze-fdstore.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-fdstore.h"
 #include "bus-error.h"
diff --git a/src/analyze/analyze-filesystems.c b/src/analyze/analyze-filesystems.c
index 8ec542ec7a..4ba12ad3e3 100644
--- a/src/analyze/analyze-filesystems.c
+++ b/src/analyze/analyze-filesystems.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-filesystems.h"
 #include "fileio.h"
diff --git a/src/analyze/analyze-inspect-elf.c b/src/analyze/analyze-inspect-elf.c
index 0f78729c3a..df12f3b36f 100644
--- a/src/analyze/analyze-inspect-elf.c
+++ b/src/analyze/analyze-inspect-elf.c
@@ -2,6 +2,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-inspect-elf.h"
 #include "chase.h"
diff --git a/src/analyze/analyze-plot.c b/src/analyze/analyze-plot.c
index 0dc562b596..5e0df52aaf 100644
--- a/src/analyze/analyze-plot.c
+++ b/src/analyze/analyze-plot.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-plot.h"
 #include "analyze-time-data.h"
diff --git a/src/analyze/analyze-smbios11.c b/src/analyze/analyze-smbios11.c
index e9d82bbbd3..8deffe90f1 100644
--- a/src/analyze/analyze-smbios11.c
+++ b/src/analyze/analyze-smbios11.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-smbios11.h"
 #include "escape.h"
diff --git a/src/analyze/analyze-syscall-filter.c b/src/analyze/analyze-syscall-filter.c
index b9522ca49d..593d6afb20 100644
--- a/src/analyze/analyze-syscall-filter.c
+++ b/src/analyze/analyze-syscall-filter.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-syscall-filter.h"
 #include "fd-util.h"
diff --git a/src/analyze/analyze-time-data.c b/src/analyze/analyze-time-data.c
index 89198dff2d..ccc7dadbc1 100644
--- a/src/analyze/analyze-time-data.c
+++ b/src/analyze/analyze-time-data.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-time-data.h"
 #include "bus-error.h"
diff --git a/src/analyze/analyze-time.c b/src/analyze/analyze-time.c
index 8135112dec..390b1d8e7e 100644
--- a/src/analyze/analyze-time.c
+++ b/src/analyze/analyze-time.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-time.h"
 #include "analyze-time-data.h"
diff --git a/src/analyze/analyze-unit-files.c b/src/analyze/analyze-unit-files.c
index e0c4867c78..e00c157abc 100644
--- a/src/analyze/analyze-unit-files.c
+++ b/src/analyze/analyze-unit-files.c
@@ -1,5 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
+#include "alloc-util.h"
 #include "analyze.h"
 #include "analyze-unit-files.h"
 #include "path-lookup.h"
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 85db567a5b..552b03a0d0 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "conf-files.h"
 #include "constants.h"
diff --git a/src/basic/glyph-util.c b/src/basic/glyph-util.c
index 330872bad3..87944a13d4 100644
--- a/src/basic/glyph-util.c
+++ b/src/basic/glyph-util.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "env-util.h"
 #include "glyph-util.h"
 #include "locale-util.h"
diff --git a/src/basic/log-context.c b/src/basic/log-context.c
index 4ad0864ef7..8ab468ed9d 100644
--- a/src/basic/log-context.c
+++ b/src/basic/log-context.c
@@ -6,6 +6,7 @@
 #include "iovec-util.h"
 #include "log.h"
 #include "log-context.h"
+#include "string-util.h"
 #include "strv.h"
 
 static int saved_log_context_enabled = -1;
diff --git a/src/basic/log.c b/src/basic/log.c
index 3d2346f686..982b247326 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -21,6 +21,7 @@
 #include "argv-util.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "iovec-util.h"
diff --git a/src/basic/nulstr-util.c b/src/basic/nulstr-util.c
index 7097a2cc12..3a98c5e444 100644
--- a/src/basic/nulstr-util.c
+++ b/src/basic/nulstr-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "nulstr-util.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 76b86cbec8..67e3d4f4cc 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -405,6 +405,15 @@ int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags) {
         return n;
 }
 
+char** strv_split_newlines(const char *s) {
+        char **ret;
+
+        if (strv_split_newlines_full(&ret, s, 0) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;
@@ -440,6 +449,15 @@ int strv_split_full(char ***t, const char *s, const char *separators, ExtractFla
         return (int) n;
 }
 
+char** strv_split(const char *s, const char *separators) {
+        char **ret;
+
+        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
+                return NULL;
+
+        return ret;
+}
+
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags) {
         char **l;
         int r;
@@ -458,6 +476,10 @@ int strv_split_and_extend_full(char ***t, const char *s, const char *separators,
         return (int) strv_length(*t);
 }
 
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates) {
+        return strv_split_and_extend_full(t, s, separators, filter_duplicates, 0);
+}
+
 int strv_split_colon_pairs(char ***t, const char *s) {
         _cleanup_strv_free_ char **l = NULL;
         size_t n = 0;
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 0f2c251fe1..08bcaea8b9 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -1,17 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "alloc-util.h"
-#include "extract-word.h"
 #include "hashmap.h"
-#include "macro.h"
-#include "string-util.h"
+#include "memory-util.h"
+
+typedef enum ExtractFlags ExtractFlags;
 
 char* strv_find(char * const *l, const char *name) _pure_;
 char* strv_find_case(char * const *l, const char *name) _pure_;
@@ -113,27 +112,13 @@ static inline bool strv_isempty(char * const *l) {
 }
 
 int strv_split_full(char ***t, const char *s, const char *separators, ExtractFlags flags);
-static inline char** strv_split(const char *s, const char *separators) {
-        char **ret;
-
-        if (strv_split_full(&ret, s, separators, EXTRACT_RETAIN_ESCAPE) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split(const char *s, const char *separators);
 
 int strv_split_and_extend_full(char ***t, const char *s, const char *separators, bool filter_duplicates, ExtractFlags flags);
-#define strv_split_and_extend(t, s, sep, dup) strv_split_and_extend_full(t, s, sep, dup, 0)
+int strv_split_and_extend(char ***t, const char *s, const char *separators, bool filter_duplicates);
 
 int strv_split_newlines_full(char ***ret, const char *s, ExtractFlags flags);
-static inline char** strv_split_newlines(const char *s) {
-        char **ret;
-
-        if (strv_split_newlines_full(&ret, s, 0) < 0)
-                return NULL;
-
-        return ret;
-}
+char** strv_split_newlines(const char *s);
 
 /* Given a string containing white-space separated tuples of words themselves separated by ':',
  * returns a vector of strings. If the second element in a tuple is missing, the corresponding
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 6f1f17b77d..e59c8c2efe 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -27,6 +27,7 @@
 #include "devnum-util.h"
 #include "env-util.h"
 #include "errno-list.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 59fb371e9f..86c8d71a4a 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -13,6 +13,7 @@
 
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 96b8fb270c..eed4bac895 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -16,6 +16,7 @@
 #include "alloc-util.h"
 #include "chase.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c
index 1dcb869456..6021c1a5ae 100644
--- a/src/bootctl/bootctl-status.c
+++ b/src/bootctl/bootctl-status.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
diff --git a/src/core/apparmor-setup.c b/src/core/apparmor-setup.c
index a9621995ca..2dbb63e603 100644
--- a/src/core/apparmor-setup.c
+++ b/src/core/apparmor-setup.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "apparmor-setup.h"
 #include "apparmor-util.h"
 #include "errno-util.h"
diff --git a/src/core/ipe-setup.c b/src/core/ipe-setup.c
index b6ae89e03a..5cc8b9bccc 100644
--- a/src/core/ipe-setup.c
+++ b/src/core/ipe-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "conf-files.h"
 #include "copy.h"
 #include "fd-util.h"
@@ -8,6 +9,7 @@
 #include "log.h"
 #include "nulstr-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #define IPE_SECFS_DIR "/sys/kernel/security/ipe"
diff --git a/src/core/manager-dump.c b/src/core/manager-dump.c
index 9cb184b4d2..e781d19129 100644
--- a/src/core/manager-dump.c
+++ b/src/core/manager-dump.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "build.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/core/taint.c b/src/core/taint.c
index 541d1bd133..a6b220455c 100644
--- a/src/core/taint.c
+++ b/src/core/taint.c
@@ -11,6 +11,7 @@
 #include "log.h"
 #include "os-util.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "taint.h"
 #include "uid-range.h"
diff --git a/src/core/unit.c b/src/core/unit.c
index 6eda7b64aa..d057b8ddc9 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <fnmatch.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <unistd.h>
diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index fd57f11f76..51e9b70591 100644
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -19,6 +19,7 @@
 #include "devnum-util.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "libfido2-util.h"
 #include "main-func.h"
diff --git a/src/cryptsetup/cryptsetup-keyfile.c b/src/cryptsetup/cryptsetup-keyfile.c
index 348e42b3f7..d513f5d0a9 100644
--- a/src/cryptsetup/cryptsetup-keyfile.c
+++ b/src/cryptsetup/cryptsetup-keyfile.c
@@ -4,6 +4,7 @@
 #include "fileio.h"
 #include "log.h"
 #include "path-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 int find_key_file(const char *key_file, char **search_path, const char *bindname, struct iovec *ret_key) {
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index c591cbeeeb..f873305637 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -26,6 +26,7 @@
 #include "efi-loader.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "fstab-util.h"
diff --git a/src/delta/delta.c b/src/delta/delta.c
index eb53999da9..a6c0a7c1f3 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -10,6 +10,7 @@
 #include "chase.h"
 #include "dirent-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"
diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 6ac292f140..09cc90cf02 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -22,6 +22,7 @@
 #include "dissect-image.h"
 #include "env-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 31c4c485c0..9f4162023b 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -14,6 +14,7 @@
 #include "creds-util.h"
 #include "efi-loader.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fstab-util.h"
diff --git a/src/fuzz/fuzz-bootspec.c b/src/fuzz/fuzz-bootspec.c
index 561deb5977..e3adb394f7 100644
--- a/src/fuzz/fuzz-bootspec.c
+++ b/src/fuzz/fuzz-bootspec.c
@@ -4,6 +4,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "bootspec.h"
 #include "env-util.h"
 #include "escape.h"
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 10e50f20ad..3f00810164 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "creds-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
diff --git a/src/home/home-util.c b/src/home/home-util.c
index cb96a7ab4e..2e5343f096 100644
--- a/src/home/home-util.c
+++ b/src/home/home-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "home-util.h"
diff --git a/src/home/homectl-fido2.c b/src/home/homectl-fido2.c
index f462787595..772edcf95b 100644
--- a/src/home/homectl-fido2.c
+++ b/src/home/homectl-fido2.c
@@ -19,6 +19,7 @@
 #include "log.h"
 #include "memory-util.h"
 #include "random-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_LIBFIDO2
diff --git a/src/home/homectl.c b/src/home/homectl.c
index 077fe8076a..8c22066652 100644
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -18,6 +18,7 @@
 #include "dirent-util.h"
 #include "dns-domain.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
diff --git a/src/home/homed-bus.c b/src/home/homed-bus.c
index 74f1fd702f..5ea50ca66c 100644
--- a/src/home/homed-bus.c
+++ b/src/home/homed-bus.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "home-util.h"
 #include "homed-bus.h"
diff --git a/src/home/homed-home-bus.c b/src/home/homed-home-bus.c
index d7cbb7b883..732f6d5e9a 100644
--- a/src/home/homed-home-bus.c
+++ b/src/home/homed-home-bus.c
@@ -2,6 +2,7 @@
 
 #include <linux/capability.h>
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-polkit.h"
 #include "fd-util.h"
diff --git a/src/home/homed-operation.c b/src/home/homed-operation.c
index a0ce239615..ba6e602828 100644
--- a/src/home/homed-operation.c
+++ b/src/home/homed-operation.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "fd-util.h"
 #include "homed-operation.h"
 #include "log.h"
diff --git a/src/home/homework-password-cache.c b/src/home/homework-password-cache.c
index 107a1db379..5ffe717e2e 100644
--- a/src/home/homework-password-cache.c
+++ b/src/home/homework-password-cache.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "homework-password-cache.h"
 #include "keyring-util.h"
 #include "log.h"
diff --git a/src/home/homework-pkcs11.c b/src/home/homework-pkcs11.c
index b1b76015b0..42e4976bfb 100644
--- a/src/home/homework-pkcs11.c
+++ b/src/home/homework-pkcs11.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "hexdecoct.h"
 #include "homework-pkcs11.h"
 #include "log.h"
diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c
index f32d2fb282..3bf6ffbae8 100644
--- a/src/home/pam_systemd_home.c
+++ b/src/home/pam_systemd_home.c
@@ -6,6 +6,7 @@
 
 #include "sd-bus.h"
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "bus-locator.h"
 #include "bus-util.h"
diff --git a/src/home/user-record-password-quality.c b/src/home/user-record-password-quality.c
index c60b5f0ea4..4e480b16d2 100644
--- a/src/home/user-record-password-quality.c
+++ b/src/home/user-record-password-quality.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-common-errors.h"
 #include "errno-util.h"
 #include "home-util.h"
diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c
index 7468a72512..13c7675faf 100644
--- a/src/home/user-record-util.c
+++ b/src/home/user-record-util.c
@@ -4,6 +4,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "home-util.h"
diff --git a/src/import/import-generator.c b/src/import/import-generator.c
index ad81b72355..bee4d7262f 100644
--- a/src/import/import-generator.c
+++ b/src/import/import-generator.c
@@ -5,6 +5,7 @@
 #include "creds-util.h"
 #include "discover-image.h"
 #include "efivars.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"
diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index ba7ec5a310..7e739be594 100644
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -2,6 +2,7 @@
 
 #include "sd-device.h"
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "devnum-util.h"
 #include "fileio.h"
diff --git a/src/journal/journalctl-util.c b/src/journal/journalctl-util.c
index 6f393f3ffd..0e85c520ca 100644
--- a/src/journal/journalctl-util.c
+++ b/src/journal/journalctl-util.c
@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "glob-util.h"
 #include "id128-util.h"
 #include "journal-util.h"
diff --git a/src/journal/journald-client.c b/src/journal/journald-client.c
index 771b51b9c1..25c6401b8f 100644
--- a/src/journal/journald-client.c
+++ b/src/journal/journald-client.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "cgroup-util.h"
 #include "errno-util.h"
 #include "journald-client.h"
diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 0a62d994bc..3774a129c4 100644
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -13,6 +13,7 @@
 #include "env-file.h"
 #include "env-util.h"
 #include "exec-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "find-esp.h"
diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c
index ef06573d15..fc6d6440be 100644
--- a/src/libsystemd-network/sd-dns-resolver.c
+++ b/src/libsystemd-network/sd-dns-resolver.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-resolver-internal.h"
 #include "log.h"
 #include "macro.h"
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index e867859bbe..b7635a60b6 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -16,6 +16,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"
diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index b72a2463da..d2faff4ae3 100644
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "sd-device.h"
diff --git a/src/libsystemd/sd-device/device-filter.c b/src/libsystemd/sd-device/device-filter.c
index 579c944015..bf7d4d4be5 100644
--- a/src/libsystemd/sd-device/device-filter.c
+++ b/src/libsystemd/sd-device/device-filter.c
@@ -2,6 +2,7 @@
 
 #include <fnmatch.h>
 
+#include "alloc-util.h"
 #include "device-filter.h"
 #include "path-util.h"
 #include "strv.h"
diff --git a/src/libsystemd/sd-device/device-util.c b/src/libsystemd/sd-device/device-util.c
index 123629c356..b6887217fc 100644
--- a/src/libsystemd/sd-device/device-util.c
+++ b/src/libsystemd/sd-device/device-util.c
@@ -148,3 +148,23 @@ bool device_is_devtype(sd_device *device, const char *devtype) {
         (void) sd_device_get_devtype(device, &s);
         return streq_ptr(s, devtype);
 }
+
+bool device_property_can_set(const char *property) {
+        return property &&
+                !STR_IN_SET(property,
+                            /* basic properties set by kernel, only in netlink event */
+                            "ACTION", "SEQNUM", "SYNTH_UUID",
+                            /* basic properties set by kernel, both in netlink event and uevent file */
+                            "DEVPATH", "DEVPATH_OLD", "SUBSYSTEM", "DEVTYPE", "DRIVER", "MODALIAS",
+                            /* device node */
+                            "DEVNAME", "DEVMODE", "DEVUID", "DEVGID", "MAJOR", "MINOR",
+                            /* block device */
+                            "DISKSEQ", "PARTN",
+                            /* network interface (INTERFACE_OLD is set by udevd) */
+                            "IFINDEX", "INTERFACE", "INTERFACE_OLD",
+                            /* basic properties set by udevd */
+                            "DEVLINKS", "TAGS", "CURRENT_TAGS", "USEC_INITIALIZED", "UDEV_DATABASE_VERSION") &&
+                /* Similar to SYNTH_UUID, but set based on KEY=VALUE arguments passed by userspace.
+                 * See kernel's f36776fafbaa0094390dd4e7e3e29805e0b82730 (v4.13) */
+                !startswith(property, "SYNTH_ARG_");
+}
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h
index 070e564a52..6756f22596 100644
--- a/src/libsystemd/sd-device/device-util.h
+++ b/src/libsystemd/sd-device/device-util.h
@@ -107,22 +107,4 @@ char** device_make_log_fields(sd_device *device);
 bool device_in_subsystem(sd_device *device, const char *subsystem);
 bool device_is_devtype(sd_device *device, const char *devtype);
 
-static inline bool device_property_can_set(const char *property) {
-        return property &&
-                !STR_IN_SET(property,
-                            /* basic properties set by kernel, only in netlink event */
-                            "ACTION", "SEQNUM", "SYNTH_UUID",
-                            /* basic properties set by kernel, both in netlink event and uevent file */
-                            "DEVPATH", "DEVPATH_OLD", "SUBSYSTEM", "DEVTYPE", "DRIVER", "MODALIAS",
-                            /* device node */
-                            "DEVNAME", "DEVMODE", "DEVUID", "DEVGID", "MAJOR", "MINOR",
-                            /* block device */
-                            "DISKSEQ", "PARTN",
-                            /* network interface (INTERFACE_OLD is set by udevd) */
-                            "IFINDEX", "INTERFACE", "INTERFACE_OLD",
-                            /* basic properties set by udevd */
-                            "DEVLINKS", "TAGS", "CURRENT_TAGS", "USEC_INITIALIZED", "UDEV_DATABASE_VERSION") &&
-                /* Similar to SYNTH_UUID, but set based on KEY=VALUE arguments passed by userspace.
-                 * See kernel's f36776fafbaa0094390dd4e7e3e29805e0b82730 (v4.13) */
-                !startswith(property, "SYNTH_ARG_");
-}
+bool device_property_can_set(const char *property);
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 25c6e44a77..30b3d04140 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "network-util.h"
 #include "string-table.h"
+#include "string-util.h"
 #include "strv.h"
 
 bool network_is_online(void) {
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index a4b432b6ee..60213c2fcf 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "env-file.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "inotify-util.h"
diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c
index 06062783d7..3acb5a0eb6 100644
--- a/src/libsystemd/sd-varlink/sd-varlink-idl.c
+++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c
@@ -2,6 +2,7 @@
 
 #include "sd-varlink-idl.h"
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "json-util.h"
 #include "log.h"
diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index bc0b2b9878..067d094020 100644
--- a/src/locale/localed-util.c
+++ b/src/locale/localed-util.c
@@ -5,11 +5,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "copy.h"
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"
diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
index 7b1fd1b148..d0533fc0e2 100644
--- a/src/login/pam_systemd.c
+++ b/src/login/pam_systemd.c
@@ -34,6 +34,7 @@
 #include "creds-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
diff --git a/src/login/pam_systemd_loadkey.c b/src/login/pam_systemd_loadkey.c
index eaaff971da..cc20820851 100644
--- a/src/login/pam_systemd_loadkey.c
+++ b/src/login/pam_systemd_loadkey.c
@@ -13,6 +13,7 @@
 #include "missing_syscall.h"
 #include "nulstr-util.h"
 #include "pam-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 /* By default, this module retrieves the key stored by systemd-cryptsetup.
diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index ab3d2d8860..eb66038c37 100644
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"
diff --git a/src/network/networkctl-config-file.c b/src/network/networkctl-config-file.c
index 7a57b3ff29..776aa5638d 100644
--- a/src/network/networkctl-config-file.c
+++ b/src/network/networkctl-config-file.c
@@ -7,12 +7,14 @@
 #include "sd-netlink.h"
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
 #include "bus-wait-for-jobs.h"
 #include "conf-files.h"
 #include "edit-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "mkdir-label.h"
 #include "netlink-util.h"
diff --git a/src/network/networkctl-dump-util.c b/src/network/networkctl-dump-util.c
index ba554ae041..a174f87272 100644
--- a/src/network/networkctl-dump-util.c
+++ b/src/network/networkctl-dump-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "format-ifname.h"
 #include "in-addr-util.h"
 #include "local-addresses.h"
diff --git a/src/network/networkctl-status-link.c b/src/network/networkctl-status-link.c
index ac8b067fcd..8e504a4c9b 100644
--- a/src/network/networkctl-status-link.c
+++ b/src/network/networkctl-status-link.c
@@ -9,6 +9,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "format-util.h"
 #include "geneve-util.h"
 #include "glyph-util.h"
diff --git a/src/network/networkctl-status-system.c b/src/network/networkctl-status-system.c
index a607e89264..dcd0458677 100644
--- a/src/network/networkctl-status-system.c
+++ b/src/network/networkctl-status-system.c
@@ -2,6 +2,7 @@
 
 #include "sd-network.h"
 
+#include "alloc-util.h"
 #include "fs-util.h"
 #include "glyph-util.h"
 #include "log.h"
diff --git a/src/network/networkctl-util.c b/src/network/networkctl-util.c
index 68499fc529..08cceb44e8 100644
--- a/src/network/networkctl-util.c
+++ b/src/network/networkctl-util.c
@@ -3,6 +3,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "ansi-color.h"
 #include "log.h"
 #include "networkctl.h"
diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
index bb5969c425..d142ec5803 100644
--- a/src/nspawn/nspawn-bind-user.c
+++ b/src/nspawn/nspawn-bind-user.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index bd6c9f1fc5..cb0ebd3225 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -15,6 +15,7 @@
 #include "device-private.h"
 #include "device-util.h"
 #include "ether-addr-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "hexdecoct.h"
 #include "lock-util.h"
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 950582b225..51db3cade3 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "constants.h"
 #include "errno.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"
diff --git a/src/nss-systemd/nss-systemd.c b/src/nss-systemd/nss-systemd.c
index 474b8d45cf..7b9908b89e 100644
--- a/src/nss-systemd/nss-systemd.c
+++ b/src/nss-systemd/nss-systemd.c
@@ -5,6 +5,7 @@
 #include <string.h>
 #include <threads.h>
 
+#include "alloc-util.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
diff --git a/src/resolve/resolved-util.c b/src/resolve/resolved-util.c
index 003f07a6d5..8b7f0ed44a 100644
--- a/src/resolve/resolved-util.c
+++ b/src/resolve/resolved-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "dns-def.h"
 #include "dns-domain.h"
 #include "hostname-setup.h"
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 3c9fe0d45c..db3341d083 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -8,6 +8,7 @@
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "string-util.h"
 #include "strv.h"
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 467fce9d6b..15021ae251 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "bootspec.h"
diff --git a/src/shared/bus-object.c b/src/shared/bus-object.c
index 44984a4504..1fa97a1ff2 100644
--- a/src/shared/bus-object.c
+++ b/src/shared/bus-object.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-introspect.h"
 #include "bus-object.h"
 #include "log.h"
diff --git a/src/shared/bus-print-properties.c b/src/shared/bus-print-properties.c
index 88e83497d3..9ac6ddb3a9 100644
--- a/src/shared/bus-print-properties.c
+++ b/src/shared/bus-print-properties.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-print-properties.h"
 #include "cap-list.h"
 #include "cgroup-util.h"
diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index 260b84ada0..8cb2d8ded4 100644
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
 #include "bus-wait-for-units.h"
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 1e90cc2a1c..f4afa746d5 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "clean-ipc.h"
 #include "dirent-util.h"
 #include "fd-util.h"
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index db7cbd44b3..7d04e23cd2 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -4,6 +4,7 @@
 #include <valgrind/memcheck.h>
 #endif
 
+#include <fnmatch.h>
 #include <linux/dm-ioctl.h>
 #include <linux/loop.h>
 #include <sys/file.h>
@@ -43,6 +44,7 @@
 #include "env-file.h"
 #include "env-util.h"
 #include "extension-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
diff --git a/src/shared/fdisk-util.c b/src/shared/fdisk-util.c
index 3414572c31..bca81b30a0 100644
--- a/src/shared/fdisk-util.c
+++ b/src/shared/fdisk-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "dissect-image.h"
 #include "extract-word.h"
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index b59e4838d8..82458536c5 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -7,6 +7,7 @@
 #include "alloc-util.h"
 #include "device-nodes.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fstab-util.h"
 #include "initrd-util.h"
 #include "libmount-util.h"
diff --git a/src/shared/group-record.c b/src/shared/group-record.c
index 36dc1397df..f7dd3b73a4 100644
--- a/src/shared/group-record.c
+++ b/src/shared/group-record.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "group-record.h"
 #include "json-util.h"
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index d62e803a37..501338f188 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "format-util.h"
 #include "install.h"
 #include "install-printf.h"
diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index 9fea61ff82..73c582475e 100644
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "acl-util.h"
+#include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
diff --git a/src/shared/kbd-util.c b/src/shared/kbd-util.c
index fa06d8a965..84031df784 100644
--- a/src/shared/kbd-util.c
+++ b/src/shared/kbd-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "kbd-util.h"
diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c
index 4e65b13548..f01b0016d4 100644
--- a/src/shared/libfido2-util.c
+++ b/src/shared/libfido2-util.c
@@ -12,6 +12,7 @@
 #include "glyph-util.h"
 #include "memory-util.h"
 #include "plymouth-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unistd.h"
 
diff --git a/src/shared/locale-setup.c b/src/shared/locale-setup.c
index f3a10c5d82..3f23741bd7 100644
--- a/src/shared/locale-setup.c
+++ b/src/shared/locale-setup.c
@@ -3,6 +3,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "env-file.h"
 #include "env-file-label.h"
 #include "env-util.h"
diff --git a/src/shared/net-condition.c b/src/shared/net-condition.c
index d8b0fef322..9c55be0526 100644
--- a/src/shared/net-condition.c
+++ b/src/shared/net-condition.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <netinet/ether.h>
 
 #include "condition.h"
diff --git a/src/shared/password-quality-util-pwquality.c b/src/shared/password-quality-util-pwquality.c
index 30d15fd45e..f4aabd3510 100644
--- a/src/shared/password-quality-util-pwquality.c
+++ b/src/shared/password-quality-util-pwquality.c
@@ -2,12 +2,14 @@
 
 #include <unistd.h>
 
+#include "alloc-util.h"
 #include "dlfcn-util.h"
 #include "errno-util.h"
 #include "log.h"
 #include "macro.h"
 #include "memory-util.h"
 #include "password-quality-util.h"
+#include "string-util.h"
 #include "strv.h"
 
 #if HAVE_PWQUALITY
diff --git a/src/shared/pcrextend-util.c b/src/shared/pcrextend-util.c
index 6e1f0f04f2..dcd9b4ce91 100644
--- a/src/shared/pcrextend-util.c
+++ b/src/shared/pcrextend-util.c
@@ -2,6 +2,7 @@
 
 #include "sd-device.h"
 
+#include "alloc-util.h"
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "chase.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 947ef582bd..53f90aae27 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -8,6 +8,7 @@
 #include "device-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hibernate-util.h"
diff --git a/src/shared/tests.h b/src/shared/tests.h
index b19bad4395..19a8dd033f 100644
--- a/src/shared/tests.h
+++ b/src/shared/tests.h
@@ -9,6 +9,7 @@
 
 #include "argv-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "log.h"
 #include "macro.h"
 #include "process-util.h"
diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index 83a8c45032..c0f695b9bb 100644
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -2,6 +2,7 @@
 
 #include "sd-id128.h"
 
+#include "alloc-util.h"
 #include "chase.h"
 #include "dirent-util.h"
 #include "fd-util.h"
diff --git a/src/shared/user-record-nss.c b/src/shared/user-record-nss.c
index 5d8ce765e8..404003d18e 100644
--- a/src/shared/user-record-nss.c
+++ b/src/shared/user-record-nss.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "format-util.h"
 #include "libcrypt-util.h"
diff --git a/src/shared/user-record.c b/src/shared/user-record.c
index 10b0504898..2dd590110e 100644
--- a/src/shared/user-record.c
+++ b/src/shared/user-record.c
@@ -2,6 +2,7 @@
 
 #include <sys/mount.h>
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "cap-list.h"
 #include "cgroup-util.h"
diff --git a/src/shared/userdb-dropin.c b/src/shared/userdb-dropin.c
index 20c89bb573..176cdddaaf 100644
--- a/src/shared/userdb-dropin.c
+++ b/src/shared/userdb-dropin.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 69d4ddf485..210aab641e 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -4,6 +4,7 @@
 
 #include "sd-varlink.h"
 
+#include "alloc-util.h"
 #include "bitfield.h"
 #include "conf-files.h"
 #include "dirent-util.h"
diff --git a/src/shared/varlink-io.systemd.service.c b/src/shared/varlink-io.systemd.service.c
index d130f0df51..21c44a96b7 100644
--- a/src/shared/varlink-io.systemd.service.c
+++ b/src/shared/varlink-io.systemd.service.c
@@ -5,6 +5,7 @@
 #include "env-util.h"
 #include "json-util.h"
 #include "log.h"
+#include "string-util.h"
 #include "strv.h"
 #include "utf8.h"
 #include "varlink-io.systemd.service.h"
diff --git a/src/shared/vconsole-util.c b/src/shared/vconsole-util.c
index 9451db8404..4b722faeab 100644
--- a/src/shared/vconsole-util.c
+++ b/src/shared/vconsole-util.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "alloc-util.h"
 #include "env-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "kbd-util.h"
diff --git a/src/shared/verb-log-control.c b/src/shared/verb-log-control.c
index 555fb9ff7c..d6748f7492 100644
--- a/src/shared/verb-log-control.c
+++ b/src/shared/verb-log-control.c
@@ -3,6 +3,7 @@
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "log.h"
+#include "string-util.h"
 #include "strv.h"
 #include "syslog-util.h"
 #include "verb-log-control.h"
diff --git a/src/shared/vpick.c b/src/shared/vpick.c
index ccde661ca5..9aa1bc6d58 100644
--- a/src/shared/vpick.c
+++ b/src/shared/vpick.c
@@ -2,6 +2,7 @@
 
 #include <sys/stat.h>
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "bitfield.h"
 #include "chase.h"
diff --git a/src/shared/wall.c b/src/shared/wall.c
index eed7c652dd..f936ba97d9 100644
--- a/src/shared/wall.c
+++ b/src/shared/wall.c
@@ -6,6 +6,7 @@
 
 #include "sd-login.h"
 
+#include "alloc-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "hostname-setup.h"
diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c
index 815eb158e8..f00ff25ab2 100644
--- a/src/shared/watchdog.c
+++ b/src/shared/watchdog.c
@@ -9,6 +9,7 @@
 
 #include "sd-messages.h"
 
+#include "alloc-util.h"
 #include "devnum-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index 8e15608f14..99ceeb667a 100644
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -16,6 +16,7 @@
 #include "socket-netlink.h"
 #include "socket-util.h"
 #include "special.h"
+#include "string-util.h"
 #include "virt.h"
 
 /* A small generator binding potentially five or more SSH sockets:
diff --git a/src/systemctl/systemctl-list-jobs.c b/src/systemctl/systemctl-list-jobs.c
index 6420365bad..80696aabf3 100644
--- a/src/systemctl/systemctl-list-jobs.c
+++ b/src/systemctl/systemctl-list-jobs.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/systemctl/systemctl-list-machines.c b/src/systemctl/systemctl-list-machines.c
index cc053504a0..25c7c6f357 100644
--- a/src/systemctl/systemctl-list-machines.c
+++ b/src/systemctl/systemctl-list-machines.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "sd-login.h"
diff --git a/src/systemctl/systemctl-list-unit-files.c b/src/systemctl/systemctl-list-unit-files.c
index 40e0b46cfc..2b6f9ddd2d 100644
--- a/src/systemctl/systemctl-list-unit-files.c
+++ b/src/systemctl/systemctl-list-unit-files.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "ansi-color.h"
 #include "bus-error.h"
 #include "bus-locator.h"
diff --git a/src/systemctl/systemctl-mount.c b/src/systemctl/systemctl-mount.c
index 6b51983fe9..9a44fe158d 100644
--- a/src/systemctl/systemctl-mount.c
+++ b/src/systemctl/systemctl-mount.c
@@ -3,6 +3,7 @@
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "dissect-image.h"
+#include "extract-word.h"
 #include "systemctl.h"
 #include "systemctl-mount.h"
 #include "systemctl-util.h"
diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 9a3944fcf6..f81ca267ad 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <sys/reboot.h>
 #include <unistd.h>
 
diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c
index bd54c398eb..0247864eca 100644
--- a/src/sysupdate/sysupdate-transfer.c
+++ b/src/sysupdate/sysupdate-transfer.c
@@ -9,6 +9,7 @@
 #include "conf-parser.h"
 #include "dirent-util.h"
 #include "event-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "glyph-util.h"
 #include "gpt.h"
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index ef476280fa..5ba680d571 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <linux/prctl.h>
 #include <stdio.h>
 #include <sys/mount.h>
diff --git a/src/test/test-hostname-setup.c b/src/test/test-hostname-setup.c
index 9348313984..fbb7de3689 100644
--- a/src/test/test-hostname-setup.c
+++ b/src/test/test-hostname-setup.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 63d30afe8f..7c06e06bb4 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
+
 #include "alloc-util.h"
 #include "escape.h"
 #include "string-util.h"
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index b5e6f23c1b..b598eb8bc0 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <fnmatch.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/udev/iocost/iocost.c b/src/udev/iocost/iocost.c
index 2b2633e3c2..2598975cae 100644
--- a/src/udev/iocost/iocost.c
+++ b/src/udev/iocost/iocost.c
@@ -16,6 +16,7 @@
 #include "main-func.h"
 #include "path-util.h"
 #include "pretty-print.h"
+#include "string-util.h"
 #include "udev-util.h"
 #include "verbs.h"
 
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 692b244cb8..103e4a39db 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -6,6 +6,7 @@
 #include "bitfield.h"
 #include "device-private.h"
 #include "device-util.h"
+#include "extract-word.h"
 #include "string-util.h"
 #include "strv.h"
 #include "udev-builtin.h"
diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 69465984e0..506b49aa21 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
 #include <ctype.h>
+#include <fnmatch.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
@@ -12,6 +13,7 @@
 #include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
diff --git a/src/udev/udev-spawn.c b/src/udev/udev-spawn.c
index 62db775250..0e3ff2e104 100644
--- a/src/udev/udev-spawn.c
+++ b/src/udev/udev-spawn.c
@@ -7,6 +7,7 @@
 #include "device-util.h"
 #include "event-util.h"
 #include "exec-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "path-util.h"
 #include "process-util.h"
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 9735632704..c8cdb17ab2 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -20,6 +20,7 @@
 #include "devnum-util.h"
 #include "dirent-util.h"
 #include "errno-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "glyph-util.h"
diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 35bf5fffb7..8f808b33e1 100644
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -9,6 +9,7 @@
 #include "alloc-util.h"
 #include "argv-util.h"
 #include "cryptsetup-util.h"
+#include "extract-word.h"
 #include "fileio.h"
 #include "fstab-util.h"
 #include "hexdecoct.h"
diff --git a/src/vmspawn/vmspawn-util.c b/src/vmspawn/vmspawn-util.c
index 5700a0c893..3fb8f8405b 100644
--- a/src/vmspawn/vmspawn-util.c
+++ b/src/vmspawn/vmspawn-util.c
@@ -6,6 +6,7 @@
 
 #include "sd-json.h"
 
+#include "alloc-util.h"
 #include "architecture.h"
 #include "conf-files.h"
 #include "errno-util.h"
diff --git a/src/xdg-autostart-generator/xdg-autostart-condition.c b/src/xdg-autostart-generator/xdg-autostart-condition.c
index 2f0710060a..b822ab5aab 100644
--- a/src/xdg-autostart-generator/xdg-autostart-condition.c
+++ b/src/xdg-autostart-generator/xdg-autostart-condition.c
@@ -2,6 +2,7 @@
 
 #include "log.h"
 #include "main-func.h"
+#include "string-util.h"
 #include "strv.h"
 
 /*
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c
index a00b9d3063..23c6fb01ef 100644
--- a/src/xdg-autostart-generator/xdg-autostart-service.c
+++ b/src/xdg-autostart-generator/xdg-autostart-service.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
+#include <fnmatch.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include "conf-parser.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "generator.h"