diff --git a/unix/file.c b/unix/file.c
index 444a05d491..258aa65d50 100644
--- a/unix/file.c
+++ b/unix/file.c
@@ -1,7 +1,8 @@
-#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "nlr.h"
 #include "misc.h"
diff --git a/unix/gccollect.c b/unix/gccollect.c
index 6fb08fad1e..450a697787 100644
--- a/unix/gccollect.c
+++ b/unix/gccollect.c
@@ -1,4 +1,3 @@
-#include <stdint.h>
 #include <stdio.h>
 
 #include "misc.h"
diff --git a/unix/main.c b/unix/main.c
index 6a7b44ff84..eecec301bf 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -1,8 +1,11 @@
 #include <stdint.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "nlr.h"
 #include "misc.h"
@@ -391,8 +394,6 @@ int main(int argc, char **argv) {
     return 0;
 }
 
-#include <sys/stat.h>
-
 uint mp_import_stat(const char *path) {
     struct stat st;
     if (stat(path, &st) == 0) {
diff --git a/unix/socket.c b/unix/socket.c
index a9cf4a81a0..d720275192 100644
--- a/unix/socket.c
+++ b/unix/socket.c
@@ -2,7 +2,10 @@
 #include <assert.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <errno.h>
diff --git a/unix/time.c b/unix/time.c
index 1abd7cff39..7d25b3dd56 100644
--- a/unix/time.c
+++ b/unix/time.c
@@ -1,3 +1,4 @@
+#include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>