basic: include only what we use

This is a cleaned up result of running iwyu but without forward
declarations on src/basic.

diff --git a/src/basic/alloc-util.h b/src/basic/alloc-util.h
index 12b602e1855781b640d61c29b17ca71c9602500b..f5097ea117538750f48f222e3d793a51938b55dd 100644 (file)
--- a/src/basic/alloc-util.h
+++ b/src/basic/alloc-util.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <alloca.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/src/basic/audit-util.c b/src/basic/audit-util.c
index d0a061abc06530d5eec679119d55402144aadbdc..da92ef32e15b5539790f39b905f98bf7800a5329 100644 (file)
--- a/src/basic/audit-util.c
+++ b/src/basic/audit-util.c
@@ -20,7 +20,9 @@
 ***/
 
 #include <errno.h>
+#include <linux/netlink.h>
 #include <stdio.h>
+#include <sys/socket.h>
 
 #include "alloc-util.h"
 #include "audit-util.h"
@@ -30,7 +32,6 @@
 #include "parse-util.h"
 #include "process-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
         _cleanup_free_ char *s = NULL;

diff --git a/src/basic/bus-label.c b/src/basic/bus-label.c
index c1534657ac921124ca8939d62b3e7301ad269c4e..d8d5863b03b979dfa7fbade43d3514525ad18b48 100644 (file)
--- a/src/basic/bus-label.c
+++ b/src/basic/bus-label.c
@@ -25,7 +25,6 @@
 #include "bus-label.h"
 #include "hexdecoct.h"
 #include "macro.h"
-#include "util.h"
 
 char *bus_label_escape(const char *s) {
         char *r, *t;

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index 10ff16e42ba76f712b648e2f8b300f7b64791a9e..3e1306470b146bbf2613fb3d9175267b7507f111 100644 (file)
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <grp.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include <unistd.h>

diff --git a/src/basic/capability-util.h b/src/basic/capability-util.h
index 7f6b34dfbb0fd46af13b627f46843691fdb814f0..c84e028187a86ebd0d6603c2b376d88233ebdef2 100644 (file)
--- a/src/basic/capability-util.h
+++ b/src/basic/capability-util.h
@@ -22,8 +22,11 @@
 ***/
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/capability.h>
+#include <sys/types.h>
 
+#include "macro.h"
 #include "util.h"
 
 unsigned long cap_last_cap(void);

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index be9972fffffe6fc054ec12f6ab790166cf10bf07..75dad228e394574bdfc0964a132371adb7267fd9 100644 (file)
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -21,6 +21,7 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index c433d5844aa15b236a9a6a343f0ea192a3eb1dfe..4ef5aba5a855dc54f41788c21a2e955f1ed118e1 100644 (file)
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -21,10 +21,9 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "dirent-util.h"
+#include "path-util.h"
 #include "string-util.h"
 
 int dirent_ensure_type(DIR *d, struct dirent *de) {

diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h
index 5866a755f4a80423c0a4a3759dcf44cbd42e0852..58273bb988c62c2a3acddff951a9b2584e7a437a 100644 (file)
--- a/src/basic/dirent-util.h
+++ b/src/basic/dirent-util.h
@@ -22,8 +22,11 @@
 ***/
 
 #include <dirent.h>
+#include <errno.h>
+#include <stdbool.h>
 
 #include "path-util.h"
+#include "macro.h"
 
 int dirent_ensure_type(DIR *d, struct dirent *de);
 

diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 1f940a4227701f01797ebe5db8fb601c37c04ad4..202926897e59a7e7272a61a9c6c949cc3d006445 100644 (file)
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -23,6 +23,8 @@
 
 #include <fcntl.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <sys/inotify.h>
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/src/basic/gunicode.c b/src/basic/gunicode.c
index d89a2f3ed960a9146b8c50fa97fb3bfa879524ce..542110503f7f37cd6119e0a4c0918620ea4ef330 100644 (file)
--- a/src/basic/gunicode.c
+++ b/src/basic/gunicode.c
@@ -4,6 +4,8 @@
  *  Copyright 2000, 2005 Red Hat, Inc.
  */
 
+#include <stdlib.h>
+
 #include "gunicode.h"
 
 #define unichar uint32_t

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 40fef77742b2ac02ff56a4ea0c64500265f5b591..fa8768b7f1e6b1b253cbec68798d9a0fd656a3f6 100644 (file)
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -21,8 +21,9 @@
 ***/
 
 #include <errno.h>
-#include <pthread.h>
+#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "alloc-util.h"
 #include "hashmap.h"

diff --git a/src/basic/hexdecoct.c b/src/basic/hexdecoct.c
index 7e84550b6d49770175ac478be79768ea10a38ad0..f30e028f45b51baabf152a0fe6112b0bec625c44 100644 (file)
--- a/src/basic/hexdecoct.c
+++ b/src/basic/hexdecoct.c
@@ -20,11 +20,13 @@
 ***/
 
 #include <ctype.h>
-#include <inttypes.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdlib.h>
 
 #include "alloc-util.h"
 #include "hexdecoct.h"
-#include "util.h"
+#include "macro.h"
 
 char octchar(int x) {
         return '0' + (x & 7);

diff --git a/src/basic/hexdecoct.h b/src/basic/hexdecoct.h
index 111d850550c6a648ac3a64f71bbc7f570b845ac9..243c5e921edfc04b3b2b007f1a798f8ce013ca06 100644 (file)
--- a/src/basic/hexdecoct.h
+++ b/src/basic/hexdecoct.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <sys/types.h>
 

diff --git a/src/basic/io-util.h b/src/basic/io-util.h
index cd2aa75ad2c6859cde3a9b8f2a58fca1acb4cb6e..5f77a556c047112ebffa183b7f573066a3686279 100644 (file)
--- a/src/basic/io-util.h
+++ b/src/basic/io-util.h
@@ -22,9 +22,12 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 
+#include "macro.h"
 #include "time-util.h"
 
 int flush_fd(int fd);

diff --git a/src/basic/log.c b/src/basic/log.c
index aada46625ad31296f596231bf0556791a5fc8b96..0f53f258d1a6ee6b89edc0c16946fc6f561dc234 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -21,16 +21,18 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#ifdef __GLIBC__
-#include <printf.h>
-#else
-#include "parse-printf-format.h"
-#endif
+#include <inttypes.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
+#include <string.h>
+#include <sys/signalfd.h>
 #include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/uio.h>
 #include <sys/un.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "sd-messages.h"
@@ -47,6 +49,7 @@
 #include "process-util.h"
 #include "signal-util.h"
 #include "socket-util.h"
+#include "time-util.h"
 #include "stdio-util.h"
 #include "string-table.h"
 #include "string-util.h"

diff --git a/src/basic/mkdir-label.c b/src/basic/mkdir-label.c
index 9c277c6976fb8f881732d5d1729c1d4db063e66a..d141e15e0a8a6fe79fac54424678737417d25ebe 100644 (file)
--- a/src/basic/mkdir-label.c
+++ b/src/basic/mkdir-label.c
@@ -21,6 +21,7 @@
 ***/
 
 #include <stdio.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #include "label.h"

diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 5d7fb9a12d9721031fd49ad99fed940b16e07315..4b809541b101cd2e22967800fe4bd5cec6b7fde5 100644 (file)
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -20,14 +20,16 @@
 ***/
 
 #include <errno.h>
+#include <stdbool.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include "fs-util.h"
 #include "mkdir.h"
 #include "path-util.h"
+#include "macro.h"
 #include "stat-util.h"
 #include "user-util.h"
-#include "util.h"
 
 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, mkdir_func_t _mkdir) {
         struct stat st;

diff --git a/src/basic/mount-util.h b/src/basic/mount-util.h
index 3393046fc0ef1030fae5a5fb88823868aa41cd70..7dbc2460168b248c6bf0f55443f2f79d5e903fd7 100644 (file)
--- a/src/basic/mount-util.h
+++ b/src/basic/mount-util.h
@@ -24,10 +24,12 @@
 #include <fcntl.h>
 #include <mntent.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include "missing.h"
+#include "macro.h"
 
 int fd_is_mount_point(int fd, const char *filename, int flags);
 int path_is_mount_point(const char *path, int flags);

diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 567535c02df5cdf2dc589e3dc14035b7a002bd40..a0277def9d918c8bbb848b27a59cd5ff051b8ef8 100644 (file)
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -22,6 +22,9 @@
 ***/
 
 #include <inttypes.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 #include "macro.h"

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index b23b9c31262defce1463810222434ffdcbb1f6bb..8d722bd2e7243fd7dc77b6e577fb46d01b4f3b74 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -20,11 +20,11 @@
 ***/
 
 #include <errno.h>
-#include <fcntl.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/statvfs.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 /* When we include libgen.h because we need dirname() we immediately
@@ -34,18 +34,16 @@
 #undef basename
 
 #include "alloc-util.h"
-#include "fd-util.h"
-#include "fileio.h"
 #include "fs-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
-#include "parse-util.h"
 #include "path-util.h"
+#include "extract-word.h"
+#include "time-util.h"
 #include "stat-util.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 bool path_is_absolute(const char *p) {
         return p[0] == '/';

diff --git a/src/basic/prioq.c b/src/basic/prioq.c
index 75906989114bc4add71ccf8cd602e06b552e4129..7d420d8a7bb8bc20f089a77dd0d0264d637e0d9b 100644 (file)
--- a/src/basic/prioq.c
+++ b/src/basic/prioq.c
@@ -29,9 +29,12 @@
  * The underlying algorithm used in this implementation is a Heap.
  */
 
+#include <errno.h>
+#include <stdlib.h>
+
 #include "alloc-util.h"
 #include "prioq.h"
-#include "util.h"
+#include "hashmap.h"
 
 struct prioq_item {
         void *data;

diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 044d4ee9f2bd57170f4bc06d25c7e069b49cab1b..92473d0327b58e9a27e462cc56e117ce4291d1a0 100644 (file)
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -21,7 +21,12 @@
 
 #include <errno.h>
 #include <malloc.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/un.h>
+#include <syslog.h>
 
 #ifdef HAVE_SELINUX
 #include <selinux/context.h>
@@ -32,7 +37,10 @@
 #include "alloc-util.h"
 #include "path-util.h"
 #include "selinux-util.h"
-#include "strv.h"
+#include "log.h"
+#include "macro.h"
+#include "time-util.h"
+#include "util.h"
 
 #ifdef HAVE_SELINUX
 DEFINE_TRIVIAL_CLEANUP_FUNC(security_context_t, freecon);

diff --git a/src/basic/siphash24.c b/src/basic/siphash24.c
index acf28967baa1260c4e89a5425fec76ab961c9c85..0bb61ca2cb7648e42b53ca381db9b45b0db873e4 100644 (file)
--- a/src/basic/siphash24.c
+++ b/src/basic/siphash24.c
@@ -18,9 +18,8 @@
 */
 
 #include "siphash24.h"
-#include "sparse-endian.h"
+#include "macro.h"
 #include "unaligned.h"
-#include "util.h"
 
 static inline uint64_t rotate_left(uint64_t x, uint8_t b) {
         assert(b < 64);

diff --git a/src/basic/siphash24.h b/src/basic/siphash24.h
index ba4f7d01b65c3e115b2198cdf006bcc51a235a1b..3f7e20362b2ac6c837d1517ca7cf93e5fa9d264f 100644 (file)
--- a/src/basic/siphash24.h
+++ b/src/basic/siphash24.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <inttypes.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <sys/types.h>
 
 struct siphash {

diff --git a/src/basic/smack-util.h b/src/basic/smack-util.h
index 08caf90c896b3e1be9238bb29ca42fb1ea11b264..901f417cd87beb2f647aff311b3c8bc9fdb5e825 100644 (file)
--- a/src/basic/smack-util.h
+++ b/src/basic/smack-util.h
@@ -24,6 +24,7 @@
 ***/
 
 #include <stdbool.h>
+#include <sys/types.h>
 
 #include "macro.h"
 

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 563c7db607dbde64f2eba4e5591a654a427ab884..091789851711f753b16b0871a0cb38bbfb19bb0d 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -21,13 +21,15 @@
 
 #include <arpa/inet.h>
 #include <errno.h>
+#include <limits.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <netinet/ip.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -39,6 +41,7 @@
 #include "parse-util.h"
 #include "path-util.h"
 #include "socket-util.h"
+#include "log.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "user-util.h"

diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 6923898250e8f0910ce2230dc200c52e2d7b9e6b..aa3119498b8f2e4408091a71fe4751357c2a7297 100644 (file)
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -22,7 +22,9 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/stat.h>
+#include <sys/statfs.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 8e509988963d2bfae0555a4f0f46623a99d9b7f8..966cab75d5e79085d260af69ea66aedc0254add9 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -20,12 +20,15 @@
 ***/
 
 #include <errno.h>
+#include <fnmatch.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "alloc-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"

diff --git a/src/basic/strv.h b/src/basic/strv.h
index 13ed1b371e69057dd8576a4fb5fe8db5b0c505ae..bb84095528739b26d0073424eaffc04bf250a492 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -24,8 +24,11 @@
 #include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
+#include <stddef.h>
 
 #include "extract-word.h"
+#include "alloc-util.h"
+#include "macro.h"
 #include "util.h"
 
 char *strv_find(char **l, const char *name) _pure_;

diff --git a/src/basic/time-util.h b/src/basic/time-util.h
index 78011a802fa0fa3e554ddaa4204b569a0b527726..3d6dbff35ccadd5f98932711b5dc0d1ee448b907 100644 (file)
--- a/src/basic/time-util.h
+++ b/src/basic/time-util.h
@@ -22,6 +22,9 @@
 ***/
 
 #include <inttypes.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
 

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index b76567dc4aeb87e754e3fa679aa96e5778dfa6b4..d462a13831a7d55722a0bd78f99718a6e5dbf2bb 100644 (file)
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -20,18 +20,20 @@
 ***/
 
 #include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "alloc-util.h"
 #include "bus-label.h"
-#include "def.h"
 #include "hexdecoct.h"
 #include "path-util.h"
+#include "macro.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 #define VALID_CHARS                             \
         DIGITS LETTERS                          \

diff --git a/src/basic/utf8.c b/src/basic/utf8.c
index b4063a4ceca64966ee73cd405cf7fdeda5c61237..124effd6dfcd6694c055c45e66cce9162eca806a 100644 (file)
--- a/src/basic/utf8.c
+++ b/src/basic/utf8.c
@@ -44,15 +44,14 @@
  */
 
 #include <errno.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "alloc-util.h"
 #include "hexdecoct.h"
+#include "macro.h"
 #include "utf8.h"
-#include "util.h"
 
 bool unichar_is_valid(uint32_t ch) {
 

diff --git a/src/basic/utf8.h b/src/basic/utf8.h
index e745649f06f5b06fcbe7b0869a798f068820d403..16c4b5b55da2eb1932c9acd3e14742d142b76085 100644 (file)
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -22,6 +22,8 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "macro.h"
 

diff --git a/src/basic/util.h b/src/basic/util.h
index d88337126f27e130367eddc4766efc28063e05ab..0f838632adbb4176c63c3934ef6c6a1418cebed6 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <alloca.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -29,8 +30,10 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/inotify.h>
 #include <sys/socket.h>
 #include <sys/stat.h>

diff --git a/src/basic/xattr-util.h b/src/basic/xattr-util.h
index 5ee598f15a08fde7f4141031b10c28e0523c2485..da265b896658b50c286a263fb7bb0cbbbc103022 100644 (file)
--- a/src/basic/xattr-util.h
+++ b/src/basic/xattr-util.h
@@ -22,6 +22,7 @@
 ***/
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <sys/types.h>
 
 #include "time-util.h"