7 files changed, 9 insertions, 24 deletions
diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
index 9fac676f2b..32c53f8c73 100644
--- a/src/basic/glob-util.c
+++ b/src/basic/glob-util.c
@@ -4,6 +4,8 @@
 #include <errno.h>
 #include <glob.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "dirent-util.h"
 #include "glob-util.h"
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c
index f5cabc6534..1d5c6412b5 100644
--- a/src/basic/in-addr-util.c
+++ b/src/basic/in-addr-util.c
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <net/if.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "alloc-util.h"
diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
index 4bb65d5838..6b82eab640 100644
--- a/src/basic/mkdir.c
+++ b/src/basic/mkdir.c
@@ -6,6 +6,7 @@
 #include <sys/stat.h>
 
 #include "alloc-util.h"
+#include "format-util.h"
 #include "fs-util.h"
 #include "macro.h"
 #include "mkdir.h"
diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
index 375da920f7..f35e760233 100644
--- a/src/basic/selinux-util.c
+++ b/src/basic/selinux-util.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <errno.h>
+#include <fcntl.h>
 #include <malloc.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include <sys/un.h>
 #include <syslog.h>
 
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index 5aca17c04a..7824af3500 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <fcntl.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <sys/stat.h>
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 392cab65be..aa5f95ab72 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -5,12 +5,12 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdio.h>
 
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "macro.h"
 #include "string-util.h"
-#include "util.h"
 
 char *strv_find(char **l, const char *name) _pure_;
 char *strv_find_prefix(char **l, const char *name) _pure_;
diff --git a/src/basic/util.h b/src/basic/util.h
index 412563fa8e..25e6ab8112 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -1,31 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <alloca.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <locale.h>
-#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>
-#include <sys/statfs.h>
-#include <sys/sysmacros.h>
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "format-util.h"
+
 #include "macro.h"
-#include "time-util.h"
 
 static inline const char* yes_no(bool b) {
         return b ? "yes" : "no";