Use <asm/unistd.h> instead of <sys/syscall.h>

There are no users of SYS_* macros provided by <sys/syscall.h>,
and definitions of __NR_* macros could be obtained directly
from <asm/unistd.h>.

* defs.h: Include <asm/unistd.h> instead of <sys/syscall.h>.
* test/seccomp.c: Likewise.
* test/threaded_execve.c: Likewise.
* test/x32_lseek.c: Likewise.
* test/x32_mmap.c: Likewise.
* tests/_newselect.c: Likewise.
* tests/access.c: Likewise.
* tests/acct.c: Likewise.
* tests/aio.c: Likewise.
* tests/alarm.c: Likewise.
* tests/attach-f-p.c: Likewise.
* tests/bpf.c: Likewise.
* tests/brk.c: Likewise.
* tests/chmod.c: Likewise.
* tests/chown.c: Likewise.
* tests/chown32.c: Likewise.
* tests/chroot.c: Likewise.
* tests/clock_adjtime.c: Likewise.
* tests/clock_nanosleep.c: Likewise.
* tests/clock_xettime.c: Likewise.
* tests/copy_file_range.c: Likewise.
* tests/creat.c: Likewise.
* tests/dup2.c: Likewise.
* tests/dup3.c: Likewise.
* tests/epoll_create.c: Likewise.
* tests/epoll_create1.c: Likewise.
* tests/epoll_ctl.c: Likewise.
* tests/epoll_pwait.c: Likewise.
* tests/epoll_wait.c: Likewise.
* tests/eventfd.c: Likewise.
* tests/execveat.c: Likewise.
* tests/faccessat.c: Likewise.
* tests/fchdir.c: Likewise.
* tests/fchmod.c: Likewise.
* tests/fchmodat.c: Likewise.
* tests/fchown.c: Likewise.
* tests/fchown32.c: Likewise.
* tests/fchownat.c: Likewise.
* tests/fcntl.c: Likewise.
* tests/fcntl64.c: Likewise.
* tests/fdatasync.c: Likewise.
* tests/flock.c: Likewise.
* tests/fstat.c: Likewise.
* tests/fstat64.c: Likewise.
* tests/fstatat64.c: Likewise.
* tests/fstatfs.c: Likewise.
* tests/fstatfs64.c: Likewise.
* tests/fsync.c: Likewise.
* tests/ftruncate.c: Likewise.
* tests/ftruncate64.c: Likewise.
* tests/futimesat.c: Likewise.
* tests/get_mempolicy.c: Likewise.
* tests/getcwd.c: Likewise.
* tests/getdents.c: Likewise.
* tests/getdents64.c: Likewise.
* tests/getegid.c: Likewise.
* tests/getegid32.c: Likewise.
* tests/geteuid.c: Likewise.
* tests/geteuid32.c: Likewise.
* tests/getgid.c: Likewise.
* tests/getgid32.c: Likewise.
* tests/getgroups.c: Likewise.
* tests/getgroups32.c: Likewise.
* tests/getpgrp.c: Likewise.
* tests/getrandom.c: Likewise.
* tests/getresgid.c: Likewise.
* tests/getresgid32.c: Likewise.
* tests/getresuid.c: Likewise.
* tests/getresuid32.c: Likewise.
* tests/getrlimit.c: Likewise.
* tests/getrusage.c: Likewise.
* tests/getuid.c: Likewise.
* tests/getuid32.c: Likewise.
* tests/getxxid.c: Likewise.
* tests/ioctl_uffdio.c: Likewise.
* tests/ioperm.c: Likewise.
* tests/iopl.c: Likewise.
* tests/ipc.c: Likewise.
* tests/kill.c: Likewise.
* tests/lchown.c: Likewise.
* tests/lchown32.c: Likewise.
* tests/libmmsg.c: Likewise.
* tests/libsocketcall.c: Likewise.
* tests/link.c: Likewise.
* tests/linkat.c: Likewise.
* tests/llseek.c: Likewise.
* tests/lseek.c: Likewise.
* tests/lstat.c: Likewise.
* tests/lstat64.c: Likewise.
* tests/mbind.c: Likewise.
* tests/membarrier.c: Likewise.
* tests/memfd_create.c: Likewise.
* tests/migrate_pages.c: Likewise.
* tests/mkdir.c: Likewise.
* tests/mkdirat.c: Likewise.
* tests/mknod.c: Likewise.
* tests/mknodat.c: Likewise.
* tests/mlock.c: Likewise.
* tests/mlock2.c: Likewise.
* tests/move_pages.c: Likewise.
* tests/newfstatat.c: Likewise.
* tests/nsyscalls.c: Likewise.
* tests/old_mmap.c: Likewise.
* tests/oldselect.c: Likewise.
* tests/open.c: Likewise.
* tests/openat.c: Likewise.
* tests/pause.c: Likewise.
* tests/poll.c: Likewise.
* tests/prctl-seccomp-filter-v.c: Likewise.
* tests/prctl-seccomp-strict.c: Likewise.
* tests/preadv2-pwritev2.c: Likewise.
* tests/prlimit64.c: Likewise.
* tests/pselect6.c: Likewise.
* tests/ptrace.c: Likewise.
* tests/readdir.c: Likewise.
* tests/readlink.c: Likewise.
* tests/readlinkat.c: Likewise.
* tests/reboot.c: Likewise.
* tests/remap_file_pages.c: Likewise.
* tests/rename.c: Likewise.
* tests/renameat.c: Likewise.
* tests/renameat2.c: Likewise.
* tests/rmdir.c: Likewise.
* tests/rt_sigpending.c: Likewise.
* tests/rt_sigprocmask.c: Likewise.
* tests/rt_sigsuspend.c: Likewise.
* tests/rt_sigtimedwait.c: Likewise.
* tests/rt_tgsigqueueinfo.c: Likewise.
* tests/sched_get_priority_mxx.c: Likewise.
* tests/sched_rr_get_interval.c: Likewise.
* tests/sched_xetaffinity.c: Likewise.
* tests/sched_xetattr.c: Likewise.
* tests/sched_xetparam.c: Likewise.
* tests/sched_xetscheduler.c: Likewise.
* tests/sched_yield.c: Likewise.
* tests/seccomp-filter-v.c: Likewise.
* tests/seccomp-filter.c: Likewise.
* tests/seccomp-strict.c: Likewise.
* tests/select.c: Likewise.
* tests/sendfile.c: Likewise.
* tests/sendfile64.c: Likewise.
* tests/set_mempolicy.c: Likewise.
* tests/setdomainname.c: Likewise.
* tests/setfsgid.c: Likewise.
* tests/setfsgid32.c: Likewise.
* tests/setfsuid.c: Likewise.
* tests/setfsuid32.c: Likewise.
* tests/setgid.c: Likewise.
* tests/setgid32.c: Likewise.
* tests/setgroups.c: Likewise.
* tests/setgroups32.c: Likewise.
* tests/sethostname.c: Likewise.
* tests/setregid.c: Likewise.
* tests/setregid32.c: Likewise.
* tests/setresgid.c: Likewise.
* tests/setresgid32.c: Likewise.
* tests/setresuid.c: Likewise.
* tests/setresuid32.c: Likewise.
* tests/setreuid.c: Likewise.
* tests/setreuid32.c: Likewise.
* tests/setrlimit.c: Likewise.
* tests/setuid.c: Likewise.
* tests/setuid32.c: Likewise.
* tests/signalfd4.c: Likewise.
* tests/socketcall.c: Likewise.
* tests/splice.c: Likewise.
* tests/stat.c: Likewise.
* tests/stat64.c: Likewise.
* tests/statfs.c: Likewise.
* tests/statfs64.c: Likewise.
* tests/swap.c: Likewise.
* tests/symlink.c: Likewise.
* tests/symlinkat.c: Likewise.
* tests/sync.c: Likewise.
* tests/sync_file_range.c: Likewise.
* tests/sync_file_range2.c: Likewise.
* tests/syslog.c: Likewise.
* tests/tee.c: Likewise.
* tests/time.c: Likewise.
* tests/timer_create.c: Likewise.
* tests/timer_xettime.c: Likewise.
* tests/timerfd_xettime.c: Likewise.
* tests/times-fail.c: Likewise.
* tests/times.c: Likewise.
* tests/truncate.c: Likewise.
* tests/truncate64.c: Likewise.
* tests/ugetrlimit.c: Likewise.
* tests/umount.c: Likewise.
* tests/umount2.c: Likewise.
* tests/uname.c: Likewise.
* tests/unix-pair-send-recv.c: Likewise.
* tests/unlink.c: Likewise.
* tests/unlinkat.c: Likewise.
* tests/userfaultfd.c: Likewise.
* tests/utimes.c: Likewise.
* tests/vhangup.c: Likewise.
* tests/vmsplice.c: Likewise.
* tests/waitid.c: Likewise.
* tests/waitpid.c: Likewise.
* tests/xet_robust_list.c: Likewise.
* tests/xetpgid.c: Likewise.
* tests/xetpriority.c: Likewise.
* tests/xettimeofday.c: Likewise.

203 files changed, 203 insertions, 203 deletions

diff --git a/defs.h b/defs.h
index 1893ef50f..6f2a844e6 100644
--- a/defs.h
+++ b/defs.h
@@ -55,7 +55,7 @@
 #include <errno.h>
 #include <time.h>
 #include <sys/time.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #include "mpers_type.h"
 #include "gcc_compat.h"
diff --git a/test/seccomp.c b/test/seccomp.c
index b305d38b4..00e6cca5c 100644
--- a/test/seccomp.c
+++ b/test/seccomp.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/prctl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <linux/audit.h>
 #include <linux/filter.h>
 #include <linux/seccomp.h>
diff --git a/test/threaded_execve.c b/test/threaded_execve.c
index 4c21688c1..d1d22083c 100644
--- a/test/threaded_execve.c
+++ b/test/threaded_execve.c
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 /* Define clone2 for all arches */
 #ifdef __ia64__
diff --git a/test/x32_lseek.c b/test/x32_lseek.c
index 6faa2faab..f95b1a11a 100644
--- a/test/x32_lseek.c
+++ b/test/x32_lseek.c
@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 // Ensure we are compiling to 64 bits
 struct bug { int t[sizeof(long) > 4 ? 1 : -1]; };
 int main(int argc, char **argv)
diff --git a/test/x32_mmap.c b/test/x32_mmap.c
index cbef36d3f..f7f3ed345 100644
--- a/test/x32_mmap.c
+++ b/test/x32_mmap.c
@@ -15,7 +15,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 // Ensure we are compiling to 64 bits
 struct bug { int t[sizeof(long) > 4 ? 1 : -1]; };
 int main(int argc, char **argv)
diff --git a/tests/_newselect.c b/tests/_newselect.c
index be1672e7d..ae2bc51af 100644
--- a/tests/_newselect.c
+++ b/tests/_newselect.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR__newselect
 
diff --git a/tests/access.c b/tests/access.c
index 2920db504..e6f169b26 100644
--- a/tests/access.c
+++ b/tests/access.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_access
 
diff --git a/tests/acct.c b/tests/acct.c
index ef11b0bca..1cc3fa56e 100644
--- a/tests/acct.c
+++ b/tests/acct.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_acct
 
diff --git a/tests/aio.c b/tests/aio.c
index ab259f4fe..a6a3b9cd7 100644
--- a/tests/aio.c
+++ b/tests/aio.c
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_io_setup \
  && defined __NR_io_submit \
diff --git a/tests/alarm.c b/tests/alarm.c
index fc10b66de..f954dcf3b 100644
--- a/tests/alarm.c
+++ b/tests/alarm.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_alarm
 
diff --git a/tests/attach-f-p.c b/tests/attach-f-p.c
index 8a733d055..c75deb6fa 100644
--- a/tests/attach-f-p.c
+++ b/tests/attach-f-p.c
@@ -33,7 +33,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <unistd.h>
 
 #define N 3
diff --git a/tests/bpf.c b/tests/bpf.c
index d9b05e5de..5a1fcdc7d 100644
--- a/tests/bpf.c
+++ b/tests/bpf.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined HAVE_UNION_BPF_ATTR_LOG_BUF && defined __NR_bpf
 # include <linux/bpf.h>
diff --git a/tests/brk.c b/tests/brk.c
index ed311aad6..572ebd61f 100644
--- a/tests/brk.c
+++ b/tests/brk.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_brk
 
diff --git a/tests/chmod.c b/tests/chmod.c
index 056101c3d..936acc952 100644
--- a/tests/chmod.c
+++ b/tests/chmod.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_chmod
 
diff --git a/tests/chown.c b/tests/chown.c
index 59a4d6353..12aa8b71b 100644
--- a/tests/chown.c
+++ b/tests/chown.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_chown
 
diff --git a/tests/chown32.c b/tests/chown32.c
index 5e590a80c..4fffd7699 100644
--- a/tests/chown32.c
+++ b/tests/chown32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_chown32
 
diff --git a/tests/chroot.c b/tests/chroot.c
index fb9548c70..a084cf337 100644
--- a/tests/chroot.c
+++ b/tests/chroot.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_chroot
 
diff --git a/tests/clock_adjtime.c b/tests/clock_adjtime.c
index 93c58b7bf..01089b544 100644
--- a/tests/clock_adjtime.c
+++ b/tests/clock_adjtime.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_clock_adjtime
 
diff --git a/tests/clock_nanosleep.c b/tests/clock_nanosleep.c
index b1c423a97..d9b68fd62 100644
--- a/tests/clock_nanosleep.c
+++ b/tests/clock_nanosleep.c
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 static void
 handler(int signo)
diff --git a/tests/clock_xettime.c b/tests/clock_xettime.c
index 633351a0e..04dddf680 100644
--- a/tests/clock_xettime.c
+++ b/tests/clock_xettime.c
@@ -30,7 +30,7 @@
 #include <stdint.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_clock_getres \
  && defined __NR_clock_gettime \
diff --git a/tests/copy_file_range.c b/tests/copy_file_range.c
index 0e563d6f3..f3ec5b4a2 100644
--- a/tests/copy_file_range.c
+++ b/tests/copy_file_range.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_copy_file_range
 
diff --git a/tests/creat.c b/tests/creat.c
index 89fcef9b0..f22fdaaa4 100644
--- a/tests/creat.c
+++ b/tests/creat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_creat
 
diff --git a/tests/dup2.c b/tests/dup2.c
index 70d8f3e59..04a261c42 100644
--- a/tests/dup2.c
+++ b/tests/dup2.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_dup2
 
diff --git a/tests/dup3.c b/tests/dup3.c
index 884331a24..2611dd8c3 100644
--- a/tests/dup3.c
+++ b/tests/dup3.c
@@ -1,6 +1,6 @@
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_dup3 && defined O_CLOEXEC
 
diff --git a/tests/epoll_create.c b/tests/epoll_create.c
index 4be06c435..1f2485239 100644
--- a/tests/epoll_create.c
+++ b/tests/epoll_create.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_epoll_create
 
diff --git a/tests/epoll_create1.c b/tests/epoll_create1.c
index d3484924d..1c196eac8 100644
--- a/tests/epoll_create1.c
+++ b/tests/epoll_create1.c
@@ -27,7 +27,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_epoll_create1 && defined O_CLOEXEC
 
diff --git a/tests/epoll_ctl.c b/tests/epoll_ctl.c
index 231e2710b..8b46f4e3a 100644
--- a/tests/epoll_ctl.c
+++ b/tests/epoll_ctl.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_epoll_ctl
 
diff --git a/tests/epoll_pwait.c b/tests/epoll_pwait.c
index acd4218c8..27337eceb 100644
--- a/tests/epoll_pwait.c
+++ b/tests/epoll_pwait.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_epoll_pwait
 
diff --git a/tests/epoll_wait.c b/tests/epoll_wait.c
index c2eb563bb..038bf1f78 100644
--- a/tests/epoll_wait.c
+++ b/tests/epoll_wait.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_epoll_wait
 
diff --git a/tests/eventfd.c b/tests/eventfd.c
index 8b08443c9..d6ad6492e 100644
--- a/tests/eventfd.c
+++ b/tests/eventfd.c
@@ -28,7 +28,7 @@
 #include "tests.h"
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_eventfd2 && defined O_CLOEXEC
 
diff --git a/tests/execveat.c b/tests/execveat.c
index 972fc1731..bc2a95128 100644
--- a/tests/execveat.c
+++ b/tests/execveat.c
@@ -30,7 +30,7 @@
 #include "tests.h"
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_execveat
 
diff --git a/tests/faccessat.c b/tests/faccessat.c
index 06a6ae369..c21039d6b 100644
--- a/tests/faccessat.c
+++ b/tests/faccessat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_faccessat
 
diff --git a/tests/fchdir.c b/tests/fchdir.c
index 7306d4d09..580887212 100644
--- a/tests/fchdir.c
+++ b/tests/fchdir.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fchdir
 
diff --git a/tests/fchmod.c b/tests/fchmod.c
index 57fefa107..588856121 100644
--- a/tests/fchmod.c
+++ b/tests/fchmod.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_fchmod
 
diff --git a/tests/fchmodat.c b/tests/fchmodat.c
index 2ae613e7b..b49830dc3 100644
--- a/tests/fchmodat.c
+++ b/tests/fchmodat.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fchmodat
 
diff --git a/tests/fchown.c b/tests/fchown.c
index 53a522e9d..d71190320 100644
--- a/tests/fchown.c
+++ b/tests/fchown.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fchown
 
diff --git a/tests/fchown32.c b/tests/fchown32.c
index 0927b5697..2d9d60f8f 100644
--- a/tests/fchown32.c
+++ b/tests/fchown32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fchown32
 
diff --git a/tests/fchownat.c b/tests/fchownat.c
index 9a0ecc84a..4917fa965 100644
--- a/tests/fchownat.c
+++ b/tests/fchownat.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <fcntl.h>
 
 #if defined __NR_fchownat && defined AT_FDCWD && defined AT_SYMLINK_NOFOLLOW
diff --git a/tests/fcntl.c b/tests/fcntl.c
index 1ea83e148..08bac6601 100644
--- a/tests/fcntl.c
+++ b/tests/fcntl.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fcntl
 
diff --git a/tests/fcntl64.c b/tests/fcntl64.c
index b83a098d4..ff6a5315b 100644
--- a/tests/fcntl64.c
+++ b/tests/fcntl64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fcntl64
 
diff --git a/tests/fdatasync.c b/tests/fdatasync.c
index 86f1cfaf7..c47a0bfbe 100644
--- a/tests/fdatasync.c
+++ b/tests/fdatasync.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fdatasync
 
diff --git a/tests/flock.c b/tests/flock.c
index d6e20089e..cb231d53e 100644
--- a/tests/flock.c
+++ b/tests/flock.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_flock
 
diff --git a/tests/fstat.c b/tests/fstat.c
index 0206c9fd2..9ddc81185 100644
--- a/tests/fstat.c
+++ b/tests/fstat.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fstat
 
diff --git a/tests/fstat64.c b/tests/fstat64.c
index 59c94a2c8..0a69e3219 100644
--- a/tests/fstat64.c
+++ b/tests/fstat64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fstat64
 
diff --git a/tests/fstatat64.c b/tests/fstatat64.c
index 1bf95c101..fa8992df5 100644
--- a/tests/fstatat64.c
+++ b/tests/fstatat64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fstatat64
 
diff --git a/tests/fstatfs.c b/tests/fstatfs.c
index 7ff39dcfc..9e68c8d36 100644
--- a/tests/fstatfs.c
+++ b/tests/fstatfs.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fstatfs
 
diff --git a/tests/fstatfs64.c b/tests/fstatfs64.c
index 6c599744a..afc54aa92 100644
--- a/tests/fstatfs64.c
+++ b/tests/fstatfs64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fstatfs64
 
diff --git a/tests/fsync.c b/tests/fsync.c
index 911c16757..42aa5c734 100644
--- a/tests/fsync.c
+++ b/tests/fsync.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_fsync
 
diff --git a/tests/ftruncate.c b/tests/ftruncate.c
index db8388bcc..315f7bf12 100644
--- a/tests/ftruncate.c
+++ b/tests/ftruncate.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_ftruncate
 
diff --git a/tests/ftruncate64.c b/tests/ftruncate64.c
index 0b13eaff1..7530e7070 100644
--- a/tests/ftruncate64.c
+++ b/tests/ftruncate64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_ftruncate64
 
diff --git a/tests/futimesat.c b/tests/futimesat.c
index 785c894ef..4e76cc8a3 100644
--- a/tests/futimesat.c
+++ b/tests/futimesat.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_futimesat
 
diff --git a/tests/get_mempolicy.c b/tests/get_mempolicy.c
index 6923a2169..6be3ef29d 100644
--- a/tests/get_mempolicy.c
+++ b/tests/get_mempolicy.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_get_mempolicy
 
diff --git a/tests/getcwd.c b/tests/getcwd.c
index 3135df227..704a3157d 100644
--- a/tests/getcwd.c
+++ b/tests/getcwd.c
@@ -1,6 +1,6 @@
 #include "tests.h"
 
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getcwd
 
diff --git a/tests/getdents.c b/tests/getdents.c
index 7ea2067fe..5e642340f 100644
--- a/tests/getdents.c
+++ b/tests/getdents.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getdents
 
diff --git a/tests/getdents64.c b/tests/getdents64.c
index 54149d21d..2243b8420 100644
--- a/tests/getdents64.c
+++ b/tests/getdents64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getdents64
 
diff --git a/tests/getegid.c b/tests/getegid.c
index 31e4b444e..98f8b9cbe 100644
--- a/tests/getegid.c
+++ b/tests/getegid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getegid
 
diff --git a/tests/getegid32.c b/tests/getegid32.c
index 7dc358a4c..d9951864b 100644
--- a/tests/getegid32.c
+++ b/tests/getegid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getegid32
 
diff --git a/tests/geteuid.c b/tests/geteuid.c
index 082065648..ef8269f97 100644
--- a/tests/geteuid.c
+++ b/tests/geteuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_geteuid
 
diff --git a/tests/geteuid32.c b/tests/geteuid32.c
index 7e731d060..4341e46f3 100644
--- a/tests/geteuid32.c
+++ b/tests/geteuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_geteuid32
 
diff --git a/tests/getgid.c b/tests/getgid.c
index 46969d36e..2e060390e 100644
--- a/tests/getgid.c
+++ b/tests/getgid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getgid
 
diff --git a/tests/getgid32.c b/tests/getgid32.c
index 11580d0a3..52e4d76a0 100644
--- a/tests/getgid32.c
+++ b/tests/getgid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getgid32
 
diff --git a/tests/getgroups.c b/tests/getgroups.c
index d70689c78..8887161d8 100644
--- a/tests/getgroups.c
+++ b/tests/getgroups.c
@@ -36,7 +36,7 @@
 #else
 
 # include "tests.h"
-# include <sys/syscall.h>
+# include <asm/unistd.h>
 
 # ifdef __NR_getgroups
 
diff --git a/tests/getgroups32.c b/tests/getgroups32.c
index 2576548b6..d0a356de1 100644
--- a/tests/getgroups32.c
+++ b/tests/getgroups32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getgroups32
 
diff --git a/tests/getpgrp.c b/tests/getpgrp.c
index fd3139b53..8b9d08827 100644
--- a/tests/getpgrp.c
+++ b/tests/getpgrp.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getpgrp
 
diff --git a/tests/getrandom.c b/tests/getrandom.c
index 4c17c293a..de1a0874e 100644
--- a/tests/getrandom.c
+++ b/tests/getrandom.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getrandom
 
diff --git a/tests/getresgid.c b/tests/getresgid.c
index 5827cddf8..b8c687b1c 100644
--- a/tests/getresgid.c
+++ b/tests/getresgid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getresgid
 
diff --git a/tests/getresgid32.c b/tests/getresgid32.c
index ca337d8a0..71f11344d 100644
--- a/tests/getresgid32.c
+++ b/tests/getresgid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getresgid32
 
diff --git a/tests/getresuid.c b/tests/getresuid.c
index bf4ada177..b00f20ba4 100644
--- a/tests/getresuid.c
+++ b/tests/getresuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getresuid
 
diff --git a/tests/getresuid32.c b/tests/getresuid32.c
index 3154e27a8..4c9a83df5 100644
--- a/tests/getresuid32.c
+++ b/tests/getresuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getresuid32
 
diff --git a/tests/getrlimit.c b/tests/getrlimit.c
index 9fb668dc6..bd9d0b0f2 100644
--- a/tests/getrlimit.c
+++ b/tests/getrlimit.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getrlimit
 
diff --git a/tests/getrusage.c b/tests/getrusage.c
index 7fd982379..3c09aa6e0 100644
--- a/tests/getrusage.c
+++ b/tests/getrusage.c
@@ -27,7 +27,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getrusage
 
diff --git a/tests/getuid.c b/tests/getuid.c
index 25731c8b2..57311f72d 100644
--- a/tests/getuid.c
+++ b/tests/getuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getuid
 
diff --git a/tests/getuid32.c b/tests/getuid32.c
index c6f68ae07..397dd08ff 100644
--- a/tests/getuid32.c
+++ b/tests/getuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_getuid32
 
diff --git a/tests/getxxid.c b/tests/getxxid.c
index 1f2076c27..6eee52c52 100644
--- a/tests/getxxid.c
+++ b/tests/getxxid.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_getxpid && defined __NR_getxuid && defined __NR_getxgid
 
diff --git a/tests/ioctl_uffdio.c b/tests/ioctl_uffdio.c
index 73a8a9943..10b8b843f 100644
--- a/tests/ioctl_uffdio.c
+++ b/tests/ioctl_uffdio.c
@@ -27,7 +27,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_userfaultfd && defined HAVE_LINUX_USERFAULTFD_H
 
diff --git a/tests/ioperm.c b/tests/ioperm.c
index f39bdf0d0..12342f307 100644
--- a/tests/ioperm.c
+++ b/tests/ioperm.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_ioperm
 
diff --git a/tests/iopl.c b/tests/iopl.c
index b547f3c3e..14ec29e30 100644
--- a/tests/iopl.c
+++ b/tests/iopl.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_iopl
 
diff --git a/tests/ipc.c b/tests/ipc.c
index d33a09f5c..f5b9ef5f7 100644
--- a/tests/ipc.c
+++ b/tests/ipc.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_ipc && defined HAVE_LINUX_IPC_H
 
diff --git a/tests/kill.c b/tests/kill.c
index 0755d68e4..0e07e1f52 100644
--- a/tests/kill.c
+++ b/tests/kill.c
@@ -29,7 +29,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_kill
 
diff --git a/tests/lchown.c b/tests/lchown.c
index a11690181..a07c878c0 100644
--- a/tests/lchown.c
+++ b/tests/lchown.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_lchown
 
diff --git a/tests/lchown32.c b/tests/lchown32.c
index ff5ad3e8f..29cb01dba 100644
--- a/tests/lchown32.c
+++ b/tests/lchown32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_lchown32
 
diff --git a/tests/libmmsg.c b/tests/libmmsg.c
index 07feb7c5d..b0db26d22 100644
--- a/tests/libmmsg.c
+++ b/tests/libmmsg.c
@@ -29,7 +29,7 @@
 
 #include "tests.h"
 #include <errno.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifndef __NR_recvmmsg
 # define __NR_recvmmsg -1
diff --git a/tests/libsocketcall.c b/tests/libsocketcall.c
index 718b50e1e..04d6710f8 100644
--- a/tests/libsocketcall.c
+++ b/tests/libsocketcall.c
@@ -30,7 +30,7 @@
 #include "tests.h"
 #include <errno.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 /*
  * Invoke a socket syscall, either directly or via __NR_socketcall.
diff --git a/tests/link.c b/tests/link.c
index 4b84e4165..d6550fd3a 100644
--- a/tests/link.c
+++ b/tests/link.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_link
 
diff --git a/tests/linkat.c b/tests/linkat.c
index 06d550ed7..2c3b8baa1 100644
--- a/tests/linkat.c
+++ b/tests/linkat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_linkat
 
diff --git a/tests/llseek.c b/tests/llseek.c
index e82535a04..e687e947a 100644
--- a/tests/llseek.c
+++ b/tests/llseek.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR__llseek
 
diff --git a/tests/lseek.c b/tests/lseek.c
index e5efaa3b7..84b27529a 100644
--- a/tests/lseek.c
+++ b/tests/lseek.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_lseek
 
diff --git a/tests/lstat.c b/tests/lstat.c
index 663b638a2..76cb8a2f8 100644
--- a/tests/lstat.c
+++ b/tests/lstat.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_lstat
 
diff --git a/tests/lstat64.c b/tests/lstat64.c
index 4a1858bfe..c6f131936 100644
--- a/tests/lstat64.c
+++ b/tests/lstat64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_lstat64
 
diff --git a/tests/mbind.c b/tests/mbind.c
index b0f044d9f..94d455392 100644
--- a/tests/mbind.c
+++ b/tests/mbind.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mbind
 
diff --git a/tests/membarrier.c b/tests/membarrier.c
index 7364d0fd1..adf24efdc 100644
--- a/tests/membarrier.c
+++ b/tests/membarrier.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_membarrier
 
diff --git a/tests/memfd_create.c b/tests/memfd_create.c
index 2b1bd026e..ef49bed15 100644
--- a/tests/memfd_create.c
+++ b/tests/memfd_create.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_memfd_create
 
diff --git a/tests/migrate_pages.c b/tests/migrate_pages.c
index 995723cc0..9f71b52c6 100644
--- a/tests/migrate_pages.c
+++ b/tests/migrate_pages.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_migrate_pages
 
diff --git a/tests/mkdir.c b/tests/mkdir.c
index 79fe94f12..d971b1884 100644
--- a/tests/mkdir.c
+++ b/tests/mkdir.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mkdir
 
diff --git a/tests/mkdirat.c b/tests/mkdirat.c
index fc2732d0e..ce2e9c180 100644
--- a/tests/mkdirat.c
+++ b/tests/mkdirat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mkdirat
 
diff --git a/tests/mknod.c b/tests/mknod.c
index 4847f32ab..98712e196 100644
--- a/tests/mknod.c
+++ b/tests/mknod.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mknod
 
diff --git a/tests/mknodat.c b/tests/mknodat.c
index 991bc4b2f..a50e81320 100644
--- a/tests/mknodat.c
+++ b/tests/mknodat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mknodat
 
diff --git a/tests/mlock.c b/tests/mlock.c
index a56dc1f4b..a47879a75 100644
--- a/tests/mlock.c
+++ b/tests/mlock.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_mlock && defined __NR_munlock
 
diff --git a/tests/mlock2.c b/tests/mlock2.c
index af6391711..217afd40a 100644
--- a/tests/mlock2.c
+++ b/tests/mlock2.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_mlock2
 
diff --git a/tests/move_pages.c b/tests/move_pages.c
index 1059366cb..a5818b0b8 100644
--- a/tests/move_pages.c
+++ b/tests/move_pages.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_move_pages
 
diff --git a/tests/newfstatat.c b/tests/newfstatat.c
index 6fb34db1c..b501d880d 100644
--- a/tests/newfstatat.c
+++ b/tests/newfstatat.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_newfstatat
 
diff --git a/tests/nsyscalls.c b/tests/nsyscalls.c
index 3d5d9732d..8e09acb92 100644
--- a/tests/nsyscalls.c
+++ b/tests/nsyscalls.c
@@ -48,7 +48,7 @@ static const struct_sysent syscallent[] = {
 #include "syscallent.h"
 };
 
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __X32_SYSCALL_BIT && defined __NR_read \
  && (__X32_SYSCALL_BIT & __NR_read) != 0
diff --git a/tests/old_mmap.c b/tests/old_mmap.c
index 97051db9b..de1bafb36 100644
--- a/tests/old_mmap.c
+++ b/tests/old_mmap.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 /*
  * On s390x, this is the mmap syscall used by glibc, so,
diff --git a/tests/oldselect.c b/tests/oldselect.c
index b8f265aae..7413fc336 100644
--- a/tests/oldselect.c
+++ b/tests/oldselect.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_select && defined __NR__newselect \
  && __NR_select != __NR__newselect \
diff --git a/tests/open.c b/tests/open.c
index 726b1ec2a..6e26cbe68 100644
--- a/tests/open.c
+++ b/tests/open.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_open
 
diff --git a/tests/openat.c b/tests/openat.c
index a3de1dd70..3bd6b0004 100644
--- a/tests/openat.c
+++ b/tests/openat.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_openat
 
diff --git a/tests/pause.c b/tests/pause.c
index 6dadd1515..7f6d566c2 100644
--- a/tests/pause.c
+++ b/tests/pause.c
@@ -29,7 +29,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_pause
 
diff --git a/tests/poll.c b/tests/poll.c
index 551e9b44d..c47c97e51 100644
--- a/tests/poll.c
+++ b/tests/poll.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_poll
 
diff --git a/tests/prctl-seccomp-filter-v.c b/tests/prctl-seccomp-filter-v.c
index a03f202a0..69316fbed 100644
--- a/tests/prctl-seccomp-filter-v.c
+++ b/tests/prctl-seccomp-filter-v.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef HAVE_PRCTL
 # include <sys/prctl.h>
diff --git a/tests/prctl-seccomp-strict.c b/tests/prctl-seccomp-strict.c
index 57387c9b8..a78f81736 100644
--- a/tests/prctl-seccomp-strict.c
+++ b/tests/prctl-seccomp-strict.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #ifdef HAVE_PRCTL
 # include <sys/prctl.h>
 #endif
diff --git a/tests/preadv2-pwritev2.c b/tests/preadv2-pwritev2.c
index 1a607c991..032ac0354 100644
--- a/tests/preadv2-pwritev2.c
+++ b/tests/preadv2-pwritev2.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_preadv2 && defined __NR_pwritev2
 
diff --git a/tests/prlimit64.c b/tests/prlimit64.c
index 6721d4905..e62ea2611 100644
--- a/tests/prlimit64.c
+++ b/tests/prlimit64.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_prlimit64
 
diff --git a/tests/pselect6.c b/tests/pselect6.c
index 49258a9ca..7dbc06a9d 100644
--- a/tests/pselect6.c
+++ b/tests/pselect6.c
@@ -35,7 +35,7 @@
 #include <signal.h>
 #include <unistd.h>
 #include <sys/select.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <sys/time.h>
 
 #ifdef __NR_pselect6
diff --git a/tests/ptrace.c b/tests/ptrace.c
index 7971b8941..c898210b5 100644
--- a/tests/ptrace.c
+++ b/tests/ptrace.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_sigprocmask
 
diff --git a/tests/readdir.c b/tests/readdir.c
index 85170aa43..8c4836200 100644
--- a/tests/readdir.c
+++ b/tests/readdir.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_readdir
 
diff --git a/tests/readlink.c b/tests/readlink.c
index 85777e42f..4ddf5fac3 100644
--- a/tests/readlink.c
+++ b/tests/readlink.c
@@ -27,7 +27,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_readlink
 
diff --git a/tests/readlinkat.c b/tests/readlinkat.c
index 5ca9e72e0..4d3b516cb 100644
--- a/tests/readlinkat.c
+++ b/tests/readlinkat.c
@@ -27,7 +27,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_readlinkat
 
diff --git a/tests/reboot.c b/tests/reboot.c
index eedc2a697..9b09e647e 100644
--- a/tests/reboot.c
+++ b/tests/reboot.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_reboot
 
diff --git a/tests/remap_file_pages.c b/tests/remap_file_pages.c
index 8aa099ea3..9298f2898 100644
--- a/tests/remap_file_pages.c
+++ b/tests/remap_file_pages.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_remap_file_pages
 
diff --git a/tests/rename.c b/tests/rename.c
index a2a9209ef..2a2a4e01e 100644
--- a/tests/rename.c
+++ b/tests/rename.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rename
 
diff --git a/tests/renameat.c b/tests/renameat.c
index da38f2308..d20157896 100644
--- a/tests/renameat.c
+++ b/tests/renameat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_renameat
 
diff --git a/tests/renameat2.c b/tests/renameat2.c
index 28a1b5ba2..ea5718513 100644
--- a/tests/renameat2.c
+++ b/tests/renameat2.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_renameat2
 
diff --git a/tests/rmdir.c b/tests/rmdir.c
index e5a7f1d18..20952d84d 100644
--- a/tests/rmdir.c
+++ b/tests/rmdir.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rmdir
 
diff --git a/tests/rt_sigpending.c b/tests/rt_sigpending.c
index a6381cd8b..accf69134 100644
--- a/tests/rt_sigpending.c
+++ b/tests/rt_sigpending.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_sigpending
 
diff --git a/tests/rt_sigprocmask.c b/tests/rt_sigprocmask.c
index ab92cde3d..27e357fab 100644
--- a/tests/rt_sigprocmask.c
+++ b/tests/rt_sigprocmask.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_sigprocmask
 
diff --git a/tests/rt_sigsuspend.c b/tests/rt_sigsuspend.c
index b96a8c9b0..73e133646 100644
--- a/tests/rt_sigsuspend.c
+++ b/tests/rt_sigsuspend.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_sigsuspend
 
diff --git a/tests/rt_sigtimedwait.c b/tests/rt_sigtimedwait.c
index 6136b7cc4..ee6d3b997 100644
--- a/tests/rt_sigtimedwait.c
+++ b/tests/rt_sigtimedwait.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_sigtimedwait
 
diff --git a/tests/rt_tgsigqueueinfo.c b/tests/rt_tgsigqueueinfo.c
index 0926fb1f0..3796b51ca 100644
--- a/tests/rt_tgsigqueueinfo.c
+++ b/tests/rt_tgsigqueueinfo.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_rt_tgsigqueueinfo
 
diff --git a/tests/sched_get_priority_mxx.c b/tests/sched_get_priority_mxx.c
index 714531745..fc14b27c6 100644
--- a/tests/sched_get_priority_mxx.c
+++ b/tests/sched_get_priority_mxx.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined(__NR_sched_get_priority_min) \
  && defined(__NR_sched_get_priority_max)
diff --git a/tests/sched_rr_get_interval.c b/tests/sched_rr_get_interval.c
index dd069e279..850134698 100644
--- a/tests/sched_rr_get_interval.c
+++ b/tests/sched_rr_get_interval.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sched_rr_get_interval
 
diff --git a/tests/sched_xetaffinity.c b/tests/sched_xetaffinity.c
index 8851a4afc..195f3af02 100644
--- a/tests/sched_xetaffinity.c
+++ b/tests/sched_xetaffinity.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <sched.h>
 
 #if defined __NR_sched_getaffinity && defined __NR_sched_setaffinity \
diff --git a/tests/sched_xetattr.c b/tests/sched_xetattr.c
index c06e9b26c..b437b0441 100644
--- a/tests/sched_xetattr.c
+++ b/tests/sched_xetattr.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_sched_getattr && defined __NR_sched_setattr
 
diff --git a/tests/sched_xetparam.c b/tests/sched_xetparam.c
index cb3081880..e761a9d0e 100644
--- a/tests/sched_xetparam.c
+++ b/tests/sched_xetparam.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_sched_getparam && defined __NR_sched_setparam
 
diff --git a/tests/sched_xetscheduler.c b/tests/sched_xetscheduler.c
index f86adfa25..d3b775990 100644
--- a/tests/sched_xetscheduler.c
+++ b/tests/sched_xetscheduler.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_sched_getscheduler && defined __NR_sched_setscheduler
 
diff --git a/tests/sched_yield.c b/tests/sched_yield.c
index ed25722b0..355e7e8da 100644
--- a/tests/sched_yield.c
+++ b/tests/sched_yield.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sched_yield
 
diff --git a/tests/seccomp-filter-v.c b/tests/seccomp-filter-v.c
index ef69c0dca..dbf686d14 100644
--- a/tests/seccomp-filter-v.c
+++ b/tests/seccomp-filter-v.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <unistd.h>
 
 #ifdef HAVE_PRCTL
diff --git a/tests/seccomp-filter.c b/tests/seccomp-filter.c
index 0326f6e92..d4d76dd35 100644
--- a/tests/seccomp-filter.c
+++ b/tests/seccomp-filter.c
@@ -30,7 +30,7 @@
 #include "tests.h"
 
 #include <stdio.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <unistd.h>
 
 #ifdef HAVE_LINUX_SECCOMP_H
diff --git a/tests/seccomp-strict.c b/tests/seccomp-strict.c
index c145567ff..47d909d5a 100644
--- a/tests/seccomp-strict.c
+++ b/tests/seccomp-strict.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_seccomp && defined __NR_exit
 
diff --git a/tests/select.c b/tests/select.c
index fa551a689..b5ff259d3 100644
--- a/tests/select.c
+++ b/tests/select.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_select && !defined __NR__newselect
 
diff --git a/tests/sendfile.c b/tests/sendfile.c
index b1c75743c..61f9212f2 100644
--- a/tests/sendfile.c
+++ b/tests/sendfile.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sendfile
 
diff --git a/tests/sendfile64.c b/tests/sendfile64.c
index 7c4a6f5fd..f757963e8 100644
--- a/tests/sendfile64.c
+++ b/tests/sendfile64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sendfile64
 
diff --git a/tests/set_mempolicy.c b/tests/set_mempolicy.c
index e59e89fd5..c7364bd71 100644
--- a/tests/set_mempolicy.c
+++ b/tests/set_mempolicy.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_set_mempolicy
 
diff --git a/tests/setdomainname.c b/tests/setdomainname.c
index 1d83ffd79..f3e248409 100644
--- a/tests/setdomainname.c
+++ b/tests/setdomainname.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setdomainname
 
diff --git a/tests/setfsgid.c b/tests/setfsgid.c
index 9f3a279c5..871f4b35f 100644
--- a/tests/setfsgid.c
+++ b/tests/setfsgid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setfsgid
 
diff --git a/tests/setfsgid32.c b/tests/setfsgid32.c
index 149b767c0..6279abd30 100644
--- a/tests/setfsgid32.c
+++ b/tests/setfsgid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setfsgid32
 
diff --git a/tests/setfsuid.c b/tests/setfsuid.c
index 7c77f5024..d6faf9711 100644
--- a/tests/setfsuid.c
+++ b/tests/setfsuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setfsuid
 
diff --git a/tests/setfsuid32.c b/tests/setfsuid32.c
index cb72d7c5e..b71cf2354 100644
--- a/tests/setfsuid32.c
+++ b/tests/setfsuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setfsuid32
 
diff --git a/tests/setgid.c b/tests/setgid.c
index aa3f89871..8794a0a4b 100644
--- a/tests/setgid.c
+++ b/tests/setgid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setgid
 
diff --git a/tests/setgid32.c b/tests/setgid32.c
index c9f1221c1..17f43c585 100644
--- a/tests/setgid32.c
+++ b/tests/setgid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setgid32
 
diff --git a/tests/setgroups.c b/tests/setgroups.c
index 8355301c5..61894f1d9 100644
--- a/tests/setgroups.c
+++ b/tests/setgroups.c
@@ -36,7 +36,7 @@
 #else
 
 # include "tests.h"
-# include <sys/syscall.h>
+# include <asm/unistd.h>
 
 # ifdef __NR_setgroups
 
diff --git a/tests/setgroups32.c b/tests/setgroups32.c
index bd0a1fdec..ecf00bbde 100644
--- a/tests/setgroups32.c
+++ b/tests/setgroups32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setgroups32
 
diff --git a/tests/sethostname.c b/tests/sethostname.c
index 65d0a78d7..dfa9d1a68 100644
--- a/tests/sethostname.c
+++ b/tests/sethostname.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sethostname
 
diff --git a/tests/setregid.c b/tests/setregid.c
index 6efa38813..e1da7862d 100644
--- a/tests/setregid.c
+++ b/tests/setregid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setregid
 
diff --git a/tests/setregid32.c b/tests/setregid32.c
index 0d0ebedfb..3cf0daf6f 100644
--- a/tests/setregid32.c
+++ b/tests/setregid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setregid32
 
diff --git a/tests/setresgid.c b/tests/setresgid.c
index 6754c2fe3..8701df8ed 100644
--- a/tests/setresgid.c
+++ b/tests/setresgid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setresgid
 
diff --git a/tests/setresgid32.c b/tests/setresgid32.c
index 29a8042b4..dfce45727 100644
--- a/tests/setresgid32.c
+++ b/tests/setresgid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setresgid32
 
diff --git a/tests/setresuid.c b/tests/setresuid.c
index b924f914d..3a9dbd1fc 100644
--- a/tests/setresuid.c
+++ b/tests/setresuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setresuid
 
diff --git a/tests/setresuid32.c b/tests/setresuid32.c
index d4187dd27..387268a7f 100644
--- a/tests/setresuid32.c
+++ b/tests/setresuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setresuid32
 
diff --git a/tests/setreuid.c b/tests/setreuid.c
index dc1303801..68e751923 100644
--- a/tests/setreuid.c
+++ b/tests/setreuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setreuid
 
diff --git a/tests/setreuid32.c b/tests/setreuid32.c
index 43b7b91ab..ba0176211 100644
--- a/tests/setreuid32.c
+++ b/tests/setreuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setreuid32
 
diff --git a/tests/setrlimit.c b/tests/setrlimit.c
index b5a14c63b..04bb1370e 100644
--- a/tests/setrlimit.c
+++ b/tests/setrlimit.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setrlimit
 
diff --git a/tests/setuid.c b/tests/setuid.c
index c9e97e05a..df2e46b17 100644
--- a/tests/setuid.c
+++ b/tests/setuid.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setuid
 
diff --git a/tests/setuid32.c b/tests/setuid32.c
index 9247cb2f5..c837d547c 100644
--- a/tests/setuid32.c
+++ b/tests/setuid32.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_setuid32
 
diff --git a/tests/signalfd4.c b/tests/signalfd4.c
index bbd67116e..2641b22fe 100644
--- a/tests/signalfd4.c
+++ b/tests/signalfd4.c
@@ -29,7 +29,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_rt_sigprocmask \
  && defined HAVE_SYS_SIGNALFD_H \
diff --git a/tests/socketcall.c b/tests/socketcall.c
index 5ccddc478..d2ec959a7 100644
--- a/tests/socketcall.c
+++ b/tests/socketcall.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_socketcall
 
diff --git a/tests/splice.c b/tests/splice.c
index 433cf7fef..5a899109c 100644
--- a/tests/splice.c
+++ b/tests/splice.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_splice
 
diff --git a/tests/stat.c b/tests/stat.c
index f64ff3025..df6cab16b 100644
--- a/tests/stat.c
+++ b/tests/stat.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_stat
 
diff --git a/tests/stat64.c b/tests/stat64.c
index c1641895d..0b53f9aec 100644
--- a/tests/stat64.c
+++ b/tests/stat64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_stat64
 
diff --git a/tests/statfs.c b/tests/statfs.c
index 5a87afc16..6032a668b 100644
--- a/tests/statfs.c
+++ b/tests/statfs.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_statfs
 
diff --git a/tests/statfs64.c b/tests/statfs64.c
index b85dce2c1..f46e76709 100644
--- a/tests/statfs64.c
+++ b/tests/statfs64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_statfs64
 
diff --git a/tests/swap.c b/tests/swap.c
index 065af4dc4..ed8cec89c 100644
--- a/tests/swap.c
+++ b/tests/swap.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_swapon && defined __NR_swapoff
 
diff --git a/tests/symlink.c b/tests/symlink.c
index 44c5655bd..72cb49085 100644
--- a/tests/symlink.c
+++ b/tests/symlink.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_symlink
 
diff --git a/tests/symlinkat.c b/tests/symlinkat.c
index 3dfdd8076..d0116d07b 100644
--- a/tests/symlinkat.c
+++ b/tests/symlinkat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_symlinkat
 
diff --git a/tests/sync.c b/tests/sync.c
index 132a6f2a5..e6e7ce372 100644
--- a/tests/sync.c
+++ b/tests/sync.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_sync
 
diff --git a/tests/sync_file_range.c b/tests/sync_file_range.c
index 9426e3c5b..aadef68cd 100644
--- a/tests/sync_file_range.c
+++ b/tests/sync_file_range.c
@@ -29,7 +29,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined HAVE_SYNC_FILE_RANGE && defined __NR_sync_file_range
 
diff --git a/tests/sync_file_range2.c b/tests/sync_file_range2.c
index d19cf25b1..6ce7db260 100644
--- a/tests/sync_file_range2.c
+++ b/tests/sync_file_range2.c
@@ -29,7 +29,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined HAVE_SYNC_FILE_RANGE && defined  __NR_sync_file_range2
 
diff --git a/tests/syslog.c b/tests/syslog.c
index 8c6829836..d4d4a7bb7 100644
--- a/tests/syslog.c
+++ b/tests/syslog.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_syslog
 
diff --git a/tests/tee.c b/tests/tee.c
index f36f92aad..eb562c7ce 100644
--- a/tests/tee.c
+++ b/tests/tee.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_tee
 
diff --git a/tests/time.c b/tests/time.c
index 041b01174..4a5cde9c1 100644
--- a/tests/time.c
+++ b/tests/time.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_time
 
diff --git a/tests/timer_create.c b/tests/timer_create.c
index ff924d3f8..6f98f3680 100644
--- a/tests/timer_create.c
+++ b/tests/timer_create.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_timer_create
 
diff --git a/tests/timer_xettime.c b/tests/timer_xettime.c
index 7c691c641..6fcd00ef6 100644
--- a/tests/timer_xettime.c
+++ b/tests/timer_xettime.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_timer_create \
  && defined __NR_timer_gettime \
diff --git a/tests/timerfd_xettime.c b/tests/timerfd_xettime.c
index f97c1db90..a084b6661 100644
--- a/tests/timerfd_xettime.c
+++ b/tests/timerfd_xettime.c
@@ -27,7 +27,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_timerfd_create \
  && defined __NR_timerfd_gettime \
diff --git a/tests/times-fail.c b/tests/times-fail.c
index 5f5277ca5..cb69bd431 100644
--- a/tests/times-fail.c
+++ b/tests/times-fail.c
@@ -2,7 +2,7 @@
 #include <assert.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 int
 main (void)
diff --git a/tests/times.c b/tests/times.c
index 6c76dbc7c..18b209b22 100644
--- a/tests/times.c
+++ b/tests/times.c
@@ -38,7 +38,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <sys/times.h>
 #include <sys/wait.h>
 
diff --git a/tests/truncate.c b/tests/truncate.c
index c3ad2ba76..3f16aefd1 100644
--- a/tests/truncate.c
+++ b/tests/truncate.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_truncate
 
diff --git a/tests/truncate64.c b/tests/truncate64.c
index c973c4591..c4a524d53 100644
--- a/tests/truncate64.c
+++ b/tests/truncate64.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_truncate64
 
diff --git a/tests/ugetrlimit.c b/tests/ugetrlimit.c
index dc24bb80f..a99e496d9 100644
--- a/tests/ugetrlimit.c
+++ b/tests/ugetrlimit.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_ugetrlimit
 
diff --git a/tests/umount.c b/tests/umount.c
index cc382fe03..eda7ae5c4 100644
--- a/tests/umount.c
+++ b/tests/umount.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 #include <unistd.h>
 
 #ifdef __NR_oldumount
diff --git a/tests/umount2.c b/tests/umount2.c
index 45ed1a447..1a6d8451a 100644
--- a/tests/umount2.c
+++ b/tests/umount2.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <sys/mount.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_umount2
 # define TEST_SYSCALL_STR "umount2"
diff --git a/tests/uname.c b/tests/uname.c
index 571cf9bec..cd6f51cde 100644
--- a/tests/uname.c
+++ b/tests/uname.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_uname
 
diff --git a/tests/unix-pair-send-recv.c b/tests/unix-pair-send-recv.c
index 95402397c..d4ac0d237 100644
--- a/tests/unix-pair-send-recv.c
+++ b/tests/unix-pair-send-recv.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifndef __NR_send
 # define __NR_send -1
diff --git a/tests/unlink.c b/tests/unlink.c
index f5a1a1af6..bbb1de155 100644
--- a/tests/unlink.c
+++ b/tests/unlink.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_unlink
 
diff --git a/tests/unlinkat.c b/tests/unlinkat.c
index 29eeb19fb..0b69b0373 100644
--- a/tests/unlinkat.c
+++ b/tests/unlinkat.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_unlinkat
 
diff --git a/tests/userfaultfd.c b/tests/userfaultfd.c
index 5747a2a76..254b84e95 100644
--- a/tests/userfaultfd.c
+++ b/tests/userfaultfd.c
@@ -27,7 +27,7 @@
 
 #include "tests.h"
 #include <fcntl.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_userfaultfd && defined O_CLOEXEC
 
diff --git a/tests/utimes.c b/tests/utimes.c
index e9fe931af..401d18a14 100644
--- a/tests/utimes.c
+++ b/tests/utimes.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_utimes
 
diff --git a/tests/vhangup.c b/tests/vhangup.c
index 468f3344b..f656e7059 100644
--- a/tests/vhangup.c
+++ b/tests/vhangup.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_vhangup
 
diff --git a/tests/vmsplice.c b/tests/vmsplice.c
index 06c069420..f29962e3d 100644
--- a/tests/vmsplice.c
+++ b/tests/vmsplice.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_vmsplice
 
diff --git a/tests/waitid.c b/tests/waitid.c
index bd7e8efb0..bbe6feec4 100644
--- a/tests/waitid.c
+++ b/tests/waitid.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 static const char *
 sprint_rusage(const struct rusage *const ru)
diff --git a/tests/waitpid.c b/tests/waitpid.c
index c6f0ad435..dbcdf8739 100644
--- a/tests/waitpid.c
+++ b/tests/waitpid.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #ifdef __NR_waitpid
 
diff --git a/tests/xet_robust_list.c b/tests/xet_robust_list.c
index eef31dc7a..f8349303e 100644
--- a/tests/xet_robust_list.c
+++ b/tests/xet_robust_list.c
@@ -26,7 +26,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_get_robust_list && defined __NR_set_robust_list
 
diff --git a/tests/xetpgid.c b/tests/xetpgid.c
index 6ce79c1a6..d4d5545cd 100644
--- a/tests/xetpgid.c
+++ b/tests/xetpgid.c
@@ -28,7 +28,7 @@
  */
 
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_getpgid && defined __NR_setpgid
 
diff --git a/tests/xetpriority.c b/tests/xetpriority.c
index a32b03160..640118732 100644
--- a/tests/xetpriority.c
+++ b/tests/xetpriority.c
@@ -1,5 +1,5 @@
 #include "tests.h"
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 #if defined __NR_getpriority && defined __NR_setpriority
 
diff --git a/tests/xettimeofday.c b/tests/xettimeofday.c
index ae28e02b7..dd0509179 100644
--- a/tests/xettimeofday.c
+++ b/tests/xettimeofday.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include <sys/syscall.h>
+#include <asm/unistd.h>
 
 int
 main(void)