diff --git a/libc/arch-aarch64/syscalls/__brk.S b/libc/arch-aarch64/syscalls/__brk.S
index 91e5ee4..98055cc 100644
--- a/libc/arch-aarch64/syscalls/__brk.S
+++ b/libc/arch-aarch64/syscalls/__brk.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__brk)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__clone.S b/libc/arch-aarch64/syscalls/__clone.S
index 817ae58..45c2022 100644
--- a/libc/arch-aarch64/syscalls/__clone.S
+++ b/libc/arch-aarch64/syscalls/__clone.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__clone)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__epoll_pwait.S b/libc/arch-aarch64/syscalls/__epoll_pwait.S
index b65c5a9..d512c7c 100644
--- a/libc/arch-aarch64/syscalls/__epoll_pwait.S
+++ b/libc/arch-aarch64/syscalls/__epoll_pwait.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__epoll_pwait)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__exit.S b/libc/arch-aarch64/syscalls/__exit.S
index 7443176..50cd45a 100644
--- a/libc/arch-aarch64/syscalls/__exit.S
+++ b/libc/arch-aarch64/syscalls/__exit.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__exit)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getcpu.S b/libc/arch-aarch64/syscalls/__getcpu.S
index 907b769..698e8ff 100644
--- a/libc/arch-aarch64/syscalls/__getcpu.S
+++ b/libc/arch-aarch64/syscalls/__getcpu.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__getcpu)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getcwd.S b/libc/arch-aarch64/syscalls/__getcwd.S
index 723c550..f0543f0 100644
--- a/libc/arch-aarch64/syscalls/__getcwd.S
+++ b/libc/arch-aarch64/syscalls/__getcwd.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__getcwd)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__getpriority.S b/libc/arch-aarch64/syscalls/__getpriority.S
index c0df90f..f7fd1b8 100644
--- a/libc/arch-aarch64/syscalls/__getpriority.S
+++ b/libc/arch-aarch64/syscalls/__getpriority.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__getpriority)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ioctl.S b/libc/arch-aarch64/syscalls/__ioctl.S
index be1ae0d..2569fdf 100644
--- a/libc/arch-aarch64/syscalls/__ioctl.S
+++ b/libc/arch-aarch64/syscalls/__ioctl.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__ioctl)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__openat.S b/libc/arch-aarch64/syscalls/__openat.S
index 4a81443..cca66ce 100644
--- a/libc/arch-aarch64/syscalls/__openat.S
+++ b/libc/arch-aarch64/syscalls/__openat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__openat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ppoll.S b/libc/arch-aarch64/syscalls/__ppoll.S
index 985a569..68efc09 100644
--- a/libc/arch-aarch64/syscalls/__ppoll.S
+++ b/libc/arch-aarch64/syscalls/__ppoll.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__ppoll)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__pselect6.S b/libc/arch-aarch64/syscalls/__pselect6.S
index 1f38048..295b71a 100644
--- a/libc/arch-aarch64/syscalls/__pselect6.S
+++ b/libc/arch-aarch64/syscalls/__pselect6.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__pselect6)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__ptrace.S b/libc/arch-aarch64/syscalls/__ptrace.S
index 5084dbe..aa41071 100644
--- a/libc/arch-aarch64/syscalls/__ptrace.S
+++ b/libc/arch-aarch64/syscalls/__ptrace.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__ptrace)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__reboot.S b/libc/arch-aarch64/syscalls/__reboot.S
index 80cb855..9680bdc 100644
--- a/libc/arch-aarch64/syscalls/__reboot.S
+++ b/libc/arch-aarch64/syscalls/__reboot.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__reboot)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigaction.S b/libc/arch-aarch64/syscalls/__rt_sigaction.S
index 82dc79e..77f83ea 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigaction.S
+++ b/libc/arch-aarch64/syscalls/__rt_sigaction.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__rt_sigaction)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigpending.S b/libc/arch-aarch64/syscalls/__rt_sigpending.S
index ace2866..59a2e1e 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigpending.S
+++ b/libc/arch-aarch64/syscalls/__rt_sigpending.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__rt_sigpending)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigprocmask.S b/libc/arch-aarch64/syscalls/__rt_sigprocmask.S
index 31ee86f..c5a51ed 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigprocmask.S
+++ b/libc/arch-aarch64/syscalls/__rt_sigprocmask.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__rt_sigprocmask)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigsuspend.S b/libc/arch-aarch64/syscalls/__rt_sigsuspend.S
index 58f711c..7a1c22e 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigsuspend.S
+++ b/libc/arch-aarch64/syscalls/__rt_sigsuspend.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__rt_sigsuspend)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S b/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
index 748d81b..b3d950c 100644
--- a/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
+++ b/libc/arch-aarch64/syscalls/__rt_sigtimedwait.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__rt_sigtimedwait)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__sched_getaffinity.S b/libc/arch-aarch64/syscalls/__sched_getaffinity.S
index 76c51b0..9b785ad 100644
--- a/libc/arch-aarch64/syscalls/__sched_getaffinity.S
+++ b/libc/arch-aarch64/syscalls/__sched_getaffinity.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__sched_getaffinity)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__syslog.S b/libc/arch-aarch64/syscalls/__syslog.S
index 379926d..625a7eb 100644
--- a/libc/arch-aarch64/syscalls/__syslog.S
+++ b/libc/arch-aarch64/syscalls/__syslog.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__syslog)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_create.S b/libc/arch-aarch64/syscalls/__timer_create.S
index cebae7a..bfce448 100644
--- a/libc/arch-aarch64/syscalls/__timer_create.S
+++ b/libc/arch-aarch64/syscalls/__timer_create.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__timer_create)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_delete.S b/libc/arch-aarch64/syscalls/__timer_delete.S
index 06a2ca7..03ed44e 100644
--- a/libc/arch-aarch64/syscalls/__timer_delete.S
+++ b/libc/arch-aarch64/syscalls/__timer_delete.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__timer_delete)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_getoverrun.S b/libc/arch-aarch64/syscalls/__timer_getoverrun.S
index 3e6fbb7..a458941 100644
--- a/libc/arch-aarch64/syscalls/__timer_getoverrun.S
+++ b/libc/arch-aarch64/syscalls/__timer_getoverrun.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__timer_getoverrun)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_gettime.S b/libc/arch-aarch64/syscalls/__timer_gettime.S
index 41cfcfb..b6ae29e 100644
--- a/libc/arch-aarch64/syscalls/__timer_gettime.S
+++ b/libc/arch-aarch64/syscalls/__timer_gettime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__timer_gettime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__timer_settime.S b/libc/arch-aarch64/syscalls/__timer_settime.S
index 474c98e..3c44b53 100644
--- a/libc/arch-aarch64/syscalls/__timer_settime.S
+++ b/libc/arch-aarch64/syscalls/__timer_settime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__timer_settime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/__waitid.S b/libc/arch-aarch64/syscalls/__waitid.S
index 62445ae..4244018 100644
--- a/libc/arch-aarch64/syscalls/__waitid.S
+++ b/libc/arch-aarch64/syscalls/__waitid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(__waitid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/_exit.S b/libc/arch-aarch64/syscalls/_exit.S
index 9f5644a..24b7b17 100644
--- a/libc/arch-aarch64/syscalls/_exit.S
+++ b/libc/arch-aarch64/syscalls/_exit.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(_exit)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/accept.S b/libc/arch-aarch64/syscalls/accept.S
index add85c8..dae6121 100644
--- a/libc/arch-aarch64/syscalls/accept.S
+++ b/libc/arch-aarch64/syscalls/accept.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(accept)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/acct.S b/libc/arch-aarch64/syscalls/acct.S
index ab4b30d..901e420 100644
--- a/libc/arch-aarch64/syscalls/acct.S
+++ b/libc/arch-aarch64/syscalls/acct.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(acct)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/bind.S b/libc/arch-aarch64/syscalls/bind.S
index 28f192b..471d783 100644
--- a/libc/arch-aarch64/syscalls/bind.S
+++ b/libc/arch-aarch64/syscalls/bind.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(bind)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/capget.S b/libc/arch-aarch64/syscalls/capget.S
index fbe2685..33fe11c 100644
--- a/libc/arch-aarch64/syscalls/capget.S
+++ b/libc/arch-aarch64/syscalls/capget.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(capget)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/capset.S b/libc/arch-aarch64/syscalls/capset.S
index 2677b1e..75f03a9 100644
--- a/libc/arch-aarch64/syscalls/capset.S
+++ b/libc/arch-aarch64/syscalls/capset.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(capset)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/chdir.S b/libc/arch-aarch64/syscalls/chdir.S
index 5480043..051f823 100644
--- a/libc/arch-aarch64/syscalls/chdir.S
+++ b/libc/arch-aarch64/syscalls/chdir.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(chdir)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/chroot.S b/libc/arch-aarch64/syscalls/chroot.S
index 38ed61e..c06399f 100644
--- a/libc/arch-aarch64/syscalls/chroot.S
+++ b/libc/arch-aarch64/syscalls/chroot.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(chroot)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_getres.S b/libc/arch-aarch64/syscalls/clock_getres.S
index f142134..bffc7cb 100644
--- a/libc/arch-aarch64/syscalls/clock_getres.S
+++ b/libc/arch-aarch64/syscalls/clock_getres.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(clock_getres)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_gettime.S b/libc/arch-aarch64/syscalls/clock_gettime.S
index c7581cd..3c58236 100644
--- a/libc/arch-aarch64/syscalls/clock_gettime.S
+++ b/libc/arch-aarch64/syscalls/clock_gettime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(clock_gettime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_nanosleep.S b/libc/arch-aarch64/syscalls/clock_nanosleep.S
index b942bcc..357bda6 100644
--- a/libc/arch-aarch64/syscalls/clock_nanosleep.S
+++ b/libc/arch-aarch64/syscalls/clock_nanosleep.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(clock_nanosleep)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/clock_settime.S b/libc/arch-aarch64/syscalls/clock_settime.S
index ad8b102..06e9393 100644
--- a/libc/arch-aarch64/syscalls/clock_settime.S
+++ b/libc/arch-aarch64/syscalls/clock_settime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(clock_settime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/close.S b/libc/arch-aarch64/syscalls/close.S
index 0943cfc..fefe147 100644
--- a/libc/arch-aarch64/syscalls/close.S
+++ b/libc/arch-aarch64/syscalls/close.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(close)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/connect.S b/libc/arch-aarch64/syscalls/connect.S
index 4b83c95..d3cd43d 100644
--- a/libc/arch-aarch64/syscalls/connect.S
+++ b/libc/arch-aarch64/syscalls/connect.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(connect)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/delete_module.S b/libc/arch-aarch64/syscalls/delete_module.S
index ab471ce..4e8b09d 100644
--- a/libc/arch-aarch64/syscalls/delete_module.S
+++ b/libc/arch-aarch64/syscalls/delete_module.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(delete_module)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/dup.S b/libc/arch-aarch64/syscalls/dup.S
index 1aa9162..9dbe562 100644
--- a/libc/arch-aarch64/syscalls/dup.S
+++ b/libc/arch-aarch64/syscalls/dup.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(dup)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/dup3.S b/libc/arch-aarch64/syscalls/dup3.S
index 8bb5925..ee04440 100644
--- a/libc/arch-aarch64/syscalls/dup3.S
+++ b/libc/arch-aarch64/syscalls/dup3.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(dup3)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/epoll_create1.S b/libc/arch-aarch64/syscalls/epoll_create1.S
index 2f38b5d..0ed34b5 100644
--- a/libc/arch-aarch64/syscalls/epoll_create1.S
+++ b/libc/arch-aarch64/syscalls/epoll_create1.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(epoll_create1)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/epoll_ctl.S b/libc/arch-aarch64/syscalls/epoll_ctl.S
index eacf78c..a09ba29 100644
--- a/libc/arch-aarch64/syscalls/epoll_ctl.S
+++ b/libc/arch-aarch64/syscalls/epoll_ctl.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(epoll_ctl)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/eventfd.S b/libc/arch-aarch64/syscalls/eventfd.S
index 6890b01..e6b592b 100644
--- a/libc/arch-aarch64/syscalls/eventfd.S
+++ b/libc/arch-aarch64/syscalls/eventfd.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(eventfd)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/execve.S b/libc/arch-aarch64/syscalls/execve.S
index 63aaece..4f3cdb8 100644
--- a/libc/arch-aarch64/syscalls/execve.S
+++ b/libc/arch-aarch64/syscalls/execve.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(execve)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/faccessat.S b/libc/arch-aarch64/syscalls/faccessat.S
index 20ac348..c6b6557 100644
--- a/libc/arch-aarch64/syscalls/faccessat.S
+++ b/libc/arch-aarch64/syscalls/faccessat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(faccessat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchdir.S b/libc/arch-aarch64/syscalls/fchdir.S
index 514b139..c608231 100644
--- a/libc/arch-aarch64/syscalls/fchdir.S
+++ b/libc/arch-aarch64/syscalls/fchdir.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fchdir)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchmod.S b/libc/arch-aarch64/syscalls/fchmod.S
index c5345e3..a777cdc 100644
--- a/libc/arch-aarch64/syscalls/fchmod.S
+++ b/libc/arch-aarch64/syscalls/fchmod.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fchmod)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchmodat.S b/libc/arch-aarch64/syscalls/fchmodat.S
index 02a7f59..1a52c9f 100644
--- a/libc/arch-aarch64/syscalls/fchmodat.S
+++ b/libc/arch-aarch64/syscalls/fchmodat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fchmodat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchown.S b/libc/arch-aarch64/syscalls/fchown.S
index adaf5f4..073e36f 100644
--- a/libc/arch-aarch64/syscalls/fchown.S
+++ b/libc/arch-aarch64/syscalls/fchown.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fchown)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fchownat.S b/libc/arch-aarch64/syscalls/fchownat.S
index 2762c6c..db80ab1 100644
--- a/libc/arch-aarch64/syscalls/fchownat.S
+++ b/libc/arch-aarch64/syscalls/fchownat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fchownat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fcntl.S b/libc/arch-aarch64/syscalls/fcntl.S
index 5c78747..23ce155 100644
--- a/libc/arch-aarch64/syscalls/fcntl.S
+++ b/libc/arch-aarch64/syscalls/fcntl.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fcntl)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fdatasync.S b/libc/arch-aarch64/syscalls/fdatasync.S
index 55fe848..b4e9aa9 100644
--- a/libc/arch-aarch64/syscalls/fdatasync.S
+++ b/libc/arch-aarch64/syscalls/fdatasync.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fdatasync)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fgetxattr.S b/libc/arch-aarch64/syscalls/fgetxattr.S
index a73fce9..3278a12 100644
--- a/libc/arch-aarch64/syscalls/fgetxattr.S
+++ b/libc/arch-aarch64/syscalls/fgetxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fgetxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/flistxattr.S b/libc/arch-aarch64/syscalls/flistxattr.S
index e52d1fd..40b2a30 100644
--- a/libc/arch-aarch64/syscalls/flistxattr.S
+++ b/libc/arch-aarch64/syscalls/flistxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(flistxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/flock.S b/libc/arch-aarch64/syscalls/flock.S
index 091c34b..7e28789 100644
--- a/libc/arch-aarch64/syscalls/flock.S
+++ b/libc/arch-aarch64/syscalls/flock.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(flock)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fremovexattr.S b/libc/arch-aarch64/syscalls/fremovexattr.S
index 3801f2e..be86dd0 100644
--- a/libc/arch-aarch64/syscalls/fremovexattr.S
+++ b/libc/arch-aarch64/syscalls/fremovexattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fremovexattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fsetxattr.S b/libc/arch-aarch64/syscalls/fsetxattr.S
index 61170e6..2cb72c9 100644
--- a/libc/arch-aarch64/syscalls/fsetxattr.S
+++ b/libc/arch-aarch64/syscalls/fsetxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fsetxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstat.S b/libc/arch-aarch64/syscalls/fstat.S
index 09de2e5..f8aaa40 100644
--- a/libc/arch-aarch64/syscalls/fstat.S
+++ b/libc/arch-aarch64/syscalls/fstat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fstat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstatat.S b/libc/arch-aarch64/syscalls/fstatat.S
index b668a19..5de0fa0 100644
--- a/libc/arch-aarch64/syscalls/fstatat.S
+++ b/libc/arch-aarch64/syscalls/fstatat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fstatat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fstatfs.S b/libc/arch-aarch64/syscalls/fstatfs.S
index 4b179e8..afd8875 100644
--- a/libc/arch-aarch64/syscalls/fstatfs.S
+++ b/libc/arch-aarch64/syscalls/fstatfs.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fstatfs)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/fsync.S b/libc/arch-aarch64/syscalls/fsync.S
index a493f46..e1076f2 100644
--- a/libc/arch-aarch64/syscalls/fsync.S
+++ b/libc/arch-aarch64/syscalls/fsync.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(fsync)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ftruncate.S b/libc/arch-aarch64/syscalls/ftruncate.S
index 3e578a6..7ed80b9 100644
--- a/libc/arch-aarch64/syscalls/ftruncate.S
+++ b/libc/arch-aarch64/syscalls/ftruncate.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(ftruncate)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/futex.S b/libc/arch-aarch64/syscalls/futex.S
index d014414..5149d6b 100644
--- a/libc/arch-aarch64/syscalls/futex.S
+++ b/libc/arch-aarch64/syscalls/futex.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(futex)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getdents.S b/libc/arch-aarch64/syscalls/getdents.S
index 3af99ce..56496c2 100644
--- a/libc/arch-aarch64/syscalls/getdents.S
+++ b/libc/arch-aarch64/syscalls/getdents.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getdents)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getegid.S b/libc/arch-aarch64/syscalls/getegid.S
index 5c12eb8..144fe88 100644
--- a/libc/arch-aarch64/syscalls/getegid.S
+++ b/libc/arch-aarch64/syscalls/getegid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getegid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/geteuid.S b/libc/arch-aarch64/syscalls/geteuid.S
index 23ccc9a..fcec977 100644
--- a/libc/arch-aarch64/syscalls/geteuid.S
+++ b/libc/arch-aarch64/syscalls/geteuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(geteuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getgid.S b/libc/arch-aarch64/syscalls/getgid.S
index 21ae633..0fd172e 100644
--- a/libc/arch-aarch64/syscalls/getgid.S
+++ b/libc/arch-aarch64/syscalls/getgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getgroups.S b/libc/arch-aarch64/syscalls/getgroups.S
index 3c6987b..3c12ef4 100644
--- a/libc/arch-aarch64/syscalls/getgroups.S
+++ b/libc/arch-aarch64/syscalls/getgroups.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getgroups)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getitimer.S b/libc/arch-aarch64/syscalls/getitimer.S
index b02ae75..d795cd7 100644
--- a/libc/arch-aarch64/syscalls/getitimer.S
+++ b/libc/arch-aarch64/syscalls/getitimer.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getitimer)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpeername.S b/libc/arch-aarch64/syscalls/getpeername.S
index 2cb4841..aea3122 100644
--- a/libc/arch-aarch64/syscalls/getpeername.S
+++ b/libc/arch-aarch64/syscalls/getpeername.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getpeername)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpgid.S b/libc/arch-aarch64/syscalls/getpgid.S
index a75ac5b..1bda83f 100644
--- a/libc/arch-aarch64/syscalls/getpgid.S
+++ b/libc/arch-aarch64/syscalls/getpgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getpgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getpid.S b/libc/arch-aarch64/syscalls/getpid.S
index 75835da..3a408c8 100644
--- a/libc/arch-aarch64/syscalls/getpid.S
+++ b/libc/arch-aarch64/syscalls/getpid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getpid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getppid.S b/libc/arch-aarch64/syscalls/getppid.S
index 63f7758..1b85cef 100644
--- a/libc/arch-aarch64/syscalls/getppid.S
+++ b/libc/arch-aarch64/syscalls/getppid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getppid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getresgid.S b/libc/arch-aarch64/syscalls/getresgid.S
index ec1aefb..ab00b06 100644
--- a/libc/arch-aarch64/syscalls/getresgid.S
+++ b/libc/arch-aarch64/syscalls/getresgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getresgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getresuid.S b/libc/arch-aarch64/syscalls/getresuid.S
index d0093a4..0ff218a 100644
--- a/libc/arch-aarch64/syscalls/getresuid.S
+++ b/libc/arch-aarch64/syscalls/getresuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getresuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getrlimit.S b/libc/arch-aarch64/syscalls/getrlimit.S
index 713d62c..8b6548f 100644
--- a/libc/arch-aarch64/syscalls/getrlimit.S
+++ b/libc/arch-aarch64/syscalls/getrlimit.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getrlimit)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getrusage.S b/libc/arch-aarch64/syscalls/getrusage.S
index 10a3c1b..5e2bace 100644
--- a/libc/arch-aarch64/syscalls/getrusage.S
+++ b/libc/arch-aarch64/syscalls/getrusage.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getrusage)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsid.S b/libc/arch-aarch64/syscalls/getsid.S
index 8ec4dc6..c85ca60 100644
--- a/libc/arch-aarch64/syscalls/getsid.S
+++ b/libc/arch-aarch64/syscalls/getsid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getsid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsockname.S b/libc/arch-aarch64/syscalls/getsockname.S
index d14ca67..1d0279a 100644
--- a/libc/arch-aarch64/syscalls/getsockname.S
+++ b/libc/arch-aarch64/syscalls/getsockname.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getsockname)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getsockopt.S b/libc/arch-aarch64/syscalls/getsockopt.S
index ec9257f..3bfd5b8 100644
--- a/libc/arch-aarch64/syscalls/getsockopt.S
+++ b/libc/arch-aarch64/syscalls/getsockopt.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getsockopt)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/gettid.S b/libc/arch-aarch64/syscalls/gettid.S
index 0fe02b6..d8c128e 100644
--- a/libc/arch-aarch64/syscalls/gettid.S
+++ b/libc/arch-aarch64/syscalls/gettid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(gettid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/gettimeofday.S b/libc/arch-aarch64/syscalls/gettimeofday.S
index e131928..4f9ac28 100644
--- a/libc/arch-aarch64/syscalls/gettimeofday.S
+++ b/libc/arch-aarch64/syscalls/gettimeofday.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(gettimeofday)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getuid.S b/libc/arch-aarch64/syscalls/getuid.S
index 9fa6b52..96198b7 100644
--- a/libc/arch-aarch64/syscalls/getuid.S
+++ b/libc/arch-aarch64/syscalls/getuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/getxattr.S b/libc/arch-aarch64/syscalls/getxattr.S
index 2e5a303..11b90aa 100644
--- a/libc/arch-aarch64/syscalls/getxattr.S
+++ b/libc/arch-aarch64/syscalls/getxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(getxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/init_module.S b/libc/arch-aarch64/syscalls/init_module.S
index 79ab90d..8648b04 100644
--- a/libc/arch-aarch64/syscalls/init_module.S
+++ b/libc/arch-aarch64/syscalls/init_module.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(init_module)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_add_watch.S b/libc/arch-aarch64/syscalls/inotify_add_watch.S
index 0baac5d..583ab72 100644
--- a/libc/arch-aarch64/syscalls/inotify_add_watch.S
+++ b/libc/arch-aarch64/syscalls/inotify_add_watch.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(inotify_add_watch)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_init1.S b/libc/arch-aarch64/syscalls/inotify_init1.S
index b943136..3ee946e 100644
--- a/libc/arch-aarch64/syscalls/inotify_init1.S
+++ b/libc/arch-aarch64/syscalls/inotify_init1.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(inotify_init1)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/inotify_rm_watch.S b/libc/arch-aarch64/syscalls/inotify_rm_watch.S
index 10c7f56..3121b51 100644
--- a/libc/arch-aarch64/syscalls/inotify_rm_watch.S
+++ b/libc/arch-aarch64/syscalls/inotify_rm_watch.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(inotify_rm_watch)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ioprio_get.S b/libc/arch-aarch64/syscalls/ioprio_get.S
index 7bf536b..207a4e7 100644
--- a/libc/arch-aarch64/syscalls/ioprio_get.S
+++ b/libc/arch-aarch64/syscalls/ioprio_get.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(ioprio_get)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/ioprio_set.S b/libc/arch-aarch64/syscalls/ioprio_set.S
index be930b3..eb7b026 100644
--- a/libc/arch-aarch64/syscalls/ioprio_set.S
+++ b/libc/arch-aarch64/syscalls/ioprio_set.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(ioprio_set)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/kill.S b/libc/arch-aarch64/syscalls/kill.S
index afab1e3..3788df7 100644
--- a/libc/arch-aarch64/syscalls/kill.S
+++ b/libc/arch-aarch64/syscalls/kill.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(kill)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/klogctl.S b/libc/arch-aarch64/syscalls/klogctl.S
index 25fe415..efa8b4a 100644
--- a/libc/arch-aarch64/syscalls/klogctl.S
+++ b/libc/arch-aarch64/syscalls/klogctl.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(klogctl)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lgetxattr.S b/libc/arch-aarch64/syscalls/lgetxattr.S
index 5a2d610..1fda092 100644
--- a/libc/arch-aarch64/syscalls/lgetxattr.S
+++ b/libc/arch-aarch64/syscalls/lgetxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(lgetxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/linkat.S b/libc/arch-aarch64/syscalls/linkat.S
index a8fb0fd..999c007 100644
--- a/libc/arch-aarch64/syscalls/linkat.S
+++ b/libc/arch-aarch64/syscalls/linkat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(linkat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/listen.S b/libc/arch-aarch64/syscalls/listen.S
index a90faa4..8b7fa0f 100644
--- a/libc/arch-aarch64/syscalls/listen.S
+++ b/libc/arch-aarch64/syscalls/listen.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(listen)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/listxattr.S b/libc/arch-aarch64/syscalls/listxattr.S
index 972a9c4..cc399a9 100644
--- a/libc/arch-aarch64/syscalls/listxattr.S
+++ b/libc/arch-aarch64/syscalls/listxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(listxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/llistxattr.S b/libc/arch-aarch64/syscalls/llistxattr.S
index 28039d2..87bfe10 100644
--- a/libc/arch-aarch64/syscalls/llistxattr.S
+++ b/libc/arch-aarch64/syscalls/llistxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(llistxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lremovexattr.S b/libc/arch-aarch64/syscalls/lremovexattr.S
index 6ff1a16..ad823e4 100644
--- a/libc/arch-aarch64/syscalls/lremovexattr.S
+++ b/libc/arch-aarch64/syscalls/lremovexattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(lremovexattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lseek.S b/libc/arch-aarch64/syscalls/lseek.S
index f6ffba9..867bb71 100644
--- a/libc/arch-aarch64/syscalls/lseek.S
+++ b/libc/arch-aarch64/syscalls/lseek.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(lseek)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/lsetxattr.S b/libc/arch-aarch64/syscalls/lsetxattr.S
index 3be465b..683fc2b 100644
--- a/libc/arch-aarch64/syscalls/lsetxattr.S
+++ b/libc/arch-aarch64/syscalls/lsetxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(lsetxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/madvise.S b/libc/arch-aarch64/syscalls/madvise.S
index 7ec3596..8136ec9 100644
--- a/libc/arch-aarch64/syscalls/madvise.S
+++ b/libc/arch-aarch64/syscalls/madvise.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(madvise)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mincore.S b/libc/arch-aarch64/syscalls/mincore.S
index 9e9befe..8a8e5a5 100644
--- a/libc/arch-aarch64/syscalls/mincore.S
+++ b/libc/arch-aarch64/syscalls/mincore.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mincore)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mkdirat.S b/libc/arch-aarch64/syscalls/mkdirat.S
index bf1f2ae..b3dd838 100644
--- a/libc/arch-aarch64/syscalls/mkdirat.S
+++ b/libc/arch-aarch64/syscalls/mkdirat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mkdirat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mknodat.S b/libc/arch-aarch64/syscalls/mknodat.S
index 5aa907d..aca6786 100644
--- a/libc/arch-aarch64/syscalls/mknodat.S
+++ b/libc/arch-aarch64/syscalls/mknodat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mknodat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mlock.S b/libc/arch-aarch64/syscalls/mlock.S
index be463e6..bb01435 100644
--- a/libc/arch-aarch64/syscalls/mlock.S
+++ b/libc/arch-aarch64/syscalls/mlock.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mlock)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mlockall.S b/libc/arch-aarch64/syscalls/mlockall.S
index 75d1267..278e6d3 100644
--- a/libc/arch-aarch64/syscalls/mlockall.S
+++ b/libc/arch-aarch64/syscalls/mlockall.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mlockall)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mmap.S b/libc/arch-aarch64/syscalls/mmap.S
index d5b597b..d9abd41 100644
--- a/libc/arch-aarch64/syscalls/mmap.S
+++ b/libc/arch-aarch64/syscalls/mmap.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mmap)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mount.S b/libc/arch-aarch64/syscalls/mount.S
index 0dd0b71..d88a54b 100644
--- a/libc/arch-aarch64/syscalls/mount.S
+++ b/libc/arch-aarch64/syscalls/mount.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mount)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mprotect.S b/libc/arch-aarch64/syscalls/mprotect.S
index 0648c82..c8a2efe 100644
--- a/libc/arch-aarch64/syscalls/mprotect.S
+++ b/libc/arch-aarch64/syscalls/mprotect.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mprotect)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/mremap.S b/libc/arch-aarch64/syscalls/mremap.S
index 8f94e97..7c7fe5b 100644
--- a/libc/arch-aarch64/syscalls/mremap.S
+++ b/libc/arch-aarch64/syscalls/mremap.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(mremap)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/msync.S b/libc/arch-aarch64/syscalls/msync.S
index c11fc55..b45c99d 100644
--- a/libc/arch-aarch64/syscalls/msync.S
+++ b/libc/arch-aarch64/syscalls/msync.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(msync)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munlock.S b/libc/arch-aarch64/syscalls/munlock.S
index ec21f0d..d84b850 100644
--- a/libc/arch-aarch64/syscalls/munlock.S
+++ b/libc/arch-aarch64/syscalls/munlock.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(munlock)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munlockall.S b/libc/arch-aarch64/syscalls/munlockall.S
index a596573..e043f71 100644
--- a/libc/arch-aarch64/syscalls/munlockall.S
+++ b/libc/arch-aarch64/syscalls/munlockall.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(munlockall)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/munmap.S b/libc/arch-aarch64/syscalls/munmap.S
index 6f29fa4..02afbe8 100644
--- a/libc/arch-aarch64/syscalls/munmap.S
+++ b/libc/arch-aarch64/syscalls/munmap.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(munmap)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/nanosleep.S b/libc/arch-aarch64/syscalls/nanosleep.S
index e42b11d..8cd9a95 100644
--- a/libc/arch-aarch64/syscalls/nanosleep.S
+++ b/libc/arch-aarch64/syscalls/nanosleep.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(nanosleep)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/perf_event_open.S b/libc/arch-aarch64/syscalls/perf_event_open.S
index 165746f..3960264 100644
--- a/libc/arch-aarch64/syscalls/perf_event_open.S
+++ b/libc/arch-aarch64/syscalls/perf_event_open.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(perf_event_open)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/personality.S b/libc/arch-aarch64/syscalls/personality.S
index b718852..2535467 100644
--- a/libc/arch-aarch64/syscalls/personality.S
+++ b/libc/arch-aarch64/syscalls/personality.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(personality)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pipe2.S b/libc/arch-aarch64/syscalls/pipe2.S
index 8b643c7..f72e707 100644
--- a/libc/arch-aarch64/syscalls/pipe2.S
+++ b/libc/arch-aarch64/syscalls/pipe2.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(pipe2)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/prctl.S b/libc/arch-aarch64/syscalls/prctl.S
index faf2735..79b3e92 100644
--- a/libc/arch-aarch64/syscalls/prctl.S
+++ b/libc/arch-aarch64/syscalls/prctl.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(prctl)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pread64.S b/libc/arch-aarch64/syscalls/pread64.S
index 941e55f..0d098f1 100644
--- a/libc/arch-aarch64/syscalls/pread64.S
+++ b/libc/arch-aarch64/syscalls/pread64.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(pread64)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/pwrite64.S b/libc/arch-aarch64/syscalls/pwrite64.S
index 9700aa3..a10f76f 100644
--- a/libc/arch-aarch64/syscalls/pwrite64.S
+++ b/libc/arch-aarch64/syscalls/pwrite64.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(pwrite64)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/read.S b/libc/arch-aarch64/syscalls/read.S
index 475ab72..cf7ca04 100644
--- a/libc/arch-aarch64/syscalls/read.S
+++ b/libc/arch-aarch64/syscalls/read.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(read)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readahead.S b/libc/arch-aarch64/syscalls/readahead.S
index eb76fb5..fe45cf9 100644
--- a/libc/arch-aarch64/syscalls/readahead.S
+++ b/libc/arch-aarch64/syscalls/readahead.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(readahead)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readlinkat.S b/libc/arch-aarch64/syscalls/readlinkat.S
index 1ed5495..eb8221c 100644
--- a/libc/arch-aarch64/syscalls/readlinkat.S
+++ b/libc/arch-aarch64/syscalls/readlinkat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(readlinkat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/readv.S b/libc/arch-aarch64/syscalls/readv.S
index 7279a4c..f4fa612 100644
--- a/libc/arch-aarch64/syscalls/readv.S
+++ b/libc/arch-aarch64/syscalls/readv.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(readv)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/recvfrom.S b/libc/arch-aarch64/syscalls/recvfrom.S
index b0759a8..51ac25f 100644
--- a/libc/arch-aarch64/syscalls/recvfrom.S
+++ b/libc/arch-aarch64/syscalls/recvfrom.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(recvfrom)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/recvmsg.S b/libc/arch-aarch64/syscalls/recvmsg.S
index b40d927..4ca40ea 100644
--- a/libc/arch-aarch64/syscalls/recvmsg.S
+++ b/libc/arch-aarch64/syscalls/recvmsg.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(recvmsg)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/removexattr.S b/libc/arch-aarch64/syscalls/removexattr.S
index 3394cc6..ae53307 100644
--- a/libc/arch-aarch64/syscalls/removexattr.S
+++ b/libc/arch-aarch64/syscalls/removexattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(removexattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/renameat.S b/libc/arch-aarch64/syscalls/renameat.S
index 567c75a..3f6e4d4 100644
--- a/libc/arch-aarch64/syscalls/renameat.S
+++ b/libc/arch-aarch64/syscalls/renameat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(renameat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_max.S b/libc/arch-aarch64/syscalls/sched_get_priority_max.S
index 2e34080..735ca93 100644
--- a/libc/arch-aarch64/syscalls/sched_get_priority_max.S
+++ b/libc/arch-aarch64/syscalls/sched_get_priority_max.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_get_priority_max)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_get_priority_min.S b/libc/arch-aarch64/syscalls/sched_get_priority_min.S
index 3347aa5..a453b0b 100644
--- a/libc/arch-aarch64/syscalls/sched_get_priority_min.S
+++ b/libc/arch-aarch64/syscalls/sched_get_priority_min.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_get_priority_min)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_getparam.S b/libc/arch-aarch64/syscalls/sched_getparam.S
index 723a131..f3492b9 100644
--- a/libc/arch-aarch64/syscalls/sched_getparam.S
+++ b/libc/arch-aarch64/syscalls/sched_getparam.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_getparam)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_getscheduler.S b/libc/arch-aarch64/syscalls/sched_getscheduler.S
index fbaddc7..db944f1 100644
--- a/libc/arch-aarch64/syscalls/sched_getscheduler.S
+++ b/libc/arch-aarch64/syscalls/sched_getscheduler.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_getscheduler)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_rr_get_interval.S b/libc/arch-aarch64/syscalls/sched_rr_get_interval.S
index e2a4952..b91f646 100644
--- a/libc/arch-aarch64/syscalls/sched_rr_get_interval.S
+++ b/libc/arch-aarch64/syscalls/sched_rr_get_interval.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_rr_get_interval)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setaffinity.S b/libc/arch-aarch64/syscalls/sched_setaffinity.S
index 7c1aec7..e8e1aec 100644
--- a/libc/arch-aarch64/syscalls/sched_setaffinity.S
+++ b/libc/arch-aarch64/syscalls/sched_setaffinity.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_setaffinity)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setparam.S b/libc/arch-aarch64/syscalls/sched_setparam.S
index 309a07d..5df84f0 100644
--- a/libc/arch-aarch64/syscalls/sched_setparam.S
+++ b/libc/arch-aarch64/syscalls/sched_setparam.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_setparam)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_setscheduler.S b/libc/arch-aarch64/syscalls/sched_setscheduler.S
index 8a6d6fe..83c31e4 100644
--- a/libc/arch-aarch64/syscalls/sched_setscheduler.S
+++ b/libc/arch-aarch64/syscalls/sched_setscheduler.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_setscheduler)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sched_yield.S b/libc/arch-aarch64/syscalls/sched_yield.S
index a61979a..7d5f88b 100644
--- a/libc/arch-aarch64/syscalls/sched_yield.S
+++ b/libc/arch-aarch64/syscalls/sched_yield.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sched_yield)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendfile.S b/libc/arch-aarch64/syscalls/sendfile.S
index 9ae7a9a..e540296 100644
--- a/libc/arch-aarch64/syscalls/sendfile.S
+++ b/libc/arch-aarch64/syscalls/sendfile.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sendfile)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendmsg.S b/libc/arch-aarch64/syscalls/sendmsg.S
index bd33724..2f0cdc8 100644
--- a/libc/arch-aarch64/syscalls/sendmsg.S
+++ b/libc/arch-aarch64/syscalls/sendmsg.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sendmsg)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sendto.S b/libc/arch-aarch64/syscalls/sendto.S
index 44887e0..3fd54d1 100644
--- a/libc/arch-aarch64/syscalls/sendto.S
+++ b/libc/arch-aarch64/syscalls/sendto.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sendto)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setgid.S b/libc/arch-aarch64/syscalls/setgid.S
index fb78157..0a811b0 100644
--- a/libc/arch-aarch64/syscalls/setgid.S
+++ b/libc/arch-aarch64/syscalls/setgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setgroups.S b/libc/arch-aarch64/syscalls/setgroups.S
index 81d2b19..d316e5e 100644
--- a/libc/arch-aarch64/syscalls/setgroups.S
+++ b/libc/arch-aarch64/syscalls/setgroups.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setgroups)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setitimer.S b/libc/arch-aarch64/syscalls/setitimer.S
index aa0c0c2..7c2b718 100644
--- a/libc/arch-aarch64/syscalls/setitimer.S
+++ b/libc/arch-aarch64/syscalls/setitimer.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setitimer)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setpgid.S b/libc/arch-aarch64/syscalls/setpgid.S
index 6d14cd9..bd12e70 100644
--- a/libc/arch-aarch64/syscalls/setpgid.S
+++ b/libc/arch-aarch64/syscalls/setpgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setpgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setpriority.S b/libc/arch-aarch64/syscalls/setpriority.S
index 47da6b4..d9a4857 100644
--- a/libc/arch-aarch64/syscalls/setpriority.S
+++ b/libc/arch-aarch64/syscalls/setpriority.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setpriority)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setregid.S b/libc/arch-aarch64/syscalls/setregid.S
index d3e0f4b..702ae8b 100644
--- a/libc/arch-aarch64/syscalls/setregid.S
+++ b/libc/arch-aarch64/syscalls/setregid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setregid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setresgid.S b/libc/arch-aarch64/syscalls/setresgid.S
index 720b721..c9501ac 100644
--- a/libc/arch-aarch64/syscalls/setresgid.S
+++ b/libc/arch-aarch64/syscalls/setresgid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setresgid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setresuid.S b/libc/arch-aarch64/syscalls/setresuid.S
index e2eb626..6f680c3 100644
--- a/libc/arch-aarch64/syscalls/setresuid.S
+++ b/libc/arch-aarch64/syscalls/setresuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setresuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setreuid.S b/libc/arch-aarch64/syscalls/setreuid.S
index dc66ce8..ef870fa 100644
--- a/libc/arch-aarch64/syscalls/setreuid.S
+++ b/libc/arch-aarch64/syscalls/setreuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setreuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setrlimit.S b/libc/arch-aarch64/syscalls/setrlimit.S
index 57358ac..3591a84 100644
--- a/libc/arch-aarch64/syscalls/setrlimit.S
+++ b/libc/arch-aarch64/syscalls/setrlimit.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setrlimit)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setsid.S b/libc/arch-aarch64/syscalls/setsid.S
index 26d003a..c9ba594 100644
--- a/libc/arch-aarch64/syscalls/setsid.S
+++ b/libc/arch-aarch64/syscalls/setsid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setsid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setsockopt.S b/libc/arch-aarch64/syscalls/setsockopt.S
index d11f96b..7c9d584 100644
--- a/libc/arch-aarch64/syscalls/setsockopt.S
+++ b/libc/arch-aarch64/syscalls/setsockopt.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setsockopt)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/settimeofday.S b/libc/arch-aarch64/syscalls/settimeofday.S
index 180436d..4cf6ff2 100644
--- a/libc/arch-aarch64/syscalls/settimeofday.S
+++ b/libc/arch-aarch64/syscalls/settimeofday.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(settimeofday)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setuid.S b/libc/arch-aarch64/syscalls/setuid.S
index 7fafb4e..a886c15 100644
--- a/libc/arch-aarch64/syscalls/setuid.S
+++ b/libc/arch-aarch64/syscalls/setuid.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setuid)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/setxattr.S b/libc/arch-aarch64/syscalls/setxattr.S
index 40ad28f..1d25f3a 100644
--- a/libc/arch-aarch64/syscalls/setxattr.S
+++ b/libc/arch-aarch64/syscalls/setxattr.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(setxattr)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/shutdown.S b/libc/arch-aarch64/syscalls/shutdown.S
index 8136861..b9fc3c3 100644
--- a/libc/arch-aarch64/syscalls/shutdown.S
+++ b/libc/arch-aarch64/syscalls/shutdown.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(shutdown)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sigaltstack.S b/libc/arch-aarch64/syscalls/sigaltstack.S
index 62a9fb9..6052caa 100644
--- a/libc/arch-aarch64/syscalls/sigaltstack.S
+++ b/libc/arch-aarch64/syscalls/sigaltstack.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sigaltstack)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/signalfd4.S b/libc/arch-aarch64/syscalls/signalfd4.S
index 83644b8..7a8f7f7 100644
--- a/libc/arch-aarch64/syscalls/signalfd4.S
+++ b/libc/arch-aarch64/syscalls/signalfd4.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(signalfd4)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/socket.S b/libc/arch-aarch64/syscalls/socket.S
index 29e2299..37a3851 100644
--- a/libc/arch-aarch64/syscalls/socket.S
+++ b/libc/arch-aarch64/syscalls/socket.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(socket)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/socketpair.S b/libc/arch-aarch64/syscalls/socketpair.S
index 6e985c0..05e617b 100644
--- a/libc/arch-aarch64/syscalls/socketpair.S
+++ b/libc/arch-aarch64/syscalls/socketpair.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(socketpair)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/statfs.S b/libc/arch-aarch64/syscalls/statfs.S
index 1647e60..9bfae63 100644
--- a/libc/arch-aarch64/syscalls/statfs.S
+++ b/libc/arch-aarch64/syscalls/statfs.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(statfs)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/swapoff.S b/libc/arch-aarch64/syscalls/swapoff.S
index 60f9927..742b460 100644
--- a/libc/arch-aarch64/syscalls/swapoff.S
+++ b/libc/arch-aarch64/syscalls/swapoff.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(swapoff)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/swapon.S b/libc/arch-aarch64/syscalls/swapon.S
index 176ff58..b82d7de 100644
--- a/libc/arch-aarch64/syscalls/swapon.S
+++ b/libc/arch-aarch64/syscalls/swapon.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(swapon)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/symlinkat.S b/libc/arch-aarch64/syscalls/symlinkat.S
index 1e3c7f9..c6a8313 100644
--- a/libc/arch-aarch64/syscalls/symlinkat.S
+++ b/libc/arch-aarch64/syscalls/symlinkat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(symlinkat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sync.S b/libc/arch-aarch64/syscalls/sync.S
index 24b5690..1954fe8 100644
--- a/libc/arch-aarch64/syscalls/sync.S
+++ b/libc/arch-aarch64/syscalls/sync.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sync)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/sysinfo.S b/libc/arch-aarch64/syscalls/sysinfo.S
index 0bae446..cb91550 100644
--- a/libc/arch-aarch64/syscalls/sysinfo.S
+++ b/libc/arch-aarch64/syscalls/sysinfo.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(sysinfo)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/tgkill.S b/libc/arch-aarch64/syscalls/tgkill.S
index 1c382b2..a401819 100644
--- a/libc/arch-aarch64/syscalls/tgkill.S
+++ b/libc/arch-aarch64/syscalls/tgkill.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(tgkill)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_create.S b/libc/arch-aarch64/syscalls/timerfd_create.S
index a1cd44e..e0558be 100644
--- a/libc/arch-aarch64/syscalls/timerfd_create.S
+++ b/libc/arch-aarch64/syscalls/timerfd_create.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(timerfd_create)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_gettime.S b/libc/arch-aarch64/syscalls/timerfd_gettime.S
index c8c213d..09234cd 100644
--- a/libc/arch-aarch64/syscalls/timerfd_gettime.S
+++ b/libc/arch-aarch64/syscalls/timerfd_gettime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(timerfd_gettime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/timerfd_settime.S b/libc/arch-aarch64/syscalls/timerfd_settime.S
index 6963a09..cc205ad 100644
--- a/libc/arch-aarch64/syscalls/timerfd_settime.S
+++ b/libc/arch-aarch64/syscalls/timerfd_settime.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(timerfd_settime)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/times.S b/libc/arch-aarch64/syscalls/times.S
index dfd7db1..c5fe38b 100644
--- a/libc/arch-aarch64/syscalls/times.S
+++ b/libc/arch-aarch64/syscalls/times.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(times)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/tkill.S b/libc/arch-aarch64/syscalls/tkill.S
index 7e5e5bb..0b910fc 100644
--- a/libc/arch-aarch64/syscalls/tkill.S
+++ b/libc/arch-aarch64/syscalls/tkill.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(tkill)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/truncate.S b/libc/arch-aarch64/syscalls/truncate.S
index db5a2f3..f254c34 100644
--- a/libc/arch-aarch64/syscalls/truncate.S
+++ b/libc/arch-aarch64/syscalls/truncate.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(truncate)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/umask.S b/libc/arch-aarch64/syscalls/umask.S
index 16d48ac..70a3e01 100644
--- a/libc/arch-aarch64/syscalls/umask.S
+++ b/libc/arch-aarch64/syscalls/umask.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(umask)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/umount2.S b/libc/arch-aarch64/syscalls/umount2.S
index 0079e6d..cdd0362 100644
--- a/libc/arch-aarch64/syscalls/umount2.S
+++ b/libc/arch-aarch64/syscalls/umount2.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(umount2)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/uname.S b/libc/arch-aarch64/syscalls/uname.S
index 36b5cc8..c242786 100644
--- a/libc/arch-aarch64/syscalls/uname.S
+++ b/libc/arch-aarch64/syscalls/uname.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(uname)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/unlinkat.S b/libc/arch-aarch64/syscalls/unlinkat.S
index 3a7c78f..f7bb2c5 100644
--- a/libc/arch-aarch64/syscalls/unlinkat.S
+++ b/libc/arch-aarch64/syscalls/unlinkat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(unlinkat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/unshare.S b/libc/arch-aarch64/syscalls/unshare.S
index c69c7da..c9bd497 100644
--- a/libc/arch-aarch64/syscalls/unshare.S
+++ b/libc/arch-aarch64/syscalls/unshare.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(unshare)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/utimensat.S b/libc/arch-aarch64/syscalls/utimensat.S
index 83f1141..62c98a6 100644
--- a/libc/arch-aarch64/syscalls/utimensat.S
+++ b/libc/arch-aarch64/syscalls/utimensat.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(utimensat)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/wait4.S b/libc/arch-aarch64/syscalls/wait4.S
index cf723b3..7431535 100644
--- a/libc/arch-aarch64/syscalls/wait4.S
+++ b/libc/arch-aarch64/syscalls/wait4.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(wait4)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/write.S b/libc/arch-aarch64/syscalls/write.S
index 15b17c8..2f95f5d 100644
--- a/libc/arch-aarch64/syscalls/write.S
+++ b/libc/arch-aarch64/syscalls/write.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(write)
     stp     x29, x30, [sp, #-16]!
diff --git a/libc/arch-aarch64/syscalls/writev.S b/libc/arch-aarch64/syscalls/writev.S
index fe802af..015c1d3 100644
--- a/libc/arch-aarch64/syscalls/writev.S
+++ b/libc/arch-aarch64/syscalls/writev.S
@@ -1,8 +1,6 @@
 /* Generated by gensyscalls.py. Do not edit. */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(writev)
     stp     x29, x30, [sp, #-16]!