From e30e8b50738daab74eee56027543dea4d8ff8a32 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:23:26 +0900
Subject: tree-wide: drop stat.h or statfs.h when stat-util.h is included

---
 src/basic/blockdev-util.c                   | 2 --
 src/basic/btrfs-util.c                      | 2 --
 src/basic/cgroup-util.c                     | 2 --
 src/basic/copy.c                            | 1 -
 src/basic/fs-util.c                         | 1 -
 src/basic/mkdir.c                           | 1 -
 src/basic/path-util.c                       | 1 -
 src/basic/rm-rf.c                           | 2 --
 src/basic/stat-util.c                       | 1 -
 src/basic/time-util.c                       | 1 -
 src/basic/util.c                            | 1 -
 src/boot/bootctl.c                          | 2 --
 src/core/execute.c                          | 1 -
 src/core/load-fragment.c                    | 1 -
 src/core/main.c                             | 1 -
 src/core/namespace.c                        | 1 -
 src/core/unit.c                             | 1 -
 src/gpt-auto-generator/gpt-auto-generator.c | 1 -
 src/nspawn/nspawn-patch-uid.c               | 1 -
 src/partition/growfs.c                      | 1 -
 src/shared/condition.c                      | 1 -
 src/shared/install.c                        | 1 -
 src/shared/loop-util.c                      | 1 -
 src/shared/machine-pool.c                   | 1 -
 src/tmpfiles/tmpfiles.c                     | 1 -
 25 files changed, 30 deletions(-)

diff --git a/src/basic/blockdev-util.c b/src/basic/blockdev-util.c
index cff18fc62d..5372c26be6 100644
--- a/src/basic/blockdev-util.c
+++ b/src/basic/blockdev-util.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <sys/stat.h>
-#include <sys/statfs.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 55bfd34fe6..18a7217757 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -11,8 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ea74a65a29..5b94b02a27 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -6,8 +6,6 @@
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/xattr.h>
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 08cbc4addf..bac321fe68 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -6,7 +6,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/sendfile.h>
-#include <sys/stat.h>
 #include <sys/xattr.h>
 #include <unistd.h>
 
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index c366495f42..8efb6e39af 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -4,7 +4,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <linux/falloc.h>
 #include <linux/magic.h>
 #include <unistd.h>
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 1f318252a9..fa682d4c43 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <string.h>
-#include <sys/stat.h>
 
 #include "alloc-util.h"
 #include "format-util.h"
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index edf4a4cdba..f1be8d0988 100644
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -4,7 +4,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 /* When we include libgen.h because we need dirname() we immediately
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index 796eb93c4b..23cdfa4696 100644
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -4,8 +4,6 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 5144b87f59..a25cf4151c 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <linux/magic.h>
 #include <sched.h>
-#include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index ec2576948e..837948c253 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -5,7 +5,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/timerfd.h>
 #include <sys/timex.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index 75c7d98dd7..7e9e85d11f 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
-#include <sys/statfs.h>
 #include <sys/sysmacros.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index fa846b1d26..f16e979e52 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -10,8 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index b4463e2382..ca389475f6 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -10,7 +10,6 @@
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/shm.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index a213e6039d..288de616b6 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -12,7 +12,6 @@
 #endif
 #include <sched.h>
 #include <sys/resource.h>
-#include <sys/stat.h>
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/core/main.c b/src/core/main.c
index ae54453b5e..5353ac80e3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -8,7 +8,6 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #if HAVE_SECCOMP
 #include <seccomp.h>
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 1ac9765437..df0455b7eb 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -4,7 +4,6 @@
 #include <sched.h>
 #include <stdio.h>
 #include <sys/mount.h>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <linux/fs.h>
 
diff --git a/src/core/unit.c b/src/core/unit.c
index 865db3376c..5f2ca44701 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index e4612edff8..de51801d23 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdlib.h>
-#include <sys/statfs.h>
 #include <unistd.h>
 
 #include "sd-device.h"
diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index c2f068fa99..7c1dbc2cf4 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -2,7 +2,6 @@
 
 #include <fcntl.h>
 #include <linux/magic.h>
-#include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/vfs.h>
 #include <unistd.h>
diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 5f55d3fc95..1dbc9a46d6 100644
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -7,7 +7,6 @@
 #include <linux/magic.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 53018cd601..9f4c7fe338 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -5,7 +5,6 @@
 #include <fnmatch.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <time.h>
diff --git a/src/shared/install.c b/src/shared/install.c
index 1e4730f356..c38daee231 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -7,7 +7,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/loop-util.c b/src/shared/loop-util.c
index 22525d5c63..559d7f8174 100644
--- a/src/shared/loop-util.c
+++ b/src/shared/loop-util.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <linux/loop.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/shared/machine-pool.c b/src/shared/machine-pool.c
index 98f5413133..7e3312835d 100644
--- a/src/shared/machine-pool.c
+++ b/src/shared/machine-pool.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <sys/statfs.h>
 
 #include "btrfs-util.h"
 #include "label.h"
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index fbb8e00f02..17072f78b4 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
-#include <sys/stat.h>
 #include <sys/xattr.h>
 #include <sysexits.h>
 #include <time.h>
-- 
cgit v1.2.1