From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 08:44:54 +0000 (+0900)
Subject: tree-wide: drop string.h when string-util.h or friends are included
X-Git-Tag: v244-rc1~101^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455fa9610cba06af4cb9d8c8a2121b552c4d2229;p=thirdparty%2Fsystemd.git

tree-wide: drop string.h when string-util.h or friends are included
---

diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c
index 540a1990ce0..55bfd34fe6c 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 664cfaf67f5..4a1b097a52b 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 bdf3b9febda..f3367a9cf3a 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 4bc6931b584..838b485e22d 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 e07f548fef9..4a3eaee0105 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 53875de5a0a..9b71052ffb7 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 a6503cf2b65..b8dc98915f8 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 34cfb36a4a8..d7c215cb48e 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 82d27a5ba33..714a00cd9ae 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 6e6fa200537..43558f6f248 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 8e226c1ee29..8b1bb02be13 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 2c4620abf09..4853514c96a 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 5bfa028b393..7bc2e3f370f 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 e94c29939c7..5fd18028bba 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 61faf001022..77ba5fc776c 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 085ccd09154..5c8e557c886 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 1ddb64fd283..e36c6c74324 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 9777beadd8e..edf4a4cdba5 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 44d1e9aec40..bb2be068bb9 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 9ab6e4fff6a..87b03f89e5d 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 fd2b5c104f4..5b4737505ca 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 123d00e13ee..da9a2139d31 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 b216c252109..19dd053e362 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 42fe4f43158..2d3cf81435b 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 c1828687557..8e6aa638068 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 88b85867bb3..30fab630745 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 fe129482f3d..29c9ec9ac45 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 c732e8021cf..264f15425e8 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 3018e81acb8..ec2576948ee 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 3e37e34325e..af8dca53cd9 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 b5fdfafd612..f0e403829a1 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 afc24700dd7..c857185ec85 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 f74ed95a609..adca56c500e 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 3be3852e35c..fe25a1a430a 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 2b79ce4b318..f4ac2b6f7bc 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 aa9d811f2e9..7ff844c78c3 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 dcf5687a431..bfdbdc7a916 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 34d95c76600..b55d7299cab 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 61663b2c1cc..9c6094c0392 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 a637437a5a6..424162f4458 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 4401e30e65a..22817806c0a 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 a91cfebc678..fd426840343 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 f991b7f5e87..a213e6039db 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 aa4a89c17ab..33728b0ff28 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 3545fde71d4..ae54453b5ed 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 c9032fced8e..fc1207cbe07 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 dfc7f9fb1c9..1ac97654378 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 e2d4c0d6e17..d7a0f7a07b0 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 3107b9b1482..865db3376cd 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 4b972481d94..d68ff1c3663 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 ebefb4d4d27..dd8c178fcbe 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 cd33850b969..2d80d3a664b 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 90e72375761..01f678cc0ed 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 4563daf3ad0..be386120603 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 9e4f4fb59e7..deecd9b8db3 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 35efe7002b0..6cbaf722c66 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 5f5691995da..939af12572b 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 060193d2aca..70b2c8b46c4 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 bfb75ae8c9d..4e00e4fc5e7 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 6d9b5cfc2fb..332270cc19e 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 30a3fa8720d..af7196c6dee 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 78baeb73335..061cfde2f05 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 ca67559e6f0..9f5352a60d7 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 1c5de5392ca..ef330fe28eb 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 800caec8411..be3f22f333c 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 33420fd4c09..95b7237382c 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 5a24f38ae9e..5a0b6e45dc5 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 3104d8c5a8e..fa9b4f60397 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 7406f94ce06..a2ac65095f2 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 ac1a954546c..f760f0fdd21 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 9e8f0a73f57..93984d1c597 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 58124abd21d..b3febdbb313 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 ef22e190e4f..fbfd89b69b1 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 e9df5f8bc59..49ed2472786 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 bdd891d0cd1..dc5ccb793bc 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 8de7adcd16d..3446f0f7786 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 af7312a0110..b4450727ca5 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 f8c36c94f5d..519dd0d188c 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 5532e932551..50c4c703f16 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 8d0eec96a53..baf0bd102ba 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 706a4e45fef..26681ac9475 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 2e13e4aed65..ff192c53eb9 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 5598fb2c0b3..4a6ac2afc98 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 6b3f2a731bf..1c7c4912fb5 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 67fe9921d40..1d335f914c6 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 99584908757..34ac0350f2d 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 094fcd668dc..026bcf4d8eb 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 872b9a86d98..8f13edafb00 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 68468464cd2..9e8f04d3eaa 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 a6e2d4950df..1dc222f90ef 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 b17fb2e3225..c3c8b1a2a57 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 3a5a3334966..059a135f873 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 d889d7b9bec..d8c1bbe15b9 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 9104e023e8e..a66be28ad96 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 dbb5254f3d0..3b2ac382985 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 c6475a5398b..acd57aedc4f 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 907f751ef29..4796f1ff4c6 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 5276398ab54..35e06f5d6a6 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 7797f36d449..aaeb2c0d2f5 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 6a9e459494a..51db60e1f2e 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 3513c015b82..dfd14ca3908 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 90de140a9d6..8c16b7f360c 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 95f80572bdb..de46a8d4697 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 e8a4b5e88ce..2fcbcb281ab 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 0df29aa69ff..58910134270 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 1a8a9a6d623..97b8e30aa3a 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 9b5b8f8f138..aa08e0b4eff 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 7a4da519115..a55136d913a 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 9b1582da997..609403ab797 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 732bc752afd..4657e820d96 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 46fa68027ed..88d8e45ca19 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 5a5d35bcc38..53018cd6017 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 ce714bcc8bb..3269d830311 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 f73bf93520a..d817e5b0e5e 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 f62ad0a0f58..b812665315f 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 135b01f2820..6b73e25f89a 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 dad6c1c2fe7..f7770e7df50 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 d2143beda3a..2061384afe3 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 0724dd96ee7..193805b27ec 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 f1bb50cfa2c..7393c100cd7 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 b615c70dff1..4f13e927b33 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 cceed58f744..839f1f97aa8 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 e55d3c23156..d316e81aa24 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 7c20b100b46..ad99c5206c9 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 6bf0ff0316a..5b162097453 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 e8f61b36e9c..f1ee8c10ec0 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 c8e789680d3..b036ff67ddb 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 93bdcf11bf4..12fb3ef7ea0 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 646f4498218..fa4f32f3538 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 c87b496736e..1d23ed48a2b 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 27090762642..78ac42f0802 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 c75be39fefc..4563a9d7204 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 abbbc9f2d61..262f899aa07 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 c67782ea8fb..56d86d8eba3 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 3fabbb665cc..30099510084 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 c8ef3295b56..884372e60e2 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 46358ef9527..07987996c7f 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 1891df0eb9e..f16cb291f22 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 9888b65998f..6c6efc349ab 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 10648114971..265152fb76e 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 17dacda70f1..cb4ee7a5766 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 ec518916347..3168411d8bf 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 bf47a598a94..4ca57555f1d 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 eea0765b7a3..4d7513f6d5f 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 8deaf4eb0f6..181f254fe7e 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 9e93bc17510..483ba44caa1 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 5e96f3a8a7e..bc61fc92018 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 d7199124a3d..749aa46d75f 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 aa072c4ca82..78e1c68b2a9 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 120baa35937..61725bdf087 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 4f15a400ab0..97a0868bc1b 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 808cc18892d..8c0fae3458d 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 068988e2033..236c1910345 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 e1a8d7e3a92..94c3b232e5e 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 8deb692f13c..7f25824df3d 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 c6b0208b4b7..33bc59daccb 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 7a8e1f75dd8..034e5987cca 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 800eeb21801..7dbd829b6d5 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 e6d4659d9f7..4cdbfa1321b 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 e8f1ce13546..ca38f560879 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 58d665998a6..c12af28d10c 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 9bbed82209f..b41fbfc39a9 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 f161402f3ae..fbbc515b007 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 2c8626ffad2..2d2bc0026e8 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 1524808ffe2..7d7044eac3c 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 cb5123042a2..e635e5b1102 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 9338524a33d..55fd8ba46e4 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>