9 files changed, 34 insertions, 20 deletions
diff --git a/lib/libc/mman/mlock.c b/lib/libc/mman/mlock.c
index a7f48b27..c46b9435 100644
--- a/lib/libc/mman/mlock.c
+++ b/lib/libc/mman/mlock.c
@@ -1,5 +1,7 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_mlock
+
+#include <stddef.h>  // for size_t
+#include <syscall.h> // for __syscall_2, syscall
 
 int mlock(const void *addr, size_t len)
 {
diff --git a/lib/libc/mman/mlockall.c b/lib/libc/mman/mlockall.c
index df4dcbd1..ef12edd3 100644
--- a/lib/libc/mman/mlockall.c
+++ b/lib/libc/mman/mlockall.c
@@ -1,5 +1,6 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_mlockall
+
+#include <syscall.h> // for __syscall_1, syscall
 
 int mlockall(int flags)
 {
diff --git a/lib/libc/mman/mmap.c b/lib/libc/mman/mmap.c
index d7918447..c2a3fa72 100644
--- a/lib/libc/mman/mmap.c
+++ b/lib/libc/mman/mmap.c
@@ -1,6 +1,7 @@
-#include <stddef.h>
-#include <linux/mman.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_mmap
+
+#include <stddef.h>  // for size_t
+#include <syscall.h> // for __syscall_6, syscall
 
 typedef __INT64_TYPE__ off_t;
 
diff --git a/lib/libc/mman/mprotect.c b/lib/libc/mman/mprotect.c
index ab5c6059..5c96f9b8 100644
--- a/lib/libc/mman/mprotect.c
+++ b/lib/libc/mman/mprotect.c
@@ -1,5 +1,7 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_mprotect
+
+#include <stddef.h>  // for size_t
+#include <syscall.h> // for __syscall_3, syscall
 
 int mprotect(void *addr, size_t len, int prot)
 {
diff --git a/lib/libc/mman/msync.c b/lib/libc/mman/msync.c
index b8dab1a9..c25a18e7 100644
--- a/lib/libc/mman/msync.c
+++ b/lib/libc/mman/msync.c
@@ -1,5 +1,7 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_msync
+
+#include <stddef.h>  // for size_t
+#include <syscall.h> // for __syscall_3, syscall
 
 int msync(void *addr, size_t len, int flags)
 {
diff --git a/lib/libc/mman/munlock.c b/lib/libc/mman/munlock.c
index b934c87d..2d62c032 100644
--- a/lib/libc/mman/munlock.c
+++ b/lib/libc/mman/munlock.c
@@ -1,5 +1,7 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_munlock
+
+#include <stddef.h>  // for size_t
+#include <syscall.h> // for __syscall_2, syscall
 
 int munlock(const void *addr, size_t len)
 {
diff --git a/lib/libc/mman/munlockall.c b/lib/libc/mman/munlockall.c
index c7f9c8d2..ecf9ddbc 100644
--- a/lib/libc/mman/munlockall.c
+++ b/lib/libc/mman/munlockall.c
@@ -1,5 +1,6 @@
-#include <syscall.h>
-#include <sys/mman.h>
+#include "asm/unistd_64.h" // for __NR_munlockall
+
+#include <syscall.h> // for __syscall_0, syscall
 
 int munlockall(void)
 {
diff --git a/lib/libc/mman/munmap.c b/lib/libc/mman/munmap.c
index 6929fc64..04ad9800 100644
--- a/lib/libc/mman/munmap.c
+++ b/lib/libc/mman/munmap.c
@@ -1,6 +1,7 @@
-#include <sys/mman.h>
-#include <syscall.h>
-#include <features.h>
+#include "asm/unistd_64.h" // for __NR_munmap
+
+#include <sys/mman.h> // for munmap, size_t
+#include <syscall.h>  // for __syscall_2, syscall
 
 int munmap(void *addr, size_t len)
 {
diff --git a/lib/libc/mman/posix_madvise.c b/lib/libc/mman/posix_madvise.c
index a19adec2..e81c6712 100644
--- a/lib/libc/mman/posix_madvise.c
+++ b/lib/libc/mman/posix_madvise.c
@@ -1,5 +1,7 @@
-#include <sys/mman.h>
-#include <syscall.h>
+#include "asm/unistd_64.h" // for __NR_madvise
+
+#include <sys/mman.h> // for posix_madvise, size_t
+#include <syscall.h>  // for __syscall_3, syscall
 
 int posix_madvise(void *addr, size_t len, int advice)
 {