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

hibernate-resume: Clean up includes

Split out of #37344.
---

diff --git a/src/hibernate-resume/hibernate-resume-config.c b/src/hibernate-resume/hibernate-resume-config.c
index 3289fcd5216..c30bfb73e11 100644
--- a/src/hibernate-resume/hibernate-resume-config.c
+++ b/src/hibernate-resume/hibernate-resume-config.c
@@ -7,6 +7,7 @@
 #include "efivars.h"
 #include "fstab-util.h"
 #include "hibernate-resume-config.h"
+#include "log.h"
 #include "os-util.h"
 #include "parse-util.h"
 #include "path-util.h"
diff --git a/src/hibernate-resume/hibernate-resume-config.h b/src/hibernate-resume/hibernate-resume-config.h
index 4bf4af63863..55f344a9e65 100644
--- a/src/hibernate-resume/hibernate-resume-config.h
+++ b/src/hibernate-resume/hibernate-resume-config.h
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
 #include "sd-id128.h"
 
-#include "macro.h"
-#include "memory-util.h"
+#include "forward.h"
 
 typedef struct KernelHibernateLocation KernelHibernateLocation;
 
diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 8d268a48051..07f6b89f6d5 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -9,8 +9,6 @@
 #include "hibernate-resume-config.h"
 #include "initrd-util.h"
 #include "log.h"
-#include "main-func.h"
-#include "parse-util.h"
 #include "proc-cmdline.h"
 #include "special.h"
 #include "static-destruct.h"
diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index 781b2faf778..e16bf825c93 100644
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
 #include <getopt.h>
 #include <sys/stat.h>
 
@@ -15,7 +14,6 @@
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "static-destruct.h"
-#include "terminal-util.h"
 
 static HibernateInfo arg_info = {};
 static bool arg_clear = false;