shutdown: Clean up includes

Split out of #37344.

diff --git a/src/shutdown/detach-dm.h b/src/shutdown/detach-dm.h
index b5f50a3bbf4e1f920627ffa8cac685b4c3a43351..0db81350e0f67a8d1460daec7d616cba5c28ef09 100644 (file)
--- a/src/shutdown/detach-dm.h
+++ b/src/shutdown/detach-dm.h
@@ -5,6 +5,6 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <stdbool.h>
+#include "forward.h"
 
 int dm_detach_all(bool *changed, bool last_try);

diff --git a/src/shutdown/detach-loopback.h b/src/shutdown/detach-loopback.h
index d6d73f31af0d68e44fb942f27fc12f193c29cd9d..18cb2f6cfca0ccaf1f068359b2b29b5981c75544 100644 (file)
--- a/src/shutdown/detach-loopback.h
+++ b/src/shutdown/detach-loopback.h
@@ -5,6 +5,6 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <stdbool.h>
+#include "forward.h"
 
 int loopback_detach_all(bool *changed, bool last_try);

diff --git a/src/shutdown/detach-md.h b/src/shutdown/detach-md.h
index 3784598208b5cdfe60a6e881039bafdf5e91af0a..8965a6ab65a983dc330d988b23dcc9be466e5c25 100644 (file)
--- a/src/shutdown/detach-md.h
+++ b/src/shutdown/detach-md.h
@@ -5,6 +5,6 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <stdbool.h>
+#include "forward.h"
 
 int md_detach_all(bool *changed, bool last_try);

diff --git a/src/shutdown/detach-swap.h b/src/shutdown/detach-swap.h
index 1ebf5eb90806d5ce32fee7e9f5b3116afdede7ee..64e89076e7a8e94c480646bfbff5c50148072e1a 100644 (file)
--- a/src/shutdown/detach-swap.h
+++ b/src/shutdown/detach-swap.h
@@ -5,8 +5,7 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <stdbool.h>
-
+#include "forward.h"
 #include "list.h"
 
 int swapoff_all(bool *changed);

diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 9c4eb4582dc462ebd148c55b4ee8a1ff0c711ad3..7ab4deac5e2a220cca482e332da6c7a009842e32 100644 (file)
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -3,10 +3,8 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <errno.h>
 #include <getopt.h>
 #include <linux/reboot.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
@@ -30,13 +28,16 @@
 #include "detach-swap.h"
 #include "errno-util.h"
 #include "exec-util.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "format-util.h"
 #include "getopt-defs.h"
 #include "initrd-util.h"
 #include "killall.h"
 #include "log.h"
 #include "parse-util.h"
+#include "pidref.h"
 #include "process-util.h"
 #include "reboot-util.h"
 #include "rlimit-util.h"
@@ -46,6 +47,7 @@
 #include "switch-root.h"
 #include "sysctl-util.h"
 #include "terminal-util.h"
+#include "time-util.h"
 #include "umount.h"
 #include "virt.h"
 #include "watchdog.h"

diff --git a/src/shutdown/test-umount.c b/src/shutdown/test-umount.c
index 1de1fe8e1112a97121550da71b724e4655e118d0..c645b8e7b21074f8febdaec12c910868ead3a580 100644 (file)
--- a/src/shutdown/test-umount.c
+++ b/src/shutdown/test-umount.c
@@ -5,8 +5,6 @@
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
-#include "path-util.h"
-#include "string-util.h"
 #include "tests.h"
 #include "umount.h"
 

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 9b083d2492109fcf24764d6cb6c05309b400d4bb..2bb456e087745c0f1922d3ee70299695bf1d6414 100644 (file)
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -3,18 +3,18 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <errno.h>
 #include <fcntl.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
 #include "chase.h"
 #include "dirent-util.h"
+#include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "fstab-util.h"
 #include "libmount-util.h"
@@ -27,8 +27,10 @@
 #include "process-util.h"
 #include "random-util.h"
 #include "signal-util.h"
+#include "stat-util.h"
+#include "string-util.h"
+#include "time-util.h"
 #include "umount.h"
-#include "user-util.h"
 #include "virt.h"
 
 static void mount_point_free(MountPoint **head, MountPoint *m) {

diff --git a/src/shutdown/umount.h b/src/shutdown/umount.h
index d18795c727870d044bf72960bf1c01de9a72bfbf..5fdaf76392af324ef68751d3225bb93c1d55c1c0 100644 (file)
--- a/src/shutdown/umount.h
+++ b/src/shutdown/umount.h
@@ -5,9 +5,7 @@
   Copyright © 2010 ProFUSION embedded systems
 ***/
 
-#include <stdbool.h>
-#include <stdio.h>
-
+#include "forward.h"
 #include "list.h"
 
 int umount_all(bool *changed, bool last_try);