diff --git a/src/musl/common.hpp b/api/musl/common.hpp
similarity index 100%
rename from src/musl/common.hpp
rename to api/musl/common.hpp
diff --git a/deps/musl/default.nix b/deps/musl/default.nix
index c3070d3340..3921abdcdb 100644
--- a/deps/musl/default.nix
+++ b/deps/musl/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     cp ${./patches/includeos_syscalls.h} $sourceRoot/src/internal/includeos_syscalls.h
     cp ${./patches/syscall.h} $sourceRoot/src/internal/syscall.h
 
+    rm $sourceRoot/src/thread/x86_64/__set_thread_area.s
+    cp ${./patches/__set_thread_area.c} $sourceRoot/src/thread/x86_64/__set_thread_area.c
+
     rm $sourceRoot/arch/x86_64/syscall_arch.h
     rm $sourceRoot/arch/i386/syscall_arch.h
   '';
diff --git a/deps/musl/patches/__set_thread_area.c b/deps/musl/patches/__set_thread_area.c
new file mode 100644
index 0000000000..ab248a37b6
--- /dev/null
+++ b/deps/musl/patches/__set_thread_area.c
@@ -0,0 +1,8 @@
+#include "syscall.h"
+
+#define ARCH_SET_FS 0x1002
+
+int __set_thread_area(void *p)
+{
+    return __syscall(SYS_arch_prctl, ARCH_SET_FS, p);
+}
diff --git a/src/arch/aarch64/CMakeLists.txt b/src/arch/aarch64/CMakeLists.txt
index 4df69bf8b2..d032ae89ea 100644
--- a/src/arch/aarch64/CMakeLists.txt
+++ b/src/arch/aarch64/CMakeLists.txt
@@ -7,6 +7,7 @@ set(ARCH_OBJECTS
 #  profile_intr.asm
 #  apic_asm.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
 #  interrupts.asm
 #  fiber.asm
@@ -15,7 +16,6 @@ set(ARCH_SOURCES
   paging.cpp
   cpu.cpp
   timer.cpp
-  syscall_entry.cpp
 )
 enable_language(ASM)
 
diff --git a/src/arch/aarch64/arch_musl.cpp b/src/arch/aarch64/arch_musl.cpp
new file mode 100644
index 0000000000..8bdc0d082b
--- /dev/null
+++ b/src/arch/aarch64/arch_musl.cpp
@@ -0,0 +1,27 @@
+#include <os>
+#include <errno.h>
+#include <musl/common.hpp>
+#include "cpu.hpp"
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info)
+{
+  set_tpidr(u_info); // This probably still does not work
+  return 0;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_desc) {
+    return strace(sys_set_thread_area, "set_thread_area", u_desc);
+}
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+    return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}
\ No newline at end of file
diff --git a/src/arch/aarch64/syscall_entry.cpp b/src/arch/aarch64/syscall_entry.cpp
deleted file mode 100644
index ecc773ca55..0000000000
--- a/src/arch/aarch64/syscall_entry.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-#include "cpu.h"
-
-
-extern "C"
-long syscall_SYS_set_thread_area(struct user_desc *u_info)
-{
-  set_tpidr(u_info);
-  /*
-  if (UNLIKELY(!u_info)) return -EINVAL;
-#ifdef __x86_64__
-  x86::CPU::set_fs(u_info);
-#else
-  x86::CPU::set_gs(u_info);
-#endif*/
-  return 0;
-}
diff --git a/src/arch/i686/CMakeLists.txt b/src/arch/i686/CMakeLists.txt
index 357bf539e7..0a689c94e0 100644
--- a/src/arch/i686/CMakeLists.txt
+++ b/src/arch/i686/CMakeLists.txt
@@ -6,6 +6,7 @@ set(ARCH_OBJECTS
   profile_intr.asm
   apic_asm.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
   interrupts.asm
   fiber.asm
diff --git a/src/arch/i686/arch_musl.cpp b/src/arch/i686/arch_musl.cpp
new file mode 100644
index 0000000000..cd15211799
--- /dev/null
+++ b/src/arch/i686/arch_musl.cpp
@@ -0,0 +1,26 @@
+#include <os>
+#include <errno.h>
+#include <musl/common.hpp>
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_info)
+{
+    return strace(sys_set_thread_area, "set_thread_area", u_info);
+}
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+    os::panic("This should not happen!");
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+    return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}
\ No newline at end of file
diff --git a/src/arch/x86_64/CMakeLists.txt b/src/arch/x86_64/CMakeLists.txt
index de8d27d461..ce9be1e0d7 100644
--- a/src/arch/x86_64/CMakeLists.txt
+++ b/src/arch/x86_64/CMakeLists.txt
@@ -5,6 +5,7 @@ set(ARCH_OBJECTS
   apic_asm.asm
   apic_longmode.asm
   arch_start.asm
+  arch_musl.cpp
   exceptions.asm
   interrupts.asm
   fiber_asm.asm
diff --git a/src/arch/x86_64/arch_musl.cpp b/src/arch/x86_64/arch_musl.cpp
new file mode 100644
index 0000000000..d00b4a6f1b
--- /dev/null
+++ b/src/arch/x86_64/arch_musl.cpp
@@ -0,0 +1,45 @@
+#include <os>
+#include <errno.h>
+#include <likely>
+#include <musl/common.hpp>
+#include <arch/x86/cpu.hpp>
+
+extern "C"
+long sys_set_thread_area(struct user_desc *u_info)
+{
+    return -ENOSYS;
+}
+
+extern "C"
+long syscall_SYS_set_thread_area(struct user_desc *u_desc) {
+    return strace(sys_set_thread_area, "set_thread_area", u_desc);
+}
+
+#define ARCH_SET_GS 0x1001
+#define ARCH_SET_FS 0x1002
+#define ARCH_GET_FS 0x1003
+#define ARCH_GET_GS 0x1004
+
+extern "C"
+long sys_arch_prctl(int code, uintptr_t ptr) {
+  switch(code){
+  case ARCH_SET_GS:
+    if (UNLIKELY(!ptr)) return -EINVAL;
+    x86::CPU::set_gs((void*)ptr);
+    break;
+  case ARCH_SET_FS:
+    if (UNLIKELY(!ptr)) return -EINVAL;
+    x86::CPU::set_fs((void*)ptr);
+    break;
+  case ARCH_GET_GS:
+    os::panic("<arch_prctl> GET_GS called!\n");
+  case ARCH_GET_FS:
+    os::panic("<arch_prctl> GET_FS called!\n");
+  }
+  return 0;
+}
+
+extern "C"
+long syscall_SYS_arch_prctl(int code, uintptr_t ptr) {
+  return strace(sys_arch_prctl, "arch_prctl", code, ptr);
+}
diff --git a/src/arch/x86_64/syscall_entry.cpp b/src/arch/x86_64/syscall_entry.cpp
index 21f461e232..44d96f1d7f 100644
--- a/src/arch/x86_64/syscall_entry.cpp
+++ b/src/arch/x86_64/syscall_entry.cpp
@@ -14,63 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <arch/x86/cpu.hpp>
 #include <os.hpp>
-#include <likely>
 #include <kprint>
-#include <errno.h>
-
-#define ARCH_SET_GS 0x1001
-#define ARCH_SET_FS 0x1002
-#define ARCH_GET_FS 0x1003
-#define ARCH_GET_GS 0x1004
-
-#ifdef __x86_64__
-static long sys_prctl(int code, uintptr_t ptr)
-{
-  switch(code){
-  case ARCH_SET_GS:
-    //kprintf("<arch_prctl> set_gs to %#lx\n", ptr);
-    if (UNLIKELY(!ptr)) return -EINVAL;
-    x86::CPU::set_gs((void*)ptr);
-    break;
-  case ARCH_SET_FS:
-    //kprintf("<arch_prctl> set_fs to %#lx\n", ptr);
-    if (UNLIKELY(!ptr)) return -EINVAL;
-    x86::CPU::set_fs((void*)ptr);
-    break;
-  case ARCH_GET_GS:
-    os::panic("<arch_prctl> GET_GS called!\n");
-  case ARCH_GET_FS:
-    os::panic("<arch_prctl> GET_FS called!\n");
-  }
-  return -EINVAL;
-}
-#endif
 
 extern "C"
 uintptr_t syscall_entry(uint64_t n, uint64_t a1, uint64_t a2, uint64_t a3,
                    uint64_t a4, uint64_t a5)
 {
-  switch(n) {
-  case 158: // arch_prctl
-    sys_prctl(a1, a2);
-    break;
-  default:
-    kprintf("<syscall entry> no %lu (a1=%#lx a2=%#lx a3=%#lx a4=%#lx a5=%#lx) \n",
+  kprintf("<syscall entry> no %lu (a1=%#lx a2=%#lx a3=%#lx a4=%#lx a5=%#lx) \n",
             n, a1, a2, a3, a4, a5);
-  }
   return 0;
 }
 
-extern "C"
-long syscall_SYS_set_thread_area(struct user_desc *u_info)
-{
-  if (UNLIKELY(!u_info)) return -EINVAL;
-#ifdef __x86_64__
-  x86::CPU::set_fs(u_info);
-#else
-  x86::CPU::set_gs(u_info);
-#endif
-  return 0;
-}
diff --git a/src/musl/access.cpp b/src/musl/access.cpp
index 563e07115e..8185a84b99 100644
--- a/src/musl/access.cpp
+++ b/src/musl/access.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <fs/vfs.hpp>
 
diff --git a/src/musl/brk.cpp b/src/musl/brk.cpp
index 75f5bddf6b..f16982966c 100644
--- a/src/musl/brk.cpp
+++ b/src/musl/brk.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <string.h>
 #include <os.hpp>
 #include <errno.h>
diff --git a/src/musl/chmod.cpp b/src/musl/chmod.cpp
index 54158f5ad0..380cf85d9e 100644
--- a/src/musl/chmod.cpp
+++ b/src/musl/chmod.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_chmod(const char* /*path*/, mode_t /*mode*/) {
diff --git a/src/musl/chown.cpp b/src/musl/chown.cpp
index 531807b9df..d377a17065 100644
--- a/src/musl/chown.cpp
+++ b/src/musl/chown.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_chown(const char* /*path*/, uid_t /*owner*/, gid_t /*group*/)
diff --git a/src/musl/clock_gettime.cpp b/src/musl/clock_gettime.cpp
index cb1ec1c8ef..7d5151eade 100644
--- a/src/musl/clock_gettime.cpp
+++ b/src/musl/clock_gettime.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_clock_gettime(clockid_t clk_id, struct timespec* tp)
 {
diff --git a/src/musl/close.cpp b/src/musl/close.cpp
index bc3b782db7..b314f45bf8 100644
--- a/src/musl/close.cpp
+++ b/src/musl/close.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 static long sys_close(int fd)
diff --git a/src/musl/cwd.cpp b/src/musl/cwd.cpp
index 6a72d03a0a..65bad059da 100644
--- a/src/musl/cwd.cpp
+++ b/src/musl/cwd.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 #include <fs/vfs.hpp>
diff --git a/src/musl/dup3.cpp b/src/musl/dup3.cpp
index b90c8ac9dd..06c4f36266 100644
--- a/src/musl/dup3.cpp
+++ b/src/musl/dup3.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/execve.cpp b/src/musl/execve.cpp
index 36c8afe7a8..d52c34280f 100644
--- a/src/musl/execve.cpp
+++ b/src/musl/execve.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/exit.cpp b/src/musl/exit.cpp
index 00cb83a0a3..a8e9cbae90 100644
--- a/src/musl/exit.cpp
+++ b/src/musl/exit.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <arch.hpp>
 #include <string>
 #include <os>
diff --git a/src/musl/faccessat.cpp b/src/musl/faccessat.cpp
index 62d57ec503..50c6380ca2 100644
--- a/src/musl/faccessat.cpp
+++ b/src/musl/faccessat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/faccessat2.cpp b/src/musl/faccessat2.cpp
index a007f56f10..095a38ef3a 100644
--- a/src/musl/faccessat2.cpp
+++ b/src/musl/faccessat2.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/fchdir.cpp b/src/musl/fchdir.cpp
index e02dce792b..b04c18305b 100644
--- a/src/musl/fchdir.cpp
+++ b/src/musl/fchdir.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fchdir(int /*fd*/)
diff --git a/src/musl/fchmod.cpp b/src/musl/fchmod.cpp
index 3faac47510..e83a3fd78c 100644
--- a/src/musl/fchmod.cpp
+++ b/src/musl/fchmod.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_fchmod(int /*fd*/, mode_t /*mode*/) {
diff --git a/src/musl/fchmodat.cpp b/src/musl/fchmodat.cpp
index 7568e498d4..bee46d5708 100644
--- a/src/musl/fchmodat.cpp
+++ b/src/musl/fchmodat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/fchmodat2.cpp b/src/musl/fchmodat2.cpp
index b7c72d2522..a4d1c08281 100644
--- a/src/musl/fchmodat2.cpp
+++ b/src/musl/fchmodat2.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/fchown.cpp b/src/musl/fchown.cpp
index 3e803e8166..c65ba2fb2c 100644
--- a/src/musl/fchown.cpp
+++ b/src/musl/fchown.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fchown(int /*fd*/, uid_t /*owner*/, gid_t /*group*/)
diff --git a/src/musl/fcntl.cpp b/src/musl/fcntl.cpp
index 9f0c3e05d9..5d7f9aef5f 100644
--- a/src/musl/fcntl.cpp
+++ b/src/musl/fcntl.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 static long sys_fcntl(int fd, int cmd, va_list va)
diff --git a/src/musl/fstat.cpp b/src/musl/fstat.cpp
index 2530cc9bd3..89d420e7b9 100644
--- a/src/musl/fstat.cpp
+++ b/src/musl/fstat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 #include <posix/fd_map.hpp>
diff --git a/src/musl/fstatat.cpp b/src/musl/fstatat.cpp
index 065ff4d5e8..d85ec24aa2 100644
--- a/src/musl/fstatat.cpp
+++ b/src/musl/fstatat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <limits.h>
 #include <posix/fd_map.hpp>
diff --git a/src/musl/fsync.cpp b/src/musl/fsync.cpp
index 96698c5de7..5e4ad019a5 100644
--- a/src/musl/fsync.cpp
+++ b/src/musl/fsync.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_fsync(int /*fd*/)
diff --git a/src/musl/ftruncate.cpp b/src/musl/ftruncate.cpp
index 96113ffa38..e3e2cebcfa 100644
--- a/src/musl/ftruncate.cpp
+++ b/src/musl/ftruncate.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/musl/getdents.cpp b/src/musl/getdents.cpp
index 137e613ad9..2c0275905f 100644
--- a/src/musl/getdents.cpp
+++ b/src/musl/getdents.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <dirent.h>
 #include <posix/fd_map.hpp>
 
diff --git a/src/musl/geteuid.cpp b/src/musl/geteuid.cpp
index beacbc74ba..22e166ab38 100644
--- a/src/musl/geteuid.cpp
+++ b/src/musl/geteuid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/musl/getgid.cpp b/src/musl/getgid.cpp
index c7b03a3bbd..99c1e9c62a 100644
--- a/src/musl/getgid.cpp
+++ b/src/musl/getgid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 
 static long sys_getgid()
diff --git a/src/musl/getpid.cpp b/src/musl/getpid.cpp
index c2d70e3932..65f64820c8 100644
--- a/src/musl/getpid.cpp
+++ b/src/musl/getpid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 int sys_getpid() {
   return 1;
diff --git a/src/musl/getrandom.cpp b/src/musl/getrandom.cpp
index 963b06bb31..4fa2cd1928 100644
--- a/src/musl/getrandom.cpp
+++ b/src/musl/getrandom.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <kernel/rng.hpp>
 
 // TODO: flags are ignored.
diff --git a/src/musl/getrlimit.cpp b/src/musl/getrlimit.cpp
index 6376691621..204e0795f9 100644
--- a/src/musl/getrlimit.cpp
+++ b/src/musl/getrlimit.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <sys/resource.h>
 
diff --git a/src/musl/getrusage.cpp b/src/musl/getrusage.cpp
index ad38b5f105..71063da499 100644
--- a/src/musl/getrusage.cpp
+++ b/src/musl/getrusage.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <sys/resource.h>
 
diff --git a/src/musl/gettimeofday.cpp b/src/musl/gettimeofday.cpp
index 4d853e2bf5..7237135433 100644
--- a/src/musl/gettimeofday.cpp
+++ b/src/musl/gettimeofday.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/time.h>
 
 static long sys_gettimeofday(struct timeval *tv, struct timezone *tz)
diff --git a/src/musl/getuid.cpp b/src/musl/getuid.cpp
index a7ef0bb52a..4fc6b62bd9 100644
--- a/src/musl/getuid.cpp
+++ b/src/musl/getuid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_getuid() {
   return 0;
diff --git a/src/musl/ioctl.cpp b/src/musl/ioctl.cpp
index 31ff547f73..50668f6dff 100644
--- a/src/musl/ioctl.cpp
+++ b/src/musl/ioctl.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <sys/ioctl.h>
 #include <posix/fd_map.hpp>
diff --git a/src/musl/kill.cpp b/src/musl/kill.cpp
index 04e964ca76..42784d7cb0 100644
--- a/src/musl/kill.cpp
+++ b/src/musl/kill.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 
 int sys_kill(pid_t /*pid*/, int /*sig*/) {
diff --git a/src/musl/lseek.cpp b/src/musl/lseek.cpp
index 86716f01d7..8d36462a18 100644
--- a/src/musl/lseek.cpp
+++ b/src/musl/lseek.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <fcntl.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/musl/madvise.cpp b/src/musl/madvise.cpp
index adfad77511..f72283b7d9 100644
--- a/src/musl/madvise.cpp
+++ b/src/musl/madvise.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/mman.h>
 
 static long sys_madvise(void* addr, size_t length, int advice)
diff --git a/src/musl/mincore.cpp b/src/musl/mincore.cpp
index ed040148df..55b7941f6e 100644
--- a/src/musl/mincore.cpp
+++ b/src/musl/mincore.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_mincore([[maybe_unused]]void *addr,
                         [[maybe_unused]]size_t length,
diff --git a/src/musl/mkdir.cpp b/src/musl/mkdir.cpp
index 33dbdc68ae..d9ffa9b110 100644
--- a/src/musl/mkdir.cpp
+++ b/src/musl/mkdir.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_mkdir(const char* /*path*/, mode_t /*mode*/) {
diff --git a/src/musl/mkdirat.cpp b/src/musl/mkdirat.cpp
index 0837276768..08f1eb6c7a 100644
--- a/src/musl/mkdirat.cpp
+++ b/src/musl/mkdirat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/mknod.cpp b/src/musl/mknod.cpp
index 4b442a9f44..6de348bffe 100644
--- a/src/musl/mknod.cpp
+++ b/src/musl/mknod.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_mknod(const char* /*pathname*/, mode_t /*mode*/, dev_t /*dev*/)
diff --git a/src/musl/mknodat.cpp b/src/musl/mknodat.cpp
index 3b656b0a1a..383d92a1b8 100644
--- a/src/musl/mknodat.cpp
+++ b/src/musl/mknodat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 static long sys_mknodat(int /*dirfd*/, const char* /*path*/, mode_t, dev_t)
diff --git a/src/musl/mlock.cpp b/src/musl/mlock.cpp
index 9c1044e565..6f67895b29 100644
--- a/src/musl/mlock.cpp
+++ b/src/musl/mlock.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <kernel/memory.hpp>
 
 static long sys_mlock(const void* /* addr */, size_t /* len */)
diff --git a/src/musl/mmap.cpp b/src/musl/mmap.cpp
index 691681691c..7713d6fde3 100644
--- a/src/musl/mmap.cpp
+++ b/src/musl/mmap.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <cstdint>
 #include <sys/mman.h>
 #include <errno.h>
diff --git a/src/musl/mprotect.cpp b/src/musl/mprotect.cpp
index 5be2bc6cbc..974b5ffede 100644
--- a/src/musl/mprotect.cpp
+++ b/src/musl/mprotect.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <kernel/memory.hpp>
 
 static long sys_mprotect(void* /*addr*/, size_t /*len*/, int /*prot*/)
diff --git a/src/musl/mremap.cpp b/src/musl/mremap.cpp
index 3fdc09784f..cafc693a6c 100644
--- a/src/musl/mremap.cpp
+++ b/src/musl/mremap.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_mremap(void */*old_address*/, size_t /*old_size*/,
                        size_t /*new_size*/, int /*flags*/, void */*new_address*/)
diff --git a/src/musl/msync.cpp b/src/musl/msync.cpp
index e2db34c97e..d9a1bf1537 100644
--- a/src/musl/msync.cpp
+++ b/src/musl/msync.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_msync(void */*addr*/, size_t /*length*/, int /*flags*/)
 {
diff --git a/src/musl/munmap.cpp b/src/musl/munmap.cpp
index 89c56eaa5d..56faca5a45 100644
--- a/src/musl/munmap.cpp
+++ b/src/musl/munmap.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 extern "C" void kfree(void* addr, size_t length);
 
diff --git a/src/musl/nanosleep.cpp b/src/musl/nanosleep.cpp
index be527aecb4..f01d2c0f33 100644
--- a/src/musl/nanosleep.cpp
+++ b/src/musl/nanosleep.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <time.h>
 #include <timers>
 using namespace std::chrono;
diff --git a/src/musl/open.cpp b/src/musl/open.cpp
index 0119debf77..2890732654 100644
--- a/src/musl/open.cpp
+++ b/src/musl/open.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <fs/vfs.hpp>
 #include <posix/fd_map.hpp>
diff --git a/src/musl/openat.cpp b/src/musl/openat.cpp
index bdddf3e08b..66a2c91da6 100644
--- a/src/musl/openat.cpp
+++ b/src/musl/openat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 #include <fcntl.h>
 
diff --git a/src/musl/pipe.cpp b/src/musl/pipe.cpp
index 2fbdae0e0e..af6cab4c41 100644
--- a/src/musl/pipe.cpp
+++ b/src/musl/pipe.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_pipe([[maybe_unused]]int pipefd[2])
 {
diff --git a/src/musl/prlimit64.cpp b/src/musl/prlimit64.cpp
index 7cfb68812a..e803e28b7a 100644
--- a/src/musl/prlimit64.cpp
+++ b/src/musl/prlimit64.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/resource.h>
 
 static long sys_prlimit64(pid_t /*pid*/, int /*resource*/,
diff --git a/src/musl/read.cpp b/src/musl/read.cpp
index 07f24d272e..aa0db4554d 100644
--- a/src/musl/read.cpp
+++ b/src/musl/read.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 static long sys_read(int fd, void* buf, size_t len)
diff --git a/src/musl/readlink.cpp b/src/musl/readlink.cpp
index 9912810aad..68d70097ec 100644
--- a/src/musl/readlink.cpp
+++ b/src/musl/readlink.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 #include <sys/types.h>
 
diff --git a/src/musl/readv.cpp b/src/musl/readv.cpp
index 3b6c3e5edc..726728bf3c 100644
--- a/src/musl/readv.cpp
+++ b/src/musl/readv.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 #include <posix/fd_map.hpp>
 
diff --git a/src/musl/rename.cpp b/src/musl/rename.cpp
index b877116662..db4eb4323a 100644
--- a/src/musl/rename.cpp
+++ b/src/musl/rename.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <stdio.h>
 
 static long sys_rename(const char* /*oldpath*/, const char* /*newpath*/)
diff --git a/src/musl/rmdir.cpp b/src/musl/rmdir.cpp
index 6b7bb9f80a..3dfcdf5eee 100644
--- a/src/musl/rmdir.cpp
+++ b/src/musl/rmdir.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_rmdir(const char* /*pathname*/)
diff --git a/src/musl/rt_sigaction.cpp b/src/musl/rt_sigaction.cpp
index fb149e237e..3e26399201 100644
--- a/src/musl/rt_sigaction.cpp
+++ b/src/musl/rt_sigaction.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static int sys_sigaction(int signum,
                          const struct sigaction* act,
diff --git a/src/musl/sched_getaffinity.cpp b/src/musl/sched_getaffinity.cpp
index 225feb5044..1b8032c5aa 100644
--- a/src/musl/sched_getaffinity.cpp
+++ b/src/musl/sched_getaffinity.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sched.h>
 
 static long sys_sched_getaffinity(pid_t /*pid*/, size_t /*cpusetsize*/,
diff --git a/src/musl/sched_setaffinity.cpp b/src/musl/sched_setaffinity.cpp
index 78060ea03f..7c7fed6a0a 100644
--- a/src/musl/sched_setaffinity.cpp
+++ b/src/musl/sched_setaffinity.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sched.h>
 
 static long sys_sched_setaffinity(pid_t /*pid*/, size_t /*cpusetsize*/,
diff --git a/src/musl/sched_setscheduler.cpp b/src/musl/sched_setscheduler.cpp
index 69e8b335ec..4e24b39e0b 100644
--- a/src/musl/sched_setscheduler.cpp
+++ b/src/musl/sched_setscheduler.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sched.h>
 
 static long sys_sched_setscheduler(pid_t /*pid*/, int /*policy*/, const struct sched_param* /*param*/)
diff --git a/src/musl/select.cpp b/src/musl/select.cpp
index 46fa01a8d3..2e42a1dc6c 100644
--- a/src/musl/select.cpp
+++ b/src/musl/select.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/select.h>
 
 long sys_select(int /*nfds*/,
diff --git a/src/musl/set_robust_list.cpp b/src/musl/set_robust_list.cpp
index 69465e6537..f665928861 100644
--- a/src/musl/set_robust_list.cpp
+++ b/src/musl/set_robust_list.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 static long sys_set_robust_list(struct robust_list_head */*head*/, size_t /*len*/)
 {
diff --git a/src/musl/setgid.cpp b/src/musl/setgid.cpp
index b57bf32c19..a77b83a0d6 100644
--- a/src/musl/setgid.cpp
+++ b/src/musl/setgid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/setpgid.cpp b/src/musl/setpgid.cpp
index 8055a09a3c..f20c89bd39 100644
--- a/src/musl/setpgid.cpp
+++ b/src/musl/setpgid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/setrlimit.cpp b/src/musl/setrlimit.cpp
index 597cc80565..cc7af52217 100644
--- a/src/musl/setrlimit.cpp
+++ b/src/musl/setrlimit.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 long sys_setrlimit(int /*resource*/, const struct rlimit* /*rlim*/)
 {
diff --git a/src/musl/setsid.cpp b/src/musl/setsid.cpp
index 75a984de48..436f963651 100644
--- a/src/musl/setsid.cpp
+++ b/src/musl/setsid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/setuid.cpp b/src/musl/setuid.cpp
index 9664829c9a..c5dbc7202d 100644
--- a/src/musl/setuid.cpp
+++ b/src/musl/setuid.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/sigaltstack.cpp b/src/musl/sigaltstack.cpp
index d766041ae8..9d333281d2 100644
--- a/src/musl/sigaltstack.cpp
+++ b/src/musl/sigaltstack.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <signal.h>
 
 static long sys_sigaltstack(const stack_t * /*ss*/, stack_t * /*old_ss*/)
diff --git a/src/musl/socketcall.cpp b/src/musl/socketcall.cpp
index 3e8cfd8b30..b54f1ef347 100644
--- a/src/musl/socketcall.cpp
+++ b/src/musl/socketcall.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <errno.h>
 #include <sys/socket.h>
 
diff --git a/src/musl/stat.cpp b/src/musl/stat.cpp
index 39c965564d..fb9f1db24a 100644
--- a/src/musl/stat.cpp
+++ b/src/musl/stat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 #include <fs/vfs.hpp>
diff --git a/src/musl/statx.cpp b/src/musl/statx.cpp
index b85d44d7df..a8b39415b7 100644
--- a/src/musl/statx.cpp
+++ b/src/musl/statx.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 long sys_statx(int /*dirfd*/, const char* /*pathname*/, int /*flags*/,
diff --git a/src/musl/stub.hpp b/src/musl/stub.hpp
index 99e1eae46e..bd3bd7b948 100644
--- a/src/musl/stub.hpp
+++ b/src/musl/stub.hpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 
 extern "C"
 void __serial_print1(const char*);
diff --git a/src/musl/sysinfo.cpp b/src/musl/sysinfo.cpp
index 4c58bee708..85b08cdd23 100644
--- a/src/musl/sysinfo.cpp
+++ b/src/musl/sysinfo.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/sysinfo.h>
 
 static long sys_sysinfo(struct sysinfo */*info*/)
diff --git a/src/musl/umask.cpp b/src/musl/umask.cpp
index c22596949b..6a833e2f99 100644
--- a/src/musl/umask.cpp
+++ b/src/musl/umask.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/stat.h>
 
 mode_t THE_MASK = 002;
diff --git a/src/musl/uname.cpp b/src/musl/uname.cpp
index 9308a9ce55..b095382c0b 100644
--- a/src/musl/uname.cpp
+++ b/src/musl/uname.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/utsname.h>
 #include <os.hpp>
 
diff --git a/src/musl/unlink.cpp b/src/musl/unlink.cpp
index 3fed0c6116..fc0d1f56d3 100644
--- a/src/musl/unlink.cpp
+++ b/src/musl/unlink.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <unistd.h>
 
 static long sys_unlink(const char* /*pathname*/)
diff --git a/src/musl/utimensat.cpp b/src/musl/utimensat.cpp
index e1fd81f0c1..e8a7296d67 100644
--- a/src/musl/utimensat.cpp
+++ b/src/musl/utimensat.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <fcntl.h> /* Definition of AT_* constants */
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/src/musl/wait4.cpp b/src/musl/wait4.cpp
index d6edcfa483..e663602abc 100644
--- a/src/musl/wait4.cpp
+++ b/src/musl/wait4.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/musl/write.cpp b/src/musl/write.cpp
index 13134203df..86c022fbe4 100644
--- a/src/musl/write.cpp
+++ b/src/musl/write.cpp
@@ -1,5 +1,5 @@
 #include <os>
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <posix/fd_map.hpp>
 
 // The actual syscall
diff --git a/src/musl/writev.cpp b/src/musl/writev.cpp
index 5e4bf9e5ea..c0d0068de9 100644
--- a/src/musl/writev.cpp
+++ b/src/musl/writev.cpp
@@ -1,4 +1,4 @@
-#include "common.hpp"
+#include <musl/common.hpp>
 #include <sys/uio.h>
 
 static long sys_writev(int fd, const struct iovec *iov, int iovcnt)