From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 14 May 2025 21:32:00 +0000 (+0200)
Subject: coredump: Clean up includes
X-Git-Tag: v258-rc1~589^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b06adfb06c947e2de110e9bc5516c230294c2355;p=thirdparty%2Fsystemd.git

coredump: Clean up includes

Split out of #37344.
---

diff --git a/src/coredump/coredump-vacuum.c b/src/coredump/coredump-vacuum.c
index e4c5e00ead3..f3e24038227 100644
--- a/src/coredump/coredump-vacuum.c
+++ b/src/coredump/coredump-vacuum.c
@@ -2,7 +2,6 @@
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -12,7 +11,6 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "log.h"
-#include "macro.h"
 #include "memory-util.h"
 #include "stat-util.h"
 #include "string-util.h"
diff --git a/src/coredump/coredump-vacuum.h b/src/coredump/coredump-vacuum.h
index 8ad5bafc15a..1a2d6481112 100644
--- a/src/coredump/coredump-vacuum.h
+++ b/src/coredump/coredump-vacuum.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <inttypes.h>
-#include <sys/types.h>
+#include "forward.h"
 
 int coredump_vacuum(int exclude_fd, uint64_t keep_free, uint64_t max_use);
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 2090dbc3434..b8ba77e6ae3 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <stdio.h>
 #include <sys/auxv.h>
 #include <sys/mount.h>
@@ -9,6 +8,7 @@
 #include <sys/xattr.h>
 #include <unistd.h>
 
+#include "sd-bus.h"
 #include "sd-daemon.h"
 #include "sd-journal.h"
 #include "sd-json.h"
@@ -27,24 +27,25 @@
 #include "coredump-vacuum.h"
 #include "dirent-util.h"
 #include "elf-util.h"
+#include "errno-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
+#include "io-util.h"
 #include "iovec-util.h"
 #include "journal-importer.h"
 #include "journal-send.h"
 #include "json-util.h"
 #include "log.h"
-#include "macro.h"
 #include "main-func.h"
 #include "memory-util.h"
 #include "memstream-util.h"
-#include "missing_syscall.h"
 #include "mkdir-label.h"
 #include "namespace-util.h"
 #include "parse-util.h"
 #include "path-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "signal-util.h"
 #include "socket-util.h"
@@ -52,8 +53,6 @@
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
-#include "strv.h"
-#include "sync-util.h"
 #include "tmpfile-util.h"
 #include "uid-classification.h"
 #include "user-util.h"
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index f44fc706b21..5dbd7cfa8d2 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -4,6 +4,8 @@
 #include <getopt.h>
 #include <locale.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -18,11 +20,13 @@
 #include "bus-util.h"
 #include "chase.h"
 #include "compress.h"
-#include "constants.h"
 #include "dissect-image.h"
+#include "errno-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "format-table.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "glob-util.h"
 #include "image-policy.h"
@@ -31,7 +35,7 @@
 #include "json-util.h"
 #include "log.h"
 #include "logs-show.h"
-#include "macro.h"
+#include "loop-util.h"
 #include "main-func.h"
 #include "mount-util.h"
 #include "pager.h"
@@ -40,11 +44,11 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "process-util.h"
-#include "rlimit-util.h"
 #include "signal-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
 #include "verbs.h"
diff --git a/src/coredump/test-coredump-vacuum.c b/src/coredump/test-coredump-vacuum.c
index 27f83309509..454f044384a 100644
--- a/src/coredump/test-coredump-vacuum.c
+++ b/src/coredump/test-coredump-vacuum.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <stdlib.h>
-
 #include "coredump-vacuum.h"
 #include "tests.h"