From 455fa9610cba06af4cb9d8c8a2121b552c4d2229 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:44:54 +0900
Subject: tree-wide: drop string.h when string-util.h or friends are included

---
 src/basic/btrfs-util.c                              | 1 -
 src/basic/bus-label.h                               | 1 -
 src/basic/cgroup-util.c                             | 1 -
 src/basic/conf-files.c                              | 1 -
 src/basic/copy.c                                    | 1 -
 src/basic/efivars.c                                 | 1 -
 src/basic/env-util.c                                | 1 -
 src/basic/extract-word.c                            | 1 -
 src/basic/fileio.c                                  | 1 -
 src/basic/fs-util.c                                 | 1 -
 src/basic/glob-util.h                               | 1 -
 src/basic/hashmap.c                                 | 1 -
 src/basic/hostname-util.c                           | 1 -
 src/basic/locale-util.c                             | 1 -
 src/basic/log.c                                     | 1 -
 src/basic/login-util.c                              | 1 -
 src/basic/parse-util.c                              | 1 -
 src/basic/path-util.c                               | 1 -
 src/basic/proc-cmdline.c                            | 1 -
 src/basic/process-util.c                            | 1 -
 src/basic/replace-var.c                             | 1 -
 src/basic/smack-util.c                              | 1 -
 src/basic/socket-util.c                             | 1 -
 src/basic/string-table.h                            | 1 -
 src/basic/string-util.c                             | 1 -
 src/basic/strv.c                                    | 1 -
 src/basic/syslog-util.c                             | 1 -
 src/basic/terminal-util.c                           | 1 -
 src/basic/time-util.c                               | 1 -
 src/basic/unit-name.c                               | 1 -
 src/basic/user-util.c                               | 1 -
 src/basic/utf8.c                                    | 1 -
 src/basic/util.c                                    | 1 -
 src/basic/virt.c                                    | 1 -
 src/basic/xattr-util.c                              | 1 -
 src/binfmt/binfmt.c                                 | 1 -
 src/boot/bootctl.c                                  | 1 -
 src/cgls/cgls.c                                     | 1 -
 src/cgtop/cgtop.c                                   | 1 -
 src/core/bpf-firewall.c                             | 1 -
 src/core/execute.c                                  | 1 -
 src/core/kmod-setup.c                               | 1 -
 src/core/load-fragment.c                            | 1 -
 src/core/locale-setup.c                             | 1 -
 src/core/main.c                                     | 1 -
 src/core/manager.c                                  | 1 -
 src/core/namespace.c                                | 1 -
 src/core/smack-setup.c                              | 1 -
 src/core/unit.c                                     | 1 -
 src/coredump/coredumpctl.c                          | 1 -
 src/cryptsetup/cryptsetup.c                         | 1 -
 src/delta/delta.c                                   | 1 -
 src/fstab-generator/fstab-generator.c               | 1 -
 src/getty-generator/getty-generator.c               | 1 -
 src/hostname/hostnamed.c                            | 1 -
 src/journal-remote/journal-remote.c                 | 1 -
 src/journal-remote/microhttpd-util.c                | 1 -
 src/journal/catalog.c                               | 1 -
 src/journal/compress.c                              | 1 -
 src/journal/journalctl.c                            | 1 -
 src/journal/journald-rate-limit.c                   | 1 -
 src/libsystemd-network/dhcp-option.c                | 1 -
 src/libsystemd-network/dhcp6-option.c               | 1 -
 src/libsystemd-network/sd-dhcp-client.c             | 1 -
 src/libsystemd-network/sd-dhcp-lease.c              | 1 -
 src/libsystemd-network/sd-dhcp6-client.c            | 1 -
 src/libsystemd-network/sd-ipv4acd.c                 | 1 -
 src/libsystemd-network/sd-ipv4ll.c                  | 1 -
 src/libsystemd-network/test-lldp.c                  | 1 -
 src/libsystemd/sd-bus/bus-error.c                   | 1 -
 src/libsystemd/sd-daemon/sd-daemon.c                | 1 -
 src/libsystemd/sd-hwdb/sd-hwdb.c                    | 1 -
 src/libsystemd/sd-login/sd-login.c                  | 1 -
 src/libsystemd/sd-login/test-login.c                | 1 -
 src/libsystemd/sd-network/sd-network.c              | 1 -
 src/libsystemd/sd-resolve/test-resolve.c            | 1 -
 src/libudev/libudev.c                               | 1 -
 src/locale/keymap-util.c                            | 1 -
 src/locale/localectl.c                              | 1 -
 src/locale/localed.c                                | 1 -
 src/login/loginctl.c                                | 1 -
 src/login/logind-acl.c                              | 1 -
 src/login/logind-button.c                           | 1 -
 src/login/logind-dbus.c                             | 1 -
 src/login/logind-inhibit.c                          | 1 -
 src/login/logind-seat-dbus.c                        | 1 -
 src/login/logind-seat.c                             | 1 -
 src/login/logind-session-dbus.c                     | 1 -
 src/login/logind-session.c                          | 1 -
 src/login/logind-user-dbus.c                        | 1 -
 src/login/logind-user.c                             | 1 -
 src/login/logind-utmp.c                             | 1 -
 src/login/logind.c                                  | 1 -
 src/login/sysfs-show.c                              | 1 -
 src/machine/machine-dbus.c                          | 1 -
 src/machine/machine.c                               | 1 -
 src/machine/machinectl.c                            | 1 -
 src/machine/machined-dbus.c                         | 1 -
 src/modules-load/modules-load.c                     | 1 -
 src/network/networkd-lldp-tx.c                      | 1 -
 src/nspawn/nspawn.c                                 | 1 -
 src/nss-myhostname/nss-myhostname.c                 | 1 -
 src/nss-resolve/nss-resolve.c                       | 1 -
 src/random-seed/random-seed.c                       | 1 -
 src/remount-fs/remount-fs.c                         | 1 -
 src/reply-password/reply-password.c                 | 1 -
 src/shared/ask-password-api.c                       | 1 -
 src/shared/bus-util.c                               | 1 -
 src/shared/calendarspec.c                           | 1 -
 src/shared/cgroup-show.c                            | 1 -
 src/shared/clean-ipc.c                              | 1 -
 src/shared/condition.c                              | 1 -
 src/shared/conf-parser.c                            | 1 -
 src/shared/dm-util.c                                | 1 -
 src/shared/dns-domain.c                             | 1 -
 src/shared/fstab-util.c                             | 1 -
 src/shared/import-util.c                            | 1 -
 src/shared/install-printf.c                         | 1 -
 src/shared/install.c                                | 1 -
 src/shared/json.c                                   | 1 -
 src/shared/logs-show.c                              | 1 -
 src/shared/machine-image.c                          | 1 -
 src/shared/mount-util.c                             | 1 -
 src/shared/pager.c                                  | 1 -
 src/shared/path-lookup.c                            | 1 -
 src/shared/sleep-config.c                           | 1 -
 src/shared/specifier.c                              | 1 -
 src/shared/sysctl-util.c                            | 1 -
 src/shared/utmp-wtmp.c                              | 1 -
 src/shared/verbs.c                                  | 1 -
 src/shared/xml.c                                    | 1 -
 src/shutdown/umount.c                               | 1 -
 src/socket-proxy/socket-proxyd.c                    | 1 -
 src/sysctl/sysctl.c                                 | 1 -
 src/systemctl/systemctl.c                           | 1 -
 src/test/test-af-list.c                             | 1 -
 src/test/test-calendarspec.c                        | 1 -
 src/test/test-cgroup.c                              | 1 -
 src/test/test-date.c                                | 1 -
 src/test/test-engine.c                              | 1 -
 src/test/test-env-util.c                            | 1 -
 src/test/test-exec-util.c                           | 1 -
 src/test/test-extract-word.c                        | 1 -
 src/test/test-id128.c                               | 1 -
 src/test/test-load-fragment.c                       | 1 -
 src/test/test-strbuf.c                              | 1 -
 src/test/test-strv.c                                | 1 -
 src/test/test-strxcpyx.c                            | 1 -
 src/test/test-unit-name.c                           | 1 -
 src/test/test-util.c                                | 1 -
 src/timedate/timedated.c                            | 1 -
 src/tmpfiles/tmpfiles.c                             | 1 -
 src/tty-ask-password-agent/tty-ask-password-agent.c | 1 -
 src/udev/scsi_id/scsi_id.c                          | 1 -
 src/udev/scsi_id/scsi_serial.c                      | 1 -
 src/udev/udev-builtin-blkid.c                       | 1 -
 src/udev/udev-builtin-input_id.c                    | 1 -
 src/udev/udev-builtin-keyboard.c                    | 1 -
 src/udev/udev-builtin-net_id.c                      | 1 -
 src/udev/udev-builtin-path_id.c                     | 1 -
 src/udev/udev-builtin-usb_id.c                      | 1 -
 src/udev/udev-builtin.c                             | 1 -
 src/udev/udev-node.c                                | 1 -
 src/udev/udevadm-info.c                             | 1 -
 src/udev/udevadm-settle.c                           | 1 -
 src/udev/udevd.c                                    | 1 -
 src/update-utmp/update-utmp.c                       | 1 -
 167 files changed, 167 deletions(-)

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 540a1990ce..55bfd34fe6 100644
--- a/src/basic/btrfs-util.c
+++ b/src/basic/btrfs-util.c
@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
diff --git a/src/basic/bus-label.h b/src/basic/bus-label.h
index 664cfaf67f..4a1b097a52 100644
--- a/src/basic/bus-label.h
+++ b/src/basic/bus-label.h
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "string-util.h"
 
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index bdf3b9febd..f3367a9cf3 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -7,7 +7,6 @@
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
 #include <sys/types.h>
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 4bc6931b58..838b485e22 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -5,7 +5,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "conf-files.h"
 #include "def.h"
diff --git a/src/basic/copy.c b/src/basic/copy.c
index e07f548fef..4a3eaee010 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index 53875de5a0..9b71052ffb 100644
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -6,7 +6,6 @@
 #include <linux/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index a6503cf2b6..b8dc98915f 100644
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -4,7 +4,6 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index 34cfb36a4a..d7c215cb48 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syslog.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 82d27a5ba3..714a00cd9a 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -8,7 +8,6 @@
 #include <stdint.h>
 #include <stdio_ext.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 6e6fa20053..43558f6f24 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 <string.h>
 #include <sys/stat.h>
 #include <linux/falloc.h>
 #include <linux/magic.h>
diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
index 8e226c1ee2..8b1bb02be1 100644
--- a/src/basic/glob-util.h
+++ b/src/basic/glob-util.h
@@ -3,7 +3,6 @@
 
 #include <glob.h>
 #include <stdbool.h>
-#include <string.h>
 
 #include "macro.h"
 #include "string-util.h"
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 2c4620abf0..4853514c96 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "fileio.h"
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 5bfa028b39..7bc2e3f370 100644
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index e94c29939c..5fd18028bb 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
diff --git a/src/basic/log.c b/src/basic/log.c
index 61faf00102..77ba5fc776 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -7,7 +7,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/signalfd.h>
 #include <sys/socket.h>
 #include <sys/time.h>
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 085ccd0915..5c8e557c88 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 
 #include "login-util.h"
 #include "string-util.h"
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 1ddb64fd28..e36c6c7432 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -7,7 +7,6 @@
 #include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 9777beadd8..edf4a4cdba 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 <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 44d1e9aec4..bb2be068bb 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -2,7 +2,6 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "efivars.h"
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 9ab6e4fff6..87b03f89e5 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -8,7 +8,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
diff --git a/src/basic/replace-var.c b/src/basic/replace-var.c
index fd2b5c104f..5b4737505c 100644
--- a/src/basic/replace-var.c
+++ b/src/basic/replace-var.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "macro.h"
diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c
index 123d00e13e..da9a2139d3 100644
--- a/src/basic/smack-util.c
+++ b/src/basic/smack-util.c
@@ -7,7 +7,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
 #include <unistd.h>
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index b216c25210..19dd053e36 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
diff --git a/src/basic/string-table.h b/src/basic/string-table.h
index 42fe4f4315..2d3cf81435 100644
--- a/src/basic/string-table.h
+++ b/src/basic/string-table.h
@@ -5,7 +5,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "macro.h"
diff --git a/src/basic/string-util.c b/src/basic/string-util.c
index c182868755..8e6aa63806 100644
--- a/src/basic/string-util.c
+++ b/src/basic/string-util.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/basic/strv.c b/src/basic/strv.c
index 88b85867bb..30fab63074 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -5,7 +5,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/basic/syslog-util.c b/src/basic/syslog-util.c
index fe129482f3..29c9ec9ac4 100644
--- a/src/basic/syslog-util.c
+++ b/src/basic/syslog-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 #include <syslog.h>
 
 #include "hexdecoct.h"
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index c732e8021c..264f15425e 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 3018e81acb..ec2576948e 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 3e37e34325..af8dca53cd 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -4,7 +4,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "glob-util.h"
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index b5fdfafd61..f0e403829a 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -9,7 +9,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utmp.h>
diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index afc24700dd..c857185ec8 100644
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "gunicode.h"
diff --git a/src/basic/util.c b/src/basic/util.c
index f74ed95a60..adca56c500 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -8,7 +8,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/prctl.h>
 #include <sys/statfs.h>
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 3be3852e35..fe25a1a430 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c
index 2b79ce4b31..f4ac2b6f7b 100644
--- a/src/basic/xattr-util.c
+++ b/src/basic/xattr-util.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <sys/xattr.h>
 
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index aa9d811f2e..7ff844c78c 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -6,7 +6,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index dcf5687a43..bfdbdc7a91 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -11,7 +11,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 34d95c7660..b55d7299ca 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 61663b2c1c..9c6094c039 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -6,7 +6,6 @@
 #include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index a637437a5a..424162f445 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -12,7 +12,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index 4401e30e65..22817806c0 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -6,7 +6,6 @@
 #include <grp.h>
 #include <poll.h>
 #include <signal.h>
-#include <string.h>
 #include <sys/capability.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index a91cfebc67..fd42684034 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <ftw.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index f991b7f5e8..a213e6039d 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -11,7 +11,6 @@
 #include <seccomp.h>
 #endif
 #include <sched.h>
-#include <string.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
 
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index aa4a89c17a..33728b0ff2 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "env-file.h"
 #include "env-util.h"
diff --git a/src/core/main.c b/src/core/main.c
index 3545fde71d..ae54453b5e 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -5,7 +5,6 @@
 #include <getopt.h>
 #include <signal.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
diff --git a/src/core/manager.c b/src/core/manager.c
index c9032fced8..fc1207cbe0 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <linux/kd.h>
 #include <signal.h>
-#include <string.h>
 #include <sys/epoll.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
diff --git a/src/core/namespace.c b/src/core/namespace.c
index dfc7f9fb1c..1ac9765437 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <sched.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index e2d4c0d6e1..d7a0f7a07b 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -10,7 +10,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/core/unit.c b/src/core/unit.c
index 3107b9b148..865db3376c 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 4b972481d9..d68ff1c366 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -4,7 +4,6 @@
 #include <getopt.h>
 #include <locale.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index ebefb4d4d2..dd8c178fcb 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <mntent.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/delta/delta.c b/src/delta/delta.c
index cd33850b96..2d80d3a664 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <unistd.h>
 
diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 90e7237576..01f678cc0e 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <mntent.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
index 4563daf3ad..be38612060 100644
--- a/src/getty-generator/getty-generator.c
+++ b/src/getty-generator/getty-generator.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 9e4f4fb59e..deecd9b8db 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/utsname.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 35efe7002b..6cbaf722c6 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <stdint.h>
diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c
index 5f5691995d..939af12572 100644
--- a/src/journal-remote/microhttpd-util.c
+++ b/src/journal-remote/microhttpd-util.c
@@ -2,7 +2,6 @@
 
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 
 #if HAVE_GNUTLS
 #include <gnutls/gnutls.h>
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 060193d2ac..70b2c8b46c 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <locale.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/journal/compress.c b/src/journal/compress.c
index bfb75ae8c9..4e00e4fc5e 100644
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -2,7 +2,6 @@
 
 #include <inttypes.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 6d9b5cfc2f..332270cc19 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -11,7 +11,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/inotify.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/journal/journald-rate-limit.c b/src/journal/journald-rate-limit.c
index 30a3fa8720..af7196c6de 100644
--- a/src/journal/journald-rate-limit.c
+++ b/src/journal/journald-rate-limit.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "hashmap.h"
diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c
index 78baeb7333..061cfde2f0 100644
--- a/src/libsystemd-network/dhcp-option.c
+++ b/src/libsystemd-network/dhcp-option.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "dhcp-internal.h"
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index ca67559e6f..9f5352a60d 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -5,7 +5,6 @@
 
 #include <errno.h>
 #include <netinet/in.h>
-#include <string.h>
 
 #include "sd-dhcp6-client.h"
 
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 1c5de5392c..ef330fe28e 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -8,7 +8,6 @@
 #include <net/if_arp.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <linux/if_infiniband.h>
 
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 800caec841..be3f22f333 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 33420fd4c0..95b7237382 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -4,7 +4,6 @@
 ***/
 
 #include <errno.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <linux/if_arp.h>
 #include <linux/if_infiniband.h>
diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index 5a24f38ae9..5a0b6e45dc 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -8,7 +8,6 @@
 #include <netinet/if_ether.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "sd-ipv4acd.h"
 
diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 3104d8c5a8..fa9b4f6039 100644
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "sd-id128.h"
 #include "sd-ipv4acd.h"
diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c
index 7406f94ce0..a2ac65095f 100644
--- a/src/libsystemd-network/test-lldp.c
+++ b/src/libsystemd-network/test-lldp.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <net/ethernet.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-event.h"
diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index ac1a954546..f760f0fdd2 100644
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 9e8f0a73f5..93984d1c59 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index 58124abd21..b3febdbb31 100644
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -8,7 +8,6 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c
index ef22e190e4..fbfd89b69b 100644
--- a/src/libsystemd/sd-login/sd-login.c
+++ b/src/libsystemd/sd-login/sd-login.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <poll.h>
-#include <string.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c
index e9df5f8bc5..49ed247278 100644
--- a/src/libsystemd/sd-login/test-login.c
+++ b/src/libsystemd/sd-login/test-login.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <poll.h>
-#include <string.h>
 
 #include "sd-login.h"
 
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index bdd891d0cd..dc5ccb793b 100644
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <poll.h>
-#include <string.h>
 #include <sys/inotify.h>
 
 #include "sd-network.h"
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 8de7adcd16..3446f0f778 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -5,7 +5,6 @@
 #include <netinet/in.h>
 #include <resolv.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/socket.h>
 
 #include "sd-resolve.h"
diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index af7312a011..b4450727ca 100644
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "libudev.h"
 
diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index f8c36c94f5..519dd0d188 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 5532e93255..50c4c703f1 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -5,7 +5,6 @@
 #include <locale.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "sd-bus.h"
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 8d0eec96a5..baf0bd102b 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 706a4e45fe..26681ac947 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <locale.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 2e13e4aed6..ff192c53eb 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "sd-device.h"
 
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 5598fb2c0b..4a6ac2afc9 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <linux/input.h>
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 6b3f2a731b..1c7c4912fb 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <pwd.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 67fe9921d4..1d335f914c 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 9958490875..34ac0350f2 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 094fcd668d..026bcf4d8e 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 872b9a86d9..8f13edafb0 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 68468464cd..9e8f04d3ea 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -5,7 +5,6 @@
 #include <linux/kd.h>
 #include <linux/vt.h>
 #include <signal.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index a6e2d4950d..1dc222f90e 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index b17fb2e322..c3c8b1a2a5 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 3a5a333496..059a135f87 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <pwd.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
diff --git a/src/login/logind.c b/src/login/logind.c
index d889d7b9be..d8c1bbe15b 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-daemon.h"
diff --git a/src/login/sysfs-show.c b/src/login/sysfs-show.c
index 9104e023e8..a66be28ad9 100644
--- a/src/login/sysfs-show.c
+++ b/src/login/sysfs-show.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "sd-device.h"
 
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index dbb5254f3d..3b2ac38298 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 
diff --git a/src/machine/machine.c b/src/machine/machine.c
index c6475a5398..acd57aedc4 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 907f751ef2..4796f1ff4c 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -8,7 +8,6 @@
 #include <math.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <unistd.h>
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 5276398ab5..35e06f5d6a 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 7797f36d44..aaeb2c0d2f 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -4,7 +4,6 @@
 #include <getopt.h>
 #include <libkmod.h>
 #include <limits.h>
-#include <string.h>
 #include <sys/stat.h>
 
 #include "conf-files.h"
diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index 6a9e459494..51db60e1f2 100644
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -4,7 +4,6 @@
 #include <inttypes.h>
 #include <net/if.h>
 #include <net/if_arp.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "env-file.h"
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3513c015b8..dfd14ca390 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -16,7 +16,6 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 90de140a9d..8c16b7f360 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -5,7 +5,6 @@
 #include <netdb.h>
 #include <nss.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "errno-util.h"
diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 95f80572bd..de46a8d469 100644
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -4,7 +4,6 @@
 #include <netdb.h>
 #include <nss.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index e8a4b5e88c..2fcbcb281a 100644
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/random.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #if USE_SYS_RANDOM_H
 #  include <sys/random.h>
diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 0df29aa69f..5891013427 100644
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <mntent.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 1a8a9a6d62..97b8e30aa3 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 9b5b8f8f13..aa08e0b4ef 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -11,7 +11,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/inotify.h>
 #include <sys/signalfd.h>
 #include <sys/socket.h>
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 7a4da51911..a55136d913 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -5,7 +5,6 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
index 9b1582da99..609403ab79 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -7,7 +7,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <time.h>
 
diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index 732bc752af..4657e820d9 100644
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -5,7 +5,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 46fa68027e..88d8e45ca1 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -7,7 +7,6 @@
 #include <mqueue.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/sem.h>
diff --git a/src/shared/condition.c b/src/shared/condition.c
index 5a5d35bcc3..53018cd601 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 <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index ce714bcc8b..3269d83031 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/dm-util.c b/src/shared/dm-util.c
index f73bf93520..d817e5b0e5 100644
--- a/src/shared/dm-util.c
+++ b/src/shared/dm-util.c
@@ -1,6 +1,5 @@
 #include <fcntl.h>
 #include <linux/dm-ioctl.h>
-#include <string.h>
 #include <sys/ioctl.h>
 
 #include "dm-util.h"
diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c
index f62ad0a0f5..b812665315 100644
--- a/src/shared/dns-domain.c
+++ b/src/shared/dns-domain.c
@@ -10,7 +10,6 @@
 #include <endian.h>
 #include <netinet/in.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/socket.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 135b01f282..6b73e25f89 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -4,7 +4,6 @@
 #include <mntent.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "device-nodes.h"
diff --git a/src/shared/import-util.c b/src/shared/import-util.c
index dad6c1c2fe..f7770e7df5 100644
--- a/src/shared/import-util.c
+++ b/src/shared/import-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index d2143beda3..2061384afe 100644
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "format-util.h"
diff --git a/src/shared/install.c b/src/shared/install.c
index 0724dd96ee..193805b27e 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/shared/json.c b/src/shared/json.c
index f1bb50cfa2..7393c100cd 100644
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -5,7 +5,6 @@
 #include <math.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "sd-messages.h"
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index b615c70dff..4f13e927b3 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -5,7 +5,6 @@
 #include <signal.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <syslog.h>
 #include <time.h>
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index cceed58f74..839f1f97aa 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index e55d3c2315..d316e81aa2 100644
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
diff --git a/src/shared/pager.c b/src/shared/pager.c
index 7c20b100b4..ad99c5206c 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <unistd.h>
 
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 6bf0ff0316..5b16209745 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "fs-util.h"
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index e8f61b36e9..f1ee8c10ec 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -9,7 +9,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/shared/specifier.c b/src/shared/specifier.c
index c8e789680d..b036ff67dd 100644
--- a/src/shared/specifier.c
+++ b/src/shared/specifier.c
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/utsname.h>
 
 #include "sd-id128.h"
diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c
index 93bdcf11bf..12fb3ef7ea 100644
--- a/src/shared/sysctl-util.c
+++ b/src/shared/sysctl-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "fd-util.h"
diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index 646f449821..fa4f32f353 100644
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <sys/utsname.h>
 #include <unistd.h>
diff --git a/src/shared/verbs.c b/src/shared/verbs.c
index c87b496736..1d23ed48a2 100644
--- a/src/shared/verbs.c
+++ b/src/shared/verbs.c
@@ -4,7 +4,6 @@
 #include <getopt.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <string.h>
 
 #include "env-util.h"
 #include "log.h"
diff --git a/src/shared/xml.c b/src/shared/xml.c
index 2709076264..78ac42f080 100644
--- a/src/shared/xml.c
+++ b/src/shared/xml.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <string.h>
 
 #include "macro.h"
 #include "string-util.h"
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index c75be39fef..4563a9d720 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <linux/dm-ioctl.h>
 #include <linux/loop.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/swap.h>
 #include <sys/stat.h>
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index abbbc9f2d6..262f899aa0 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -6,7 +6,6 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index c67782ea8f..56d86d8eba 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -6,7 +6,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3fabbb665c..3009951008 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -7,7 +7,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
index c8ef3295b5..884372e60e 100644
--- a/src/test/test-af-list.c
+++ b/src/test/test-af-list.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 #include <sys/socket.h>
 
 #include "macro.h"
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index 46358ef952..07987996c7 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 
 #include "alloc-util.h"
 #include "calendarspec.h"
diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 1891df0eb9..f16cb291f2 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 #include <unistd.h>
 
 #include "cgroup-setup.h"
diff --git a/src/test/test-date.c b/src/test/test-date.c
index 9888b65998..6c6efc349a 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 
 #include "alloc-util.h"
 #include "string-util.h"
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 1064811497..265152fb76 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "bus-util.h"
 #include "manager.h"
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 17dacda70f..cb4ee7a576 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 
 #include "env-util.h"
 #include "fd-util.h"
diff --git a/src/test/test-exec-util.c b/src/test/test-exec-util.c
index ec51891634..3168411d8b 100644
--- a/src/test/test-exec-util.c
+++ b/src/test/test-exec-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/src/test/test-extract-word.c b/src/test/test-extract-word.c
index bf47a598a9..4ca57555f1 100644
--- a/src/test/test-extract-word.c
+++ b/src/test/test-extract-word.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "extract-word.h"
 #include "log.h"
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index eea0765b7a..4d7513f6d5 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 8deaf4eb0f..181f254fe7 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -3,7 +3,6 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/capability.h>
 #include <unistd.h>
 
diff --git a/src/test/test-strbuf.c b/src/test/test-strbuf.c
index 9e93bc1751..483ba44caa 100644
--- a/src/test/test-strbuf.c
+++ b/src/test/test-strbuf.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "strbuf.h"
 #include "string-util.h"
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index 5e96f3a8a7..bc61fc9201 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <string.h>
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index d7199124a3..749aa46d75 100644
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdio.h>
-#include <string.h>
 
 #include "string-util.h"
 #include "strxcpyx.h"
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index aa072c4ca8..78e1c68b2a 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -3,7 +3,6 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "alloc-util.h"
 #include "all-units.h"
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 120baa3593..61725bdf08 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 4f15a400ab..97a0868bc1 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 808cc18892..8c0fae3458 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -11,7 +11,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 068988e203..236c191034 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -10,7 +10,6 @@
 #include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <string.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
 #include <sys/socket.h>
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index e1a8d7e3a9..94c3b232e5 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -13,7 +13,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 8deb692f13..7f25824df3 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -14,7 +14,6 @@
 #include <scsi/sg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index c6b0208b4b..33bc59dacc 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -11,7 +11,6 @@
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 
 #include "sd-id128.h"
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 7a8e1f75dd..034e5987cc 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -11,7 +11,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <linux/limits.h>
 #include <linux/input.h>
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index 800eeb2180..7dbd829b6d 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <linux/input.h>
 
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index e6d4659d9f..4cdbfa1321 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -19,7 +19,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <linux/pci_regs.h>
 
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index e8f1ce1354..ca38f56087 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -12,7 +12,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 58d665998a..c12af28d10 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -12,7 +12,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 9bbed82209..b41fbfc39a 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -2,7 +2,6 @@
 
 #include <getopt.h>
 #include <stdio.h>
-#include <string.h>
 
 #include "device-private.h"
 #include "device-util.h"
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index f161402f3a..fbbc515b00 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 2c8626ffad..2d2bc0026e 100644
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -6,7 +6,6 @@
 #include <getopt.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 1524808ffe..7d7044eac3 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index cb5123042a..e635e5b110 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -13,7 +13,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/epoll.h>
 #include <sys/file.h>
 #include <sys/inotify.h>
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 9338524a33..55fd8ba46e 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-- 
cgit v1.2.1


From 1c1da38afc3e4b83a0b3bbc79742ddc41270904c Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:46:59 +0900
Subject: tree-wide: drop alloca.h when alloc-util.h is included

---
 src/basic/process-util.h   | 1 -
 src/basic/string-util.h    | 1 -
 src/basic/user-util.c      | 1 -
 src/basic/util.c           | 1 -
 src/cgtop/cgtop.c          | 1 -
 src/journal/audit-type.h   | 1 -
 src/shared/calendarspec.c  | 1 -
 src/shared/fdset.c         | 1 -
 src/shared/firewall-util.c | 1 -
 9 files changed, 9 deletions(-)

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 41d4759c97..5f4e174f04 100644
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <alloca.h>
 #include <errno.h>
 #include <sched.h>
 #include <signal.h>
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index 3981129db3..04cc82b386 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index f0e403829a..495398ca01 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index adca56c500..75c7d98dd7 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 9c6094c039..2494c70238 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <alloca.h>
 #include <errno.h>
 #include <getopt.h>
 #include <signal.h>
diff --git a/src/journal/audit-type.h b/src/journal/audit-type.h
index 98e5c39420..39d917894e 100644
--- a/src/journal/audit-type.h
+++ b/src/journal/audit-type.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <alloca.h>
 #include <stdio.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
index 609403ab79..965fa3dbf7 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <alloca.h>
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index ae65286c78..89d118a3aa 100644
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index 93bdd8c7f1..c142b2e9a1 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -5,7 +5,6 @@
  */
 #define _NET_IF_H 1
 
-#include <alloca.h>
 #include <arpa/inet.h>
 #include <endian.h>
 #include <errno.h>
-- 
cgit v1.2.1


From 996f7e1cd01b7d0c9c21722cf99ff118dec9d252 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:55:16 +0900
Subject: tree-wide: drop dirent.h when dirent-util.h is included

---
 src/basic/cgroup-util.c    | 1 -
 src/basic/conf-files.c     | 1 -
 src/basic/copy.c           | 1 -
 src/basic/glob-util.c      | 1 -
 src/basic/locale-util.c    | 1 -
 src/basic/stat-util.c      | 1 -
 src/boot/bootctl.c         | 1 -
 src/core/smack-setup.c     | 1 -
 src/shared/clean-ipc.c     | 1 -
 src/shared/install.c       | 1 -
 src/shared/machine-image.c | 1 -
 11 files changed, 11 deletions(-)

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index f3367a9cf3..ea74a65a29 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <ftw.h>
 #include <limits.h>
diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 838b485e22..58eb62fb7a 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/basic/copy.c b/src/basic/copy.c
index 4a3eaee010..a8498ab491 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index b335af8d97..31386854c1 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <glob.h>
 #include <sys/types.h>
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 5fd18028bb..29456521c9 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ftw.h>
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 173054f9d7..5144b87f59 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/magic.h>
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index bfdbdc7a91..3c4c095e2f 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -2,7 +2,6 @@
 
 #include <blkid.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <errno.h>
 #include <ftw.h>
 #include <getopt.h>
diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index d7a0f7a07b..4427397f27 100644
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -5,7 +5,6 @@
         Nathaniel Chen <nathaniel.chen@intel.com>
 ***/
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 88d8e45ca1..e4cd2d30d0 100644
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/src/shared/install.c b/src/shared/install.c
index 193805b27e..1e4730f356 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 839f1f97aa..a11803e731 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-- 
cgit v1.2.1


From 99e0d097316be28a1f7bf49d0b71a308684a9a3b Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:56:05 +0900
Subject: tree-wide: drop glob.h when glob-util.h is included

---
 src/basic/glob-util.c         | 1 -
 src/core/execute.c            | 1 -
 src/resolve/test-dns-packet.c | 1 -
 src/test/test-glob-util.c     | 1 -
 src/tmpfiles/tmpfiles.c       | 1 -
 5 files changed, 5 deletions(-)

diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index 31386854c1..e3aa6c2e15 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <glob.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/core/execute.c b/src/core/execute.c
index 22817806c0..b9a59fe0a1 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <glob.h>
 #include <grp.h>
 #include <poll.h>
 #include <signal.h>
diff --git a/src/resolve/test-dns-packet.c b/src/resolve/test-dns-packet.c
index f6df9135ee..7c6346cb66 100644
--- a/src/resolve/test-dns-packet.c
+++ b/src/resolve/test-dns-packet.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <net/if.h>
-#include <glob.h>
 
 #include "sd-id128.h"
 
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
index b4f41445fe..667d15335f 100644
--- a/src/test/test-glob-util.c
+++ b/src/test/test-glob-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <glob.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 8c0fae3458..fbb8e00f02 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <getopt.h>
-#include <glob.h>
 #include <limits.h>
 #include <linux/fs.h>
 #include <stdbool.h>
-- 
cgit v1.2.1


From a969d606453ec7c3fee25fb30c02be4c4e6e5206 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:56:33 +0900
Subject: tree-wide: drop locale.h when locale-util.h is included

---
 src/analyze/analyze.c     | 1 -
 src/basic/locale-util.c   | 1 -
 src/basic/parse-util.c    | 1 -
 src/journal/journalctl.c  | 1 -
 src/locale/localectl.c    | 1 -
 src/machine/machinectl.c  | 1 -
 src/systemctl/systemctl.c | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 2d541fe701..9972941520 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -5,7 +5,6 @@
 
 #include <getopt.h>
 #include <inttypes.h>
-#include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index 29456521c9..b3c5805784 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -5,7 +5,6 @@
 #include <ftw.h>
 #include <langinfo.h>
 #include <libintl.h>
-#include <locale.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index e36c6c7432..aec6099c9c 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <linux/oom.h>
-#include <locale.h>
 #include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 332270cc19..771c5c1730 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -5,7 +5,6 @@
 #include <fnmatch.h>
 #include <getopt.h>
 #include <linux/fs.h>
-#include <locale.h>
 #include <poll.h>
 #include <signal.h>
 #include <stddef.h>
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 50c4c703f1..fb02bfd4a6 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -2,7 +2,6 @@
 
 #include <ftw.h>
 #include <getopt.h>
-#include <locale.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 4796f1ff4c..6dbdba12fd 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <locale.h>
 #include <math.h>
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 3009951008..5b2d9d72e7 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <locale.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-- 
cgit v1.2.1


From a4dca9836bfc932b54cb14d33f438b058f2bce7c Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 17:57:13 +0900
Subject: tree-wide: drop gcrypt.h when gcrypt-util.h is included

---
 src/basic/gcrypt-util.c           | 1 -
 src/journal/fsprg.c               | 1 -
 src/resolve/resolved-dns-dnssec.c | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index 9bab47dd8a..a82be979de 100644
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #if HAVE_GCRYPT
-#include <gcrypt.h>
 
 #include "gcrypt-util.h"
 #include "hexdecoct.h"
diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c
index d60fc50068..1dda2149d4 100644
--- a/src/journal/fsprg.c
+++ b/src/journal/fsprg.c
@@ -27,7 +27,6 @@
  * http://eprint.iacr.org/2013/397
  */
 
-#include <gcrypt.h>
 #include <string.h>
 
 #include "fsprg.h"
diff --git a/src/resolve/resolved-dns-dnssec.c b/src/resolve/resolved-dns-dnssec.c
index fc375a8821..ec9bfd7ad3 100644
--- a/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@@ -1,9 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#if HAVE_GCRYPT
-#  include <gcrypt.h>
-#endif
-
 #include "alloc-util.h"
 #include "dns-domain.h"
 #include "fd-util.h"
-- 
cgit v1.2.1


From df26692947ac556a20ce0a6f1585db18871ace1c Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:16:18 +0900
Subject: tree-wide: drop sched.h when missing_sched.h is included

---
 src/nspawn/nspawn.c          | 1 -
 src/test/test-process-util.c | 1 -
 src/test/test-seccomp.c      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index dfd14ca390..db3bc1a4db 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -9,7 +9,6 @@
 #include <linux/fs.h>
 #include <linux/loop.h>
 #include <pwd.h>
-#include <sched.h>
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index ad441ae731..762a203577 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <sched.h>
 #include <sys/mount.h>
 #include <sys/personality.h>
 #include <sys/prctl.h>
diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
index af17a56516..018c20f8be 100644
--- a/src/test/test-seccomp.c
+++ b/src/test/test-seccomp.c
@@ -2,7 +2,6 @@
 
 #include <fcntl.h>
 #include <poll.h>
-#include <sched.h>
 #include <stdlib.h>
 #include <sys/eventfd.h>
 #include <sys/mman.h>
-- 
cgit v1.2.1


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

---
 src/basic/capability-util.c   | 1 -
 src/core/execute.c            | 1 -
 src/test/test-capability.c    | 1 -
 src/test/test-load-fragment.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index d62bb62de4..bde6a4a57b 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -4,7 +4,6 @@
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/capability.h>
 #include <sys/prctl.h>
 #include <unistd.h>
 
diff --git a/src/core/execute.c b/src/core/execute.c
index b9a59fe0a1..fe35168cb6 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -5,7 +5,6 @@
 #include <grp.h>
 #include <poll.h>
 #include <signal.h>
-#include <sys/capability.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 84a6e92df1..295136e1ef 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -2,7 +2,6 @@
 
 #include <netinet/in.h>
 #include <pwd.h>
-#include <sys/capability.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
diff --git a/src/test/test-load-fragment.c b/src/test/test-load-fragment.c
index 181f254fe7..216f0e4d94 100644
--- a/src/test/test-load-fragment.c
+++ b/src/test/test-load-fragment.c
@@ -3,7 +3,6 @@
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <sys/capability.h>
 #include <unistd.h>
 
 #include "all-units.h"
-- 
cgit v1.2.1


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

---
 src/basic/copy.c                 | 1 -
 src/basic/fs-util.c              | 1 -
 src/basic/io-util.c              | 1 -
 src/basic/log.c                  | 1 -
 src/shared/calendarspec.c        | 1 -
 src/shared/logs-show.c           | 1 -
 src/timesync/timesyncd-manager.c | 1 -
 7 files changed, 7 deletions(-)

diff --git a/src/basic/copy.c b/src/basic/copy.c
index a8498ab491..08cbc4addf 100644
--- a/src/basic/copy.c
+++ b/src/basic/copy.c
@@ -8,7 +8,6 @@
 #include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <sys/xattr.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 43558f6f24..c366495f42 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -7,7 +7,6 @@
 #include <sys/stat.h>
 #include <linux/falloc.h>
 #include <linux/magic.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/io-util.c b/src/basic/io-util.c
index 4acd17df84..c906fc0741 100644
--- a/src/basic/io-util.c
+++ b/src/basic/io-util.c
@@ -4,7 +4,6 @@
 #include <limits.h>
 #include <poll.h>
 #include <stdio.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "io-util.h"
diff --git a/src/basic/log.c b/src/basic/log.c
index 77ba5fc776..6bf6fad541 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -12,7 +12,6 @@
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c
index 965fa3dbf7..aa0d6a8224 100644
--- a/src/shared/calendarspec.c
+++ b/src/shared/calendarspec.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <time.h>
 
 #include "alloc-util.h"
 #include "calendarspec.h"
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 4f13e927b3..95b2e3376e 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <syslog.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "sd-id128.h"
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 738178532c..e7682281a3 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -10,7 +10,6 @@
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 #include <sys/types.h>
-#include <time.h>
 
 #include "sd-daemon.h"
 
-- 
cgit v1.2.1


From 927d2351d73d977940852379a3869b96539e37bf Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:18:31 +0900
Subject: tree-wide: drop pwd.h and grp.h when user-util.h is included

---
 src/basic/capability-util.c | 1 -
 src/basic/user-util.c       | 2 --
 src/core/dynamic-user.c     | 2 --
 src/core/execute.c          | 1 -
 src/login/logind-core.c     | 1 -
 src/login/logind-dbus.c     | 1 -
 src/login/logind-utmp.c     | 1 -
 src/nspawn/nspawn-setuid.c  | 1 -
 src/nspawn/nspawn.c         | 2 --
 src/test/test-execute.c     | 2 --
 src/test/test-unit-name.c   | 1 -
 11 files changed, 15 deletions(-)

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index bde6a4a57b..d084ad5cf5 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index 495398ca01..93ba4eedd2 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -2,8 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index e7a2f64525..75373407b4 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/core/execute.c b/src/core/execute.c
index fe35168cb6..fadb651def 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <grp.h>
 #include <poll.h>
 #include <signal.h>
 #include <sys/eventfd.h>
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index b981544e12..4585afedc6 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <linux/vt.h>
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1c7c4912fb..69b5994878 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <pwd.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 059a135f87..d2a5890277 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <pwd.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c
index 3c302d6487..cb2b2272b6 100644
--- a/src/nspawn/nspawn-setuid.c
+++ b/src/nspawn/nspawn-setuid.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <grp.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index db3bc1a4db..3a866980c8 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -5,10 +5,8 @@
 #endif
 #include <errno.h>
 #include <getopt.h>
-#include <grp.h>
 #include <linux/fs.h>
 #include <linux/loop.h>
-#include <pwd.h>
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 435ab39cd2..92fb35fd87 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <grp.h>
-#include <pwd.h>
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <sys/types.h>
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 78e1c68b2a..c65f6ffe08 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-- 
cgit v1.2.1


From e25910849441372339340bc8ce1ce990e126ac63 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:19:54 +0900
Subject: tree-wide: drop acl.h when acl-util.h is included

---
 src/nspawn/nspawn-patch-uid.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index 199e5804dd..c2f068fa99 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -2,9 +2,6 @@
 
 #include <fcntl.h>
 #include <linux/magic.h>
-#if HAVE_ACL
-#include <sys/acl.h>
-#endif
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/vfs.h>
-- 
cgit v1.2.1


From adb29d588ed8497d2c51f1d6d5e45a1e0d80a1dd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:20:31 +0900
Subject: tree-wide: drop blkid.h when blkid-util.h is included

---
 src/boot/bootctl.c                          | 1 -
 src/gpt-auto-generator/gpt-auto-generator.c | 1 -
 src/nspawn/nspawn.c                         | 1 -
 src/udev/udev-builtin-blkid.c               | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 3c4c095e2f..fa846b1d26 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <blkid.h>
 #include <ctype.h>
 #include <errno.h>
 #include <ftw.h>
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 5affc57b79..e4612edff8 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <blkid.h>
 #include <stdlib.h>
 #include <sys/statfs.h>
 #include <unistd.h>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3a866980c8..6439e604da 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #if HAVE_BLKID
-#include <blkid.h>
 #endif
 #include <errno.h>
 #include <getopt.h>
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 33bc59dacc..8798a5a5e2 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -5,7 +5,6 @@
  * Copyright © 2011 Karel Zak <kzak@redhat.com>
  */
 
-#include <blkid.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-- 
cgit v1.2.1


From c41548993209e5f148477817bc77a56454088f73 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:20:59 +0900
Subject: tree-wide: drop libkmod.h when module-util.h is included

---
 src/core/kmod-setup.c           | 1 -
 src/modules-load/modules-load.c | 1 -
 src/test/test-netlink-manual.c  | 1 -
 src/udev/udev-builtin-kmod.c    | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index fd42684034..1286743273 100644
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -12,7 +12,6 @@
 #include "string-util.h"
 
 #if HAVE_KMOD
-#include <libkmod.h>
 #include "module-util.h"
 
 static void systemd_kmod_log(
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index aaeb2c0d2f..337a460318 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <libkmod.h>
 #include <limits.h>
 #include <sys/stat.h>
 
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index 031a47605e..a734524eeb 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <arpa/inet.h>
-#include <libkmod.h>
 #include <linux/if_tunnel.h>
 #include <linux/ip.h>
 #include <sys/types.h>
diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
index 86612fc975..b3daddcdd5 100644
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -6,7 +6,6 @@
  */
 
 #include <errno.h>
-#include <libkmod.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.1


From af760d85c3fa6386b71a64d038cd8eb9f9ff75cf Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:21:33 +0900
Subject: tree-wide: drop mntent.h when fstab-util.h is included

---
 src/fstab-generator/fstab-generator.c | 1 -
 src/shared/fstab-util.c               | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 01f678cc0e..abe4413f92 100644
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <mntent.h>
 #include <stdio.h>
 #include <unistd.h>
 
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 6b73e25f89..75e4784c38 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <mntent.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-- 
cgit v1.2.1


From 92133d287842dbd7c6d5efc8bd850a47221ebddd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:22:48 +0900
Subject: tree-wide: drop socket.h when socket-util.h is included

---
 src/activate/activate.c                             | 1 -
 src/basic/fd-util.c                                 | 1 -
 src/basic/log.c                                     | 1 -
 src/basic/socket-label.c                            | 1 -
 src/basic/terminal-util.c                           | 1 -
 src/cgroups-agent/cgroups-agent.c                   | 1 -
 src/core/execute.c                                  | 1 -
 src/journal-remote/journal-remote.c                 | 1 -
 src/journal/journal-send.c                          | 1 -
 src/libsystemd-network/dhcp-network.c               | 1 -
 src/libsystemd-network/dhcp6-network.c              | 1 -
 src/libsystemd-network/icmp6-util.c                 | 1 -
 src/libsystemd-network/test-dhcp6-client.c          | 1 -
 src/libsystemd-network/test-ipv4ll.c                | 1 -
 src/libsystemd/sd-bus/bus-internal.h                | 1 -
 src/libsystemd/sd-daemon/sd-daemon.c                | 1 -
 src/libsystemd/sd-device/device-monitor.c           | 1 -
 src/libsystemd/sd-netlink/sd-netlink.c              | 1 -
 src/libsystemd/sd-resolve/test-resolve.c            | 1 -
 src/reply-password/reply-password.c                 | 1 -
 src/shared/ask-password-api.c                       | 1 -
 src/shared/firewall-util.c                          | 1 -
 src/socket-proxy/socket-proxyd.c                    | 1 -
 src/systemctl/systemctl.c                           | 1 -
 src/timesync/timesyncd-manager.c                    | 1 -
 src/tty-ask-password-agent/tty-ask-password-agent.c | 1 -
 src/udev/udev-ctrl.c                                | 1 -
 src/udev/udevd.c                                    | 1 -
 28 files changed, 28 deletions(-)

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 2fe312f5a0..9948520c1f 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -3,7 +3,6 @@
 #include <getopt.h>
 #include <sys/epoll.h>
 #include <sys/prctl.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 1024490f23..5d78fab834 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/resource.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/basic/log.c b/src/basic/log.c
index 6bf6fad541..13691be67b 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 64b1855deb..8c087268e4 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 264f15425e..98c3ff04ef 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 #include <sys/sysmacros.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 9721a32ed6..ace7d6c5ae 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdlib.h>
-#include <sys/socket.h>
 
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index fadb651def..b4463e2382 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/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 6cbaf722c6..8ad1239e98 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
-#include <sys/socket.h>
 #include <stdint.h>
 
 #include "sd-daemon.h"
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 5ef11fa1a4..912ecef73c 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <printf.h>
 #include <stddef.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index 8e7f8a65ab..f48e7c3490 100644
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -9,7 +9,6 @@
 #include <net/if_arp.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <linux/filter.h>
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
diff --git a/src/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c
index 580f43ba40..f82afe6a09 100644
--- a/src/libsystemd-network/dhcp6-network.c
+++ b/src/libsystemd-network/dhcp6-network.c
@@ -8,7 +8,6 @@
 #include <netinet/ip6.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <linux/if_packet.h>
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c
index e1f193ab24..dbb1e51a0e 100644
--- a/src/libsystemd-network/icmp6-util.c
+++ b/src/libsystemd-network/icmp6-util.c
@@ -9,7 +9,6 @@
 #include <netinet/ip6.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <net/if.h>
diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index 0983d7b51b..4b89b320b7 100644
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -7,7 +7,6 @@
 #include <net/if_arp.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 156718f209..2f319bf7d9 100644
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -7,7 +7,6 @@
 #include <netinet/if_ether.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 6d2c1e8405..352a419e25 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <pthread.h>
-#include <sys/socket.h>
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 93984d1c59..ff71194331 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 52e51fdd66..42753abe08 100644
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <linux/filter.h>
 #include <linux/netlink.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "sd-device.h"
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 013e8ae957..87350e8591 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <poll.h>
-#include <sys/socket.h>
 
 #include "sd-netlink.h"
 
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 3446f0f778..38a78ee8a2 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -5,7 +5,6 @@
 #include <netinet/in.h>
 #include <resolv.h>
 #include <stdio.h>
-#include <sys/socket.h>
 
 #include "sd-resolve.h"
 
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 97b8e30aa3..3a0eb5c4b8 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index aa08e0b4ef..e00981872d 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index c142b2e9a1..4d4d615bb7 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 262f899aa0..2fb9c854fa 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -6,7 +6,6 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 5b2d9d72e7..257b6d9f12 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -9,7 +9,6 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index e7682281a3..da6b410476 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -6,7 +6,6 @@
 #include <netinet/ip.h>
 #include <resolv.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 #include <sys/types.h>
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 236c191034..5fa0b8dca1 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -12,7 +12,6 @@
 #include <stddef.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index f1befc7304..b8c0d83a02 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -13,7 +13,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index e635e5b110..867422ad36 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -20,7 +20,6 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-- 
cgit v1.2.1


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


From 0fb81b8abe8d87f0b9a55f75c19438e55b5f7395 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:24:45 +0900
Subject: tree-wide: drop magic.h when missing_magic.h is included

---
 src/basic/stat-util.c         | 1 -
 src/nspawn/nspawn-patch-uid.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index a25cf4151c..8ef90e96b7 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <linux/magic.h>
 #include <sched.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c
index 7c1dbc2cf4..fc591e2725 100644
--- a/src/nspawn/nspawn-patch-uid.c
+++ b/src/nspawn/nspawn-patch-uid.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <linux/magic.h>
 #include <sys/statvfs.h>
 #include <sys/vfs.h>
 #include <unistd.h>
-- 
cgit v1.2.1


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

---
 src/shared/serialize.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index 5b5e4947ef..00b70a777e 100644
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <sys/mman.h>
 
 #include "alloc-util.h"
 #include "env-util.h"
-- 
cgit v1.2.1


From 021cdf8330b29256e19a34fb4eecf95e9fa9a81b Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:27:01 +0900
Subject: tree-wide: drop signal.h when signal-util.h is included

---
 src/basic/process-util.c                            | 1 -
 src/basic/util.c                                    | 1 -
 src/core/execute.c                                  | 1 -
 src/core/main.c                                     | 1 -
 src/core/manager.c                                  | 1 -
 src/core/service.c                                  | 1 -
 src/core/socket.c                                   | 1 -
 src/nspawn/nspawn.c                                 | 1 -
 src/partition/makefs.c                              | 1 -
 src/shared/ask-password-api.c                       | 1 -
 src/shared/pager.c                                  | 1 -
 src/shutdown/shutdown.c                             | 1 -
 src/test/test-signal-util.c                         | 1 -
 src/time-wait-sync/time-wait-sync.c                 | 1 -
 src/tty-ask-password-agent/tty-ask-password-agent.c | 1 -
 src/udev/udevadm-monitor.c                          | 1 -
 src/udev/udevd.c                                    | 1 -
 17 files changed, 17 deletions(-)

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index 87b03f89e5..aaec6a6a99 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <limits.h>
 #include <linux/oom.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/basic/util.c b/src/basic/util.c
index 7e9e85d11f..0545b79792 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/core/execute.c b/src/core/execute.c
index ca389475f6..1c22c3d80e 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <poll.h>
-#include <signal.h>
 #include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
diff --git a/src/core/main.c b/src/core/main.c
index 5353ac80e3..5da47a0bf6 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <signal.h>
 #include <stdio.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
diff --git a/src/core/manager.c b/src/core/manager.c
index fc1207cbe0..700493ee0d 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <linux/kd.h>
-#include <signal.h>
 #include <sys/epoll.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
diff --git a/src/core/service.c b/src/core/service.c
index e0d359890a..ebbd99a3cc 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/core/socket.c b/src/core/socket.c
index ee8ed3fd06..fc5ee69c9c 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <mqueue.h>
 #include <netinet/tcp.h>
-#include <signal.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 6439e604da..eafc52a4b2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -9,7 +9,6 @@
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index 0b9bae55e7..ee4907f73f 100644
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -3,7 +3,6 @@
 ***/
 
 #include <fcntl.h>
-#include <signal.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index e00981872d..5488d8a74b 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -5,7 +5,6 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <poll.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/shared/pager.c b/src/shared/pager.c
index ad99c5206c..1fe9db1791 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
-#include <signal.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 1be26bf56f..15e6c1799e 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <linux/reboot.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <sys/mman.h>
diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
index 8ea4163790..1a8c60ad42 100644
--- a/src/test/test-signal-util.c
+++ b/src/test/test-signal-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <signal.h>
 #include <unistd.h>
 
 #include "log.h"
diff --git a/src/time-wait-sync/time-wait-sync.c b/src/time-wait-sync/time-wait-sync.c
index 124c74076b..e880f9e6b6 100644
--- a/src/time-wait-sync/time-wait-sync.c
+++ b/src/time-wait-sync/time-wait-sync.c
@@ -8,7 +8,6 @@
  */
 
 #include <errno.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 5fa0b8dca1..784dd0df72 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <getopt.h>
 #include <poll.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/prctl.h>
diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index ca7ca3c37f..2ca98a729f 100644
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <signal.h>
 
 #include "sd-device.h"
 #include "sd-event.h"
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 867422ad36..0ae61c1e8b 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -8,7 +8,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <signal.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-- 
cgit v1.2.1


From 1405cb653ae8588404e64af0265bb0bec47537b4 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:27:33 +0900
Subject: tree-wide: drop stdio.h when stdio-util.h is included

---
 src/basic/efivars.c                    | 1 -
 src/basic/format-util.c                | 1 -
 src/basic/fs-util.c                    | 1 -
 src/basic/log.c                        | 1 -
 src/basic/signal-util.c                | 1 -
 src/basic/tmpfile-util.c               | 1 -
 src/boot/bootctl.c                     | 1 -
 src/core/main.c                        | 1 -
 src/core/selinux-access.c              | 1 -
 src/fsck/fsck.c                        | 1 -
 src/journal-remote/journal-remote.c    | 1 -
 src/libsystemd-network/sd-dhcp-lease.c | 1 -
 src/nspawn/nspawn.c                    | 1 -
 src/shared/bus-util.c                  | 1 -
 src/shared/sleep-config.c              | 1 -
 src/shared/switch-root.c               | 1 -
 src/sleep/sleep.c                      | 1 -
 src/test/test-libudev.c                | 1 -
 src/tmpfiles/tmpfiles.c                | 1 -
 src/udev/udev-builtin-input_id.c       | 1 -
 src/udev/udev-builtin-keyboard.c       | 1 -
 src/udev/udev-builtin-net_id.c         | 1 -
 src/udev/udev-event.c                  | 1 -
 src/udev/udev-node.c                   | 1 -
 src/vconsole/vconsole-setup.c          | 1 -
 25 files changed, 25 deletions(-)

diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index 9b71052ffb..daa66ac2d9 100644
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <linux/fs.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/basic/format-util.c b/src/basic/format-util.c
index 9fea2e0690..1a73225951 100644
--- a/src/basic/format-util.c
+++ b/src/basic/format-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <stdio.h>
 
 #include "format-util.h"
 #include "memory-util.h"
diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 8efb6e39af..8b05d2402d 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <linux/falloc.h>
 #include <linux/magic.h>
diff --git a/src/basic/log.c b/src/basic/log.c
index 13691be67b..17557e1844 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -6,7 +6,6 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <sys/signalfd.h>
 #include <sys/time.h>
 #include <sys/uio.h>
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index fb8a63fb9a..21964bb2db 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stdarg.h>
-#include <stdio.h>
 
 #include "macro.h"
 #include "parse-util.h"
diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c
index afcf58aeac..7cdaca4e40 100644
--- a/src/basic/tmpfile-util.c
+++ b/src/basic/tmpfile-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include <stdio.h>
 #include <sys/mman.h>
 
 #include "alloc-util.h"
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index f16e979e52..72c2115d89 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -7,7 +7,6 @@
 #include <limits.h>
 #include <linux/magic.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
diff --git a/src/core/main.c b/src/core/main.c
index 5da47a0bf6..bfbb9331f3 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
-#include <stdio.h>
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index cb136322fe..9fd3099fea 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <selinux/avc.h>
 #include <selinux/selinux.h>
-#include <stdio.h>
 #if HAVE_AUDIT
 #include <libaudit.h>
 #endif
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 55e6544d31..80f7107b9d 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -6,7 +6,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <sys/file.h>
 #include <sys/prctl.h>
 #include <sys/stat.h>
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 8ad1239e98..b241d3355d 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
 #include <stdint.h>
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index be3f22f333..48e8aad8f3 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -5,7 +5,6 @@
 
 #include <arpa/inet.h>
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index eafc52a4b2..c87e859194 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -9,7 +9,6 @@
 #if HAVE_SELINUX
 #include <selinux/selinux.h>
 #endif
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/personality.h>
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index a55136d913..5fbc55770e 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/resource.h>
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index f1ee8c10ec..03108b92cb 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -8,7 +8,6 @@
 #include <linux/fs.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c
index ebe9041482..bd89cb4ef1 100644
--- a/src/shared/switch-root.c
+++ b/src/shared/switch-root.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index f6a94f128a..89b80367f8 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -9,7 +9,6 @@
 #include <getopt.h>
 #include <linux/fiemap.h>
 #include <poll.h>
-#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/timerfd.h>
diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index dcb5bcc254..3ca8e1b108 100644
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <getopt.h>
-#include <stdio.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 17072f78b4..f4f7705a32 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -8,7 +8,6 @@
 #include <linux/fs.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/xattr.h>
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 034e5987cc..9a8e4790f5 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -9,7 +9,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <linux/limits.h>
diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index 7dbd829b6d..bb82e8ae97 100644
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <linux/input.h>
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index 4cdbfa1321..65f668d2a7 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -17,7 +17,6 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <linux/pci_regs.h>
diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 8cfa2cdf23..bff75ed521 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <net/if.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index fbbc515b00..2d725707d0 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 75d052ae70..9d706085fb 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -10,7 +10,6 @@
 #include <linux/tiocl.h>
 #include <linux/vt.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sysexits.h>
-- 
cgit v1.2.1


From 8cb28504a5edb365942e8ee8a957374d46b1384f Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:28:32 +0900
Subject: tree-wide: drop input.h when missing_input.h is included

---
 src/login/logind-button.c         | 1 -
 src/login/logind-session-device.c | 1 -
 src/udev/udev-builtin-input_id.c  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 4a6ac2afc9..9ec235a170 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include <linux/input.h>
 
 #include "sd-messages.h"
 
diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index 0fea372155..23df756ae2 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <fcntl.h>
-#include <linux/input.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index 9a8e4790f5..840bd01e1b 100644
--- a/src/udev/udev-builtin-input_id.c
+++ b/src/udev/udev-builtin-input_id.c
@@ -12,7 +12,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <linux/limits.h>
-#include <linux/input.h>
 
 #include "device-util.h"
 #include "fd-util.h"
-- 
cgit v1.2.1


From 8e1e87a5dee17e6ed9236f9d1a8c27f925e0e3fd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:33:24 +0900
Subject: tree-wide: drop double newline

---
 src/basic/format-util.c                     | 1 -
 src/basic/login-util.c                      | 1 -
 src/busctl/busctl.c                         | 2 --
 src/core/swap.c                             | 2 --
 src/libsystemd/sd-netlink/generic-netlink.c | 1 -
 src/network/networkctl.c                    | 1 -
 src/network/networkd-link.h                 | 1 -
 src/shared/cgroup-setup.c                   | 1 -
 src/shared/efi-loader.c                     | 1 -
 src/shared/ethtool-util.c                   | 1 -
 src/shared/ethtool-util.h                   | 1 -
 src/systemctl/systemctl.c                   | 1 -
 src/test/test-calendarspec.c                | 1 -
 src/test/test-date.c                        | 1 -
 src/test/test-env-util.c                    | 1 -
 src/test/test-strv.c                        | 1 -
 src/test/test-unit-file.c                   | 1 -
 17 files changed, 19 deletions(-)

diff --git a/src/basic/format-util.c b/src/basic/format-util.c
index 1a73225951..b4144e0352 100644
--- a/src/basic/format-util.c
+++ b/src/basic/format-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "format-util.h"
 #include "memory-util.h"
 #include "stdio-util.h"
diff --git a/src/basic/login-util.c b/src/basic/login-util.c
index 5c8e557c88..9313926d5a 100644
--- a/src/basic/login-util.c
+++ b/src/basic/login-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "login-util.h"
 #include "string-util.h"
 
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 8475c5bfdd..3ed8f21c96 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -342,8 +342,6 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
         if (r < 0)
                 return log_error_errno(r, "Failed to show table: %m");
 
-
-
         return 0;
 }
 
diff --git a/src/core/swap.c b/src/core/swap.c
index c184afa29d..e4b018616d 100644
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -727,7 +727,6 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
         if (s->result == SWAP_SUCCESS)
                 s->result = f;
 
-
         r = unit_kill_context(UNIT(s),
                               &s->kill_context,
                               state_to_kill_operation(s, state),
@@ -929,7 +928,6 @@ static int swap_stop(Unit *u) {
                 swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS);
                 return 0;
 
-
         default:
                 assert_not_reached("Unexpected state.");
         }
diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c
index 2576f4831d..b4971da323 100644
--- a/src/libsystemd/sd-netlink/generic-netlink.c
+++ b/src/libsystemd/sd-netlink/generic-netlink.c
@@ -99,7 +99,6 @@ static int lookup_id(sd_netlink *nl, sd_genl_family family, uint16_t *id) {
                 return 0;
         }
 
-
         r = sd_genl_message_new(nl, SD_GENL_ID_CTRL, CTRL_CMD_GETFAMILY, &req);
         if (r < 0)
                 return r;
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 5a8740883b..a43a179cbf 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -1812,7 +1812,6 @@ static int link_renew(int argc, char *argv[], void *userdata) {
         return k;
 }
 
-
 static int verb_reload(int argc, char *argv[], void *userdata) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 0b62326024..c8b8241ff1 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -145,7 +145,6 @@ typedef struct Link {
         struct rtnl_link_stats64 stats_old, stats_new;
         bool stats_updated;
 
-
         /* All kinds of DNS configuration */
         struct in_addr_data *dns;
         unsigned n_dns;
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index ddcd156801..e8398cbde5 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -149,7 +149,6 @@ int cg_blkio_weight_parse(const char *s, uint64_t *ret) {
         return 0;
 }
 
-
 static int trim_cb(const char *path, const struct stat *sb, int typeflag, struct FTW *ftwbuf) {
         assert(path);
         assert(sb);
diff --git a/src/shared/efi-loader.c b/src/shared/efi-loader.c
index 46e187000f..3d1df09907 100644
--- a/src/shared/efi-loader.c
+++ b/src/shared/efi-loader.c
@@ -181,7 +181,6 @@ int efi_set_reboot_to_firmware(bool value) {
         return 0;
 }
 
-
 static ssize_t utf16_size(const uint16_t *s, size_t buf_len_bytes) {
         size_t l = 0;
 
diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
index e29b81f132..8fec1a83f0 100644
--- a/src/shared/ethtool-util.c
+++ b/src/shared/ethtool-util.c
@@ -411,7 +411,6 @@ int ethtool_set_nic_buffer_size(int *fd, const char *ifname, netdev_ring_param *
         return 0;
 }
 
-
 static int get_stringset(int fd, struct ifreq *ifr, int stringset_id, struct ethtool_gstrings **gstrings) {
         _cleanup_free_ struct ethtool_gstrings *strings = NULL;
         struct {
diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
index 5dd7800852..d408bcd90a 100644
--- a/src/shared/ethtool-util.h
+++ b/src/shared/ethtool-util.h
@@ -87,7 +87,6 @@ typedef struct netdev_ring_param {
         bool tx_pending_set;
 } netdev_ring_param;
 
-
 int ethtool_get_driver(int *fd, const char *ifname, char **ret);
 int ethtool_get_link_info(int *fd, const char *ifname,
                           int *ret_autonegotiation, size_t *ret_speed,
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 257b6d9f12..b2dafd731b 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -804,7 +804,6 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r
         return 0;
 }
 
-
 static int list_units(int argc, char *argv[], void *userdata) {
         _cleanup_free_ UnitInfo *unit_infos = NULL;
         _cleanup_(message_set_freep) Set *replies = NULL;
diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c
index 07987996c7..899e4b5d27 100644
--- a/src/test/test-calendarspec.c
+++ b/src/test/test-calendarspec.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "alloc-util.h"
 #include "calendarspec.h"
 #include "errno-util.h"
diff --git a/src/test/test-date.c b/src/test/test-date.c
index 6c6efc349a..7d27cfa703 100644
--- a/src/test/test-date.c
+++ b/src/test/test-date.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "alloc-util.h"
 #include "string-util.h"
 #include "tests.h"
diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index cb4ee7a576..f0ffe89729 100644
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index bc61fc9201..f31ea6f8c6 100644
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-
 #include "alloc-util.h"
 #include "escape.h"
 #include "nulstr-util.h"
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index f0186b078f..6021164739 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -56,7 +56,6 @@ static void test_unit_file_build_name_map(char **ids) {
         if (r == 0)
                 log_debug("Cache rebuild skipped based on mtime.");
 
-
         char **id;
         STRV_FOREACH(id, ids) {
                  const char *fragment, *name;
-- 
cgit v1.2.1


From 146ca45902d7089c79bdf252d1590a1f15238162 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Nov 2019 00:40:37 +0900
Subject: util: drop unnecessary headers from util.c

---
 src/basic/util.c | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/basic/util.c b/src/basic/util.c
index 0545b79792..2b3b3918a3 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -2,43 +2,21 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <sched.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/mman.h>
-#include <sys/prctl.h>
-#include <sys/sysmacros.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "alloc-util.h"
-#include "btrfs-util.h"
 #include "build.h"
-#include "def.h"
-#include "device-nodes.h"
 #include "dirent-util.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"
-#include "format-util.h"
-#include "hashmap.h"
 #include "hostname-util.h"
 #include "log.h"
 #include "macro.h"
 #include "parse-util.h"
-#include "path-util.h"
-#include "process-util.h"
-#include "procfs-util.h"
-#include "set.h"
-#include "signal-util.h"
 #include "stat-util.h"
 #include "string-util.h"
-#include "strv.h"
-#include "time-util.h"
-#include "umask-util.h"
-#include "user-util.h"
 #include "util.h"
 #include "virt.h"
 
-- 
cgit v1.2.1