From 1403faeb152e24ef74230891cc6bf1875292324f Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 19 Sep 2025 11:29:36 +0200 Subject: [PATCH 1/3] tree-wide: Fix two curl warnings --- src/import/pull-job.c | 2 +- src/journal-remote/journal-upload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/import/pull-job.c b/src/import/pull-job.c index a0b0ef5406..b457c39ed1 100644 --- a/src/import/pull-job.c +++ b/src/import/pull-job.c @@ -759,7 +759,7 @@ int pull_job_begin(PullJob *j) { if (curl_easy_setopt(j->curl, CURLOPT_XFERINFODATA, j) != CURLE_OK) return -EIO; - if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0) != CURLE_OK) + if (curl_easy_setopt(j->curl, CURLOPT_NOPROGRESS, 0L) != CURLE_OK) return -EIO; r = curl_glue_add(j->glue, j->curl); diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index d669d27274..05f0dad038 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -308,7 +308,7 @@ int start_upload(Uploader *u, } if (STRPTR_IN_SET(arg_trust, "-", "all")) - easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0, + easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L, LOG_ERR, return -EUCLEAN); else if (arg_trust || startswith(u->url, "https://")) easy_setopt(curl, CURLOPT_CAINFO, arg_trust ?: TRUST_FILE, From 3111327ca4a537454e40dae2a484c043bb89f7f7 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 19 Sep 2025 11:30:12 +0200 Subject: [PATCH 2/3] include: Add missing IWYU pragmas --- src/include/override/fcntl.h | 2 +- src/include/override/malloc.h | 2 +- src/include/override/sched.h | 2 +- src/include/override/signal.h | 2 +- src/include/override/sys/mman.h | 2 +- src/include/override/sys/pidfd.h | 2 +- src/include/override/sys/quota.h | 2 +- src/include/override/sys/random.h | 2 +- src/include/override/sys/socket.h | 2 +- src/include/override/sys/stat.h | 2 +- src/include/override/sys/syscall.h | 2 +- src/include/override/sys/wait.h | 2 +- src/include/override/sys/xattr.h | 4 ++-- src/include/override/unistd.h | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/include/override/fcntl.h b/src/include/override/fcntl.h index 5f1d90ad79..f2b40a6a17 100644 --- a/src/include/override/fcntl.h +++ b/src/include/override/fcntl.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ /* This is defined since glibc-2.41. */ #ifndef F_DUPFD_QUERY diff --git a/src/include/override/malloc.h b/src/include/override/malloc.h index d0080b6cbc..fff5cd6155 100644 --- a/src/include/override/malloc.h +++ b/src/include/override/malloc.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #if !HAVE_MALLINFO2 struct mallinfo2 { diff --git a/src/include/override/sched.h b/src/include/override/sched.h index f2748b1608..1810f52e3d 100644 --- a/src/include/override/sched.h +++ b/src/include/override/sched.h @@ -6,7 +6,7 @@ * Note, this must be included before sched.h, otherwise the headers conflict with each other. */ #include -#include_next +#include_next /* IWYU pragma: export */ #include diff --git a/src/include/override/signal.h b/src/include/override/signal.h index 83aa18dc8f..436b49a519 100644 --- a/src/include/override/signal.h +++ b/src/include/override/signal.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #if !HAVE_RT_TGSIGQUEUEINFO int missing_rt_tgsigqueueinfo(pid_t tgid, pid_t tid, int sig, siginfo_t *info); diff --git a/src/include/override/sys/mman.h b/src/include/override/sys/mman.h index 68623df789..30ef92b835 100644 --- a/src/include/override/sys/mman.h +++ b/src/include/override/sys/mman.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #include diff --git a/src/include/override/sys/pidfd.h b/src/include/override/sys/pidfd.h index 69eb2eaff9..9632afc95f 100644 --- a/src/include/override/sys/pidfd.h +++ b/src/include/override/sys/pidfd.h @@ -3,7 +3,7 @@ /* since glibc-2.36 */ #if HAVE_PIDFD_OPEN -#include_next +#include_next /* IWYU pragma: export */ #endif #include diff --git a/src/include/override/sys/quota.h b/src/include/override/sys/quota.h index 481dbaba21..fcf6be988b 100644 --- a/src/include/override/sys/quota.h +++ b/src/include/override/sys/quota.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ /* Supported since kernel v5.14 (64c2c2c62f92339b176ea24403d8db16db36f9e6). */ #if !HAVE_QUOTACTL_FD diff --git a/src/include/override/sys/random.h b/src/include/override/sys/random.h index 5750aac1bc..9529dc1f08 100644 --- a/src/include/override/sys/random.h +++ b/src/include/override/sys/random.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #include diff --git a/src/include/override/sys/socket.h b/src/include/override/sys/socket.h index 02218b3be1..25e9ad7737 100644 --- a/src/include/override/sys/socket.h +++ b/src/include/override/sys/socket.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ /* Supported since kernel v6.5 (5e2ff6704a275be009be8979af17c52361b79b89) */ #ifndef SO_PASSPIDFD diff --git a/src/include/override/sys/stat.h b/src/include/override/sys/stat.h index 37793cff19..5cef9f852e 100644 --- a/src/include/override/sys/stat.h +++ b/src/include/override/sys/stat.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ /* Supported since kernel v6.6 (78252deb023cf0879256fcfbafe37022c390762b). */ #if !HAVE_FCHMODAT2 diff --git a/src/include/override/sys/syscall.h b/src/include/override/sys/syscall.h index b44b68fe73..b6922a052d 100644 --- a/src/include/override/sys/syscall.h +++ b/src/include/override/sys/syscall.h @@ -9,7 +9,7 @@ */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #ifdef ARCH_MIPS #include diff --git a/src/include/override/sys/wait.h b/src/include/override/sys/wait.h index 3a80e8489a..51853e4748 100644 --- a/src/include/override/sys/wait.h +++ b/src/include/override/sys/wait.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ #include diff --git a/src/include/override/sys/xattr.h b/src/include/override/sys/xattr.h index 711c5387c1..db31d0ba6f 100644 --- a/src/include/override/sys/xattr.h +++ b/src/include/override/sys/xattr.h @@ -3,9 +3,9 @@ /* To make struct xattr_args defined, which is used by setxattrat(). Note, the kernel header must be * included before the glibc header, otherwise the struct will not be defined. */ -#include +#include /* IWYU pragma: export */ -#include_next +#include_next /* IWYU pragma: export */ /* Supported since kernel v6.13 (6140be90ec70c39fa844741ca3cc807dd0866394). */ #if !HAVE_SETXATTRAT diff --git a/src/include/override/unistd.h b/src/include/override/unistd.h index d381f06a53..b32587417b 100644 --- a/src/include/override/unistd.h +++ b/src/include/override/unistd.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include_next +#include_next /* IWYU pragma: export */ /* Defined since glibc-2.34. * Supported since kernel v5.9 (9b4feb630e8e9801603f3cab3a36369e3c1cf88d). */ From 9adb4685dffadb3991535a8d990ce35132b6d9a6 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 19 Sep 2025 11:31:11 +0200 Subject: [PATCH 3/3] tree-wide: Remove unused includes --- src/analyze/analyze-unit-shell.c | 1 - src/basic/ansi-color.c | 1 - src/basic/env-file.c | 1 - src/basic/fd-util.c | 1 - src/basic/filesystems.c | 1 - src/core/exec-invoke.c | 1 - src/core/namespace.c | 1 - src/core/unit.c | 1 - src/core/varlink-dynamic-user.c | 1 - src/core/varlink-unit.c | 2 -- src/core/varlink.c | 1 - src/fsck/fsck.c | 1 - src/fuzz/fuzz-varlink.c | 1 - src/import/pull-common.c | 1 - src/journal/journald-manager.c | 4 ---- src/journal/journald-manager.h | 1 - src/journal/test-journald-tables.c | 2 +- src/libsystemd-network/sd-dhcp-client-id.c | 1 - src/libsystemd-network/test-lldp-rx.c | 2 +- src/libsystemd/sd-journal/journal-file.c | 1 - src/libsystemd/sd-journal/journal-send.c | 1 - src/libsystemd/sd-journal/journal-vacuum.c | 1 - src/libsystemd/sd-netlink/netlink-message-nfnl.c | 1 - src/libsystemd/sd-resolve/sd-resolve.c | 1 - src/machine/machine.c | 1 - src/network/networkd-ipv6ll.c | 1 - src/nspawn/nspawn-settings.c | 1 - src/resolve/resolved-dns-browse-services.c | 5 +++-- src/resolve/resolved-dnstls.c | 1 - src/resolve/resolved-varlink.c | 1 - src/run/run.c | 1 - src/shared/cpu-set-util.c | 1 - src/shared/generator.c | 1 - src/shared/label-util.c | 1 - src/shared/libaudit-util.c | 1 - src/shared/machine-bind-user.c | 1 - src/shared/pretty-print.c | 1 - src/shared/tests.c | 2 -- src/systemctl/systemctl-compat-shutdown.c | 1 - src/sysupdate/sysupdate.c | 3 --- src/test/test-bpf-firewall.c | 1 - src/test/test-fd-util.c | 1 - src/test/test-glob-util.c | 2 -- src/test/test-journal-importer.c | 1 - src/test/test-macro.c | 1 - src/test/test-mount-util.c | 1 - src/test/test-parse-util.c | 1 - src/test/test-tables.c | 1 - src/update-utmp/update-utmp.c | 6 ------ src/vmspawn/vmspawn-register.c | 1 - 50 files changed, 5 insertions(+), 64 deletions(-) diff --git a/src/analyze/analyze-unit-shell.c b/src/analyze/analyze-unit-shell.c index a5641fdd70..6e5a1f84d5 100644 --- a/src/analyze/analyze-unit-shell.c +++ b/src/analyze/analyze-unit-shell.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include #include diff --git a/src/basic/ansi-color.c b/src/basic/ansi-color.c index f750b6f58b..839dbc5e91 100644 --- a/src/basic/ansi-color.c +++ b/src/basic/ansi-color.c @@ -3,7 +3,6 @@ #include #include "ansi-color.h" -#include "log.h" #include "process-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/basic/env-file.c b/src/basic/env-file.c index fda52d08ec..2e15e7eeb7 100644 --- a/src/basic/env-file.c +++ b/src/basic/env-file.c @@ -6,7 +6,6 @@ #include "alloc-util.h" #include "env-file.h" #include "env-util.h" -#include "errno-util.h" #include "escape.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index 7ca9e98853..74feb8ad4b 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -20,7 +20,6 @@ #include "parse-util.h" #include "path-util.h" #include "process-util.h" -#include "socket-util.h" #include "sort-util.h" #include "stat-util.h" #include "stdio-util.h" diff --git a/src/basic/filesystems.c b/src/basic/filesystems.c index cd2789e329..5a41252e09 100644 --- a/src/basic/filesystems.c +++ b/src/basic/filesystems.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "filesystems-gperf.h" -#include "nulstr-util.h" #include "stat-util.h" #include "string-util.h" diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index 7fbc2d6a79..e093be0358 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -62,7 +62,6 @@ #include "open-file.h" #include "osc-context.h" #include "path-util.h" -#include "percent-util.h" #include "pidref.h" #include "proc-cmdline.h" #include "process-util.h" diff --git a/src/core/namespace.c b/src/core/namespace.c index abff997693..a90711f5ce 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -38,7 +38,6 @@ #include "nsflags.h" #include "nulstr-util.h" #include "os-util.h" -#include "parse-util.h" #include "path-util.h" #include "pidref.h" #include "process-util.h" diff --git a/src/core/unit.c b/src/core/unit.c index a6c3fd8bda..b946317065 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -35,7 +35,6 @@ #include "id128-util.h" #include "install.h" #include "iovec-util.h" -#include "label-util.h" #include "load-dropin.h" #include "load-fragment.h" #include "log.h" diff --git a/src/core/varlink-dynamic-user.c b/src/core/varlink-dynamic-user.c index af06e5a9ea..685ed8bac5 100644 --- a/src/core/varlink-dynamic-user.c +++ b/src/core/varlink-dynamic-user.c @@ -3,7 +3,6 @@ #include "sd-varlink.h" #include "dynamic-user.h" -#include "errno-util.h" #include "hashmap.h" #include "json-util.h" #include "manager.h" diff --git a/src/core/varlink-unit.c b/src/core/varlink-unit.c index da02fa1cf8..eb7191ffb4 100644 --- a/src/core/varlink-unit.c +++ b/src/core/varlink-unit.c @@ -13,9 +13,7 @@ #include "set.h" #include "strv.h" #include "unit.h" -#include "unit-name.h" #include "varlink-cgroup.h" -#include "varlink-common.h" #include "varlink-unit.h" #include "varlink-util.h" diff --git a/src/core/varlink.c b/src/core/varlink.c index 17f5ac4fad..55bf584f8c 100644 --- a/src/core/varlink.c +++ b/src/core/varlink.c @@ -4,7 +4,6 @@ #include "constants.h" #include "errno-util.h" -#include "json-util.h" #include "manager.h" #include "path-util.h" #include "pidref.h" diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 1d7f4ea3af..86c26c96df 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -22,7 +22,6 @@ #include "fs-util.h" #include "fsck-util.h" #include "main-func.h" -#include "parse-util.h" #include "path-util.h" #include "proc-cmdline.h" #include "process-util.h" diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c index 84ff9b904a..fb1584a2ea 100644 --- a/src/fuzz/fuzz-varlink.c +++ b/src/fuzz/fuzz-varlink.c @@ -9,7 +9,6 @@ #include "fuzz.h" #include "hexdecoct.h" #include "iovec-util.h" -#include "log.h" static FILE *null = NULL; diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 6f1f042d91..08a5a6192d 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -6,7 +6,6 @@ #include "dirent-util.h" #include "escape.h" #include "fd-util.h" -#include "hexdecoct.h" #include "io-util.h" #include "log.h" #include "memory-util.h" diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c index 54dd1f623e..12748f6401 100644 --- a/src/journal/journald-manager.c +++ b/src/journal/journald-manager.c @@ -18,8 +18,6 @@ #include "alloc-util.h" #include "audit-util.h" #include "cgroup-util.h" -#include "conf-parser.h" -#include "creds-util.h" #include "daemon-util.h" #include "dirent-util.h" #include "errno-util.h" @@ -53,14 +51,12 @@ #include "log-ratelimit.h" #include "memory-util.h" #include "mkdir.h" -#include "parse-util.h" #include "path-util.h" #include "prioq.h" #include "process-util.h" #include "rm-rf.h" #include "set.h" #include "signal-util.h" -#include "socket-netlink.h" #include "socket-util.h" #include "stdio-util.h" #include "string-util.h" diff --git a/src/journal/journald-manager.h b/src/journal/journald-manager.h index c103a7fc2a..ff80f5b3ec 100644 --- a/src/journal/journald-manager.h +++ b/src/journal/journald-manager.h @@ -7,7 +7,6 @@ #include "journald-forward.h" #include "list.h" #include "ratelimit.h" -#include "socket-util.h" typedef struct JournalStorageSpace { usec_t timestamp; diff --git a/src/journal/test-journald-tables.c b/src/journal/test-journald-tables.c index c066cbd5a0..13ea9d42bd 100644 --- a/src/journal/test-journald-tables.c +++ b/src/journal/test-journald-tables.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "journald-manager.h" +#include "journald-config.h" #include "test-tables.h" #include "tests.h" diff --git a/src/libsystemd-network/sd-dhcp-client-id.c b/src/libsystemd-network/sd-dhcp-client-id.c index 77614718d7..57aab65730 100644 --- a/src/libsystemd-network/sd-dhcp-client-id.c +++ b/src/libsystemd-network/sd-dhcp-client-id.c @@ -4,7 +4,6 @@ #include "dhcp-client-id-internal.h" #include "iovec-util.h" #include "json-util.h" -#include "log.h" #include "siphash24.h" #include "string-util.h" #include "unaligned.h" diff --git a/src/libsystemd-network/test-lldp-rx.c b/src/libsystemd-network/test-lldp-rx.c index f9870679d4..629093fe2e 100644 --- a/src/libsystemd-network/test-lldp-rx.c +++ b/src/libsystemd-network/test-lldp-rx.c @@ -6,10 +6,10 @@ #include #include "sd-event.h" +#include "sd-json.h" #include "sd-lldp-rx.h" #include "fd-util.h" -#include "json-util.h" #include "lldp-neighbor.h" #include "lldp-network.h" #include "tests.h" diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index c6ddac9598..54658a38d5 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -34,7 +34,6 @@ #include "path-util.h" #include "prioq.h" #include "random-util.h" -#include "ratelimit.h" #include "sort-util.h" #include "stat-util.h" #include "string-table.h" diff --git a/src/libsystemd/sd-journal/journal-send.c b/src/libsystemd/sd-journal/journal-send.c index e838e7e0d7..d1a8ebdfad 100644 --- a/src/libsystemd/sd-journal/journal-send.c +++ b/src/libsystemd/sd-journal/journal-send.c @@ -16,7 +16,6 @@ #include "io-util.h" #include "iovec-util.h" #include "journal-send.h" -#include "log.h" #include "memfd-util.h" #include "process-util.h" #include "socket-util.h" diff --git a/src/libsystemd/sd-journal/journal-vacuum.c b/src/libsystemd/sd-journal/journal-vacuum.c index 9fcd1b277d..fade159820 100644 --- a/src/libsystemd/sd-journal/journal-vacuum.c +++ b/src/libsystemd/sd-journal/journal-vacuum.c @@ -16,7 +16,6 @@ #include "journal-vacuum.h" #include "log.h" #include "log-ratelimit.h" -#include "ratelimit.h" #include "sort-util.h" #include "string-util.h" #include "time-util.h" diff --git a/src/libsystemd/sd-netlink/netlink-message-nfnl.c b/src/libsystemd/sd-netlink/netlink-message-nfnl.c index d33a690e36..2b6e1dd82b 100644 --- a/src/libsystemd/sd-netlink/netlink-message-nfnl.c +++ b/src/libsystemd/sd-netlink/netlink-message-nfnl.c @@ -9,7 +9,6 @@ #include "alloc-util.h" #include "errno-util.h" #include "iovec-util.h" -#include "log.h" #include "netlink-internal.h" #include "netlink-util.h" diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 03ebfbb02c..978d8b8652 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -19,7 +19,6 @@ #include "io-util.h" #include "iovec-util.h" #include "list.h" -#include "log.h" #include "memory-util.h" #include "process-util.h" #include "resolve-private.h" diff --git a/src/machine/machine.c b/src/machine/machine.c index 1ce906b7a2..69e7c475af 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -15,7 +15,6 @@ #include "bus-unit-util.h" #include "env-file.h" #include "errno-util.h" -#include "escape.h" #include "extract-word.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/network/networkd-ipv6ll.c b/src/network/networkd-ipv6ll.c index 0fd1e27a5d..546229a2e2 100644 --- a/src/network/networkd-ipv6ll.c +++ b/src/network/networkd-ipv6ll.c @@ -15,7 +15,6 @@ #include "siphash24.h" #include "socket-util.h" #include "string-table.h" -#include "string-util.h" #include "strv.h" #include "sysctl-util.h" diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index 131c61e174..166c420c5d 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -13,7 +13,6 @@ #include "nspawn-network.h" #include "nspawn-settings.h" #include "parse-util.h" -#include "path-util.h" #include "process-util.h" #include "rlimit-util.h" #include "socket-util.h" diff --git a/src/resolve/resolved-dns-browse-services.c b/src/resolve/resolved-dns-browse-services.c index b2ecc4c3d4..e763c46c1a 100644 --- a/src/resolve/resolved-dns-browse-services.c +++ b/src/resolve/resolved-dns-browse-services.c @@ -1,9 +1,10 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "af-list.h" +#include "alloc-util.h" #include "event-util.h" #include "dns-domain.h" -#include "json-util.h" +#include "log.h" #include "random-util.h" #include "resolved-dns-browse-services.h" #include "resolved-dns-cache.h" @@ -12,8 +13,8 @@ #include "resolved-dns-rr.h" #include "resolved-dns-scope.h" #include "resolved-manager.h" -#include "resolved-varlink.h" #include "string-table.h" +#include "string-util.h" typedef enum BrowseServiceUpdateEvent { BROWSE_SERVICE_UPDATE_ADDED, diff --git a/src/resolve/resolved-dnstls.c b/src/resolve/resolved-dnstls.c index b4b53921a1..09dda4508b 100644 --- a/src/resolve/resolved-dnstls.c +++ b/src/resolve/resolved-dnstls.c @@ -7,7 +7,6 @@ #include #include #include -#include #include "alloc-util.h" #include "openssl-util.h" diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c index f83f9506df..af469bde90 100644 --- a/src/resolve/resolved-varlink.c +++ b/src/resolve/resolved-varlink.c @@ -7,7 +7,6 @@ #include "dns-domain.h" #include "dns-type.h" #include "errno-util.h" -#include "glyph-util.h" #include "in-addr-util.h" #include "iovec-util.h" #include "json-util.h" diff --git a/src/run/run.c b/src/run/run.c index 9f9e56a3c1..3c5698d9cd 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -5,7 +5,6 @@ #include #include #include -#include #include #include "sd-bus.h" diff --git a/src/shared/cpu-set-util.c b/src/shared/cpu-set-util.c index 7a155c12d4..25288046c1 100644 --- a/src/shared/cpu-set-util.c +++ b/src/shared/cpu-set-util.c @@ -8,7 +8,6 @@ #include "bitfield.h" #include "cpu-set-util.h" #include "extract-word.h" -#include "hexdecoct.h" #include "log.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/shared/generator.c b/src/shared/generator.c index 78dd34ccb5..cc03151676 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -6,7 +6,6 @@ #include "alloc-util.h" #include "argv-util.h" -#include "cgroup-util.h" #include "dropin.h" #include "escape.h" #include "fd-util.h" diff --git a/src/shared/label-util.c b/src/shared/label-util.c index 78d5501c9f..f797f49afc 100644 --- a/src/shared/label-util.c +++ b/src/shared/label-util.c @@ -5,7 +5,6 @@ #include "btrfs-util.h" #include "errno-util.h" -#include "fs-util.h" #include "label-util.h" #include "selinux-util.h" #include "smack-util.h" diff --git a/src/shared/libaudit-util.c b/src/shared/libaudit-util.c index eb738d2274..617b69bfaf 100644 --- a/src/shared/libaudit-util.c +++ b/src/shared/libaudit-util.c @@ -2,7 +2,6 @@ #include #include -#include #include #include "errno-util.h" diff --git a/src/shared/machine-bind-user.c b/src/shared/machine-bind-user.c index e4566bb819..e4b0e12194 100644 --- a/src/shared/machine-bind-user.c +++ b/src/shared/machine-bind-user.c @@ -2,7 +2,6 @@ #include #include -#include #include "alloc-util.h" #include "chase.h" diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c index c7e77fd8e2..dab8761d2e 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -14,7 +14,6 @@ #include "errno-util.h" #include "fd-util.h" #include "fileio.h" -#include "fs-util.h" #include "log.h" #include "path-util.h" #include "pretty-print.h" diff --git a/src/shared/tests.c b/src/shared/tests.c index 26d4c2427c..4eb07b11ff 100644 --- a/src/shared/tests.c +++ b/src/shared/tests.c @@ -3,8 +3,6 @@ #include #include #include -#include -#include #include #include "sd-bus.h" diff --git a/src/systemctl/systemctl-compat-shutdown.c b/src/systemctl/systemctl-compat-shutdown.c index d85ff9ab11..d50dec372a 100644 --- a/src/systemctl/systemctl-compat-shutdown.c +++ b/src/systemctl/systemctl-compat-shutdown.c @@ -11,7 +11,6 @@ #include "strv.h" #include "systemctl.h" #include "systemctl-compat-shutdown.h" -#include "systemctl-logind.h" #include "time-util.h" static int shutdown_help(void) { diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c index e45e230b60..e4820fa3d1 100644 --- a/src/sysupdate/sysupdate.c +++ b/src/sysupdate/sysupdate.c @@ -6,12 +6,9 @@ #include "sd-daemon.h" #include "build.h" -#include "chase.h" #include "conf-files.h" #include "constants.h" -#include "dirent-util.h" #include "dissect-image.h" -#include "fd-util.h" #include "format-table.h" #include "glyph-util.h" #include "hexdecoct.h" diff --git a/src/test/test-bpf-firewall.c b/src/test/test-bpf-firewall.c index 6c82e3d296..f431529ff6 100644 --- a/src/test/test-bpf-firewall.c +++ b/src/test/test-bpf-firewall.c @@ -9,7 +9,6 @@ #include "in-addr-prefix-util.h" #include "load-fragment.h" #include "manager.h" -#include "memory-util.h" #include "path-util.h" #include "rm-rf.h" #include "service.h" diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 3d67dcfbaa..60e6a238a9 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -17,7 +17,6 @@ #include "random-util.h" #include "rlimit-util.h" #include "rm-rf.h" -#include "seccomp-util.h" #include "serialize.h" #include "stat-util.h" #include "tests.h" diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c index a9880f15c8..82e3ae60c7 100644 --- a/src/test/test-glob-util.c +++ b/src/test/test-glob-util.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "alloc-util.h" -#include "dirent-util.h" #include "fs-util.h" #include "glob-util.h" #include "rm-rf.h" diff --git a/src/test/test-journal-importer.c b/src/test/test-journal-importer.c index 370da0b134..33feb1a25a 100644 --- a/src/test/test-journal-importer.c +++ b/src/test/test-journal-importer.c @@ -4,7 +4,6 @@ #include "alloc-util.h" #include "journal-importer.h" -#include "log.h" #include "tests.h" static void assert_iovec_entry(const struct iovec *iovec, const char* content) { diff --git a/src/test/test-macro.c b/src/test/test-macro.c index a05a1082de..7f7bf1ce8d 100644 --- a/src/test/test-macro.c +++ b/src/test/test-macro.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "errno-util.h" #include "tests.h" TEST(saturate_add) { diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index 57d9a050a5..804d4f4e5e 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -14,7 +14,6 @@ #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" -#include "namespace-util.h" #include "path-util.h" #include "process-util.h" #include "random-util.h" diff --git a/src/test/test-parse-util.c b/src/test/test-parse-util.c index 37d0280cad..12692eb731 100644 --- a/src/test/test-parse-util.c +++ b/src/test/test-parse-util.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include "locale-util.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 16109583f6..41b6cd6136 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -35,7 +35,6 @@ #include "tests.h" #include "timer.h" #include "unit.h" -#include "unit-name.h" #include "virt.h" int main(int argc, char **argv) { diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c index 4f96f3a377..a9fe485552 100644 --- a/src/update-utmp/update-utmp.c +++ b/src/update-utmp/update-utmp.c @@ -4,19 +4,13 @@ #include "sd-bus.h" -#include "alloc-util.h" #include "bus-error.h" #include "bus-locator.h" #include "bus-util.h" #include "libaudit-util.h" #include "log.h" #include "main-func.h" -#include "random-util.h" -#include "special.h" -#include "stdio-util.h" -#include "strv.h" #include "time-util.h" -#include "unit-def.h" #include "utmp-wtmp.h" #include "verbs.h" diff --git a/src/vmspawn/vmspawn-register.c b/src/vmspawn/vmspawn-register.c index d9925f171d..b33f86becf 100644 --- a/src/vmspawn/vmspawn-register.c +++ b/src/vmspawn/vmspawn-register.c @@ -13,7 +13,6 @@ #include "json-util.h" #include "log.h" #include "pidref.h" -#include "process-util.h" #include "socket-util.h" #include "string-util.h" #include "terminal-util.h"