6 files changed, 22 insertions, 17 deletions
diff --git a/lib/libc/arch/x86_64/clock_gettime.c b/lib/libc/arch/x86_64/clock_gettime.c
index 6a7a3874..c05926fa 100644
--- a/lib/libc/arch/x86_64/clock_gettime.c
+++ b/lib/libc/arch/x86_64/clock_gettime.c
@@ -1,6 +1,8 @@
-#include <asm/vdso.h>
-#include <syscall.h>
-#include <time.h>
+#include "asm/unistd_64.h" // for __NR_clock_gettime
+
+#include <asm/vdso.h> // for __vdso_clock_gettime
+#include <syscall.h>  // for __syscall_2, syscall
+#include <time.h>     // for clock_gettime, clockid_t
 
 int clock_gettime(clockid_t clock_id, struct timespec *tp)
 {
diff --git a/lib/libc/arch/x86_64/crt0.c b/lib/libc/arch/x86_64/crt0.c
index 546d9c8a..53ae222d 100644
--- a/lib/libc/arch/x86_64/crt0.c
+++ b/lib/libc/arch/x86_64/crt0.c
@@ -1,10 +1,9 @@
-#include <linux/auxvec.h>
-#include <linux/elf.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <thread.h>
-#include <unistd.h>
+#include <linux/auxvec.h> // for AT_NULL
+#include <linux/elf.h>	  // for Elf64_Ehdr
+#include "asm/auxvec.h"	  // for AT_SYSINFO_EHDR
+
+#include <stdint.h> // for uintptr_t
+#include <stdlib.h> // for exit
 
 #define weak_reference(old, new) \
 	extern __typeof(old) new __attribute__((__weak__, __alias__(#old)))
diff --git a/lib/libc/arch/x86_64/longjmp.c b/lib/libc/arch/x86_64/longjmp.c
index 6aed69a5..dbd18632 100644
--- a/lib/libc/arch/x86_64/longjmp.c
+++ b/lib/libc/arch/x86_64/longjmp.c
@@ -1,4 +1,6 @@
-#include <setjmp.h>
+#include "bits/setjmp.h" // for jmp_buf
+
+#include <setjmp.h> // for longjmp
 
 __attribute__((noreturn, naked, returns_twice)) void longjmp(jmp_buf env,
 							     int val)
diff --git a/lib/libc/arch/x86_64/setjmp.c b/lib/libc/arch/x86_64/setjmp.c
index d268ae25..ea205e16 100644
--- a/lib/libc/arch/x86_64/setjmp.c
+++ b/lib/libc/arch/x86_64/setjmp.c
@@ -1,4 +1,6 @@
-#include <setjmp.h>
+#include "bits/setjmp.h" // for jmp_buf
+
+#include <setjmp.h> // for setjmp
 
 __attribute__((naked, returns_twice)) int setjmp(jmp_buf env)
 {
diff --git a/lib/libc/arch/x86_64/sigsetjmp.c b/lib/libc/arch/x86_64/sigsetjmp.c
index d4c0a4db..2d900ce7 100644
--- a/lib/libc/arch/x86_64/sigsetjmp.c
+++ b/lib/libc/arch/x86_64/sigsetjmp.c
@@ -1,4 +1,4 @@
-#include <setjmp.h>
+#include <setjmp.h> // for sigsetjmp, sigjmp_buf
 
 int sigsetjmp(sigjmp_buf env, int savemask)
 {
diff --git a/lib/libc/arch/x86_64/vdso_setup.c b/lib/libc/arch/x86_64/vdso_setup.c
index c410995d..e1dbd0a3 100644
--- a/lib/libc/arch/x86_64/vdso_setup.c
+++ b/lib/libc/arch/x86_64/vdso_setup.c
@@ -1,7 +1,7 @@
-#include <linux/auxvec.h>
-#include <linux/elf.h>
-#include <string.h>
-#include <time.h>
+#include <linux/elf.h> // for Elf64_Sym, (anonymous struct)::(anonymous)
+#include <string.h>    // for NULL, strcmp
+
+struct timespec;
 
 int (*__vdso_clock_gettime)(int, struct timespec *) = NULL;
 int (*__vdso_getcpu)(unsigned *, unsigned *, void *) = NULL;