strv: Reduce transitive includes

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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;

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"

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"

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;

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

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"

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"

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"

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>
 

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"

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"

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"

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"

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>

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"

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) {

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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_");
+}

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);

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) {

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"

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"

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"

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"

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.

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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

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"

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"

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"

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"

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"

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"

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"

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"