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