diff --git a/tests/add_key.c b/tests/add_key.c
index 56c505dd..d2696f9b 100644
--- a/tests/add_key.c
+++ b/tests/add_key.c
@@ -28,8 +28,8 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_add_key
 
diff --git a/tests/copy_file_range.c b/tests/copy_file_range.c
index f3ec5b4a..085010af 100644
--- a/tests/copy_file_range.c
+++ b/tests/copy_file_range.c
@@ -29,6 +29,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_copy_file_range
 
diff --git a/tests/execveat.c b/tests/execveat.c
index 4e444a2c..9083830e 100644
--- a/tests/execveat.c
+++ b/tests/execveat.c
@@ -28,12 +28,14 @@
  */
 
 #include "tests.h"
-#include <stdio.h>
-#include <unistd.h>
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_execveat
 
+# include <stdio.h>
+# include <unistd.h>
+
 # define FILENAME "test.execveat\nfilename"
 # define Q_FILENAME "test.execveat\\nfilename"
 
diff --git a/tests/kexec_file_load.c b/tests/kexec_file_load.c
index b44cbce2..3d46d38e 100644
--- a/tests/kexec_file_load.c
+++ b/tests/kexec_file_load.c
@@ -28,8 +28,8 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_kexec_file_load
 
diff --git a/tests/membarrier.c b/tests/membarrier.c
index cde8f329..330893b6 100644
--- a/tests/membarrier.c
+++ b/tests/membarrier.c
@@ -27,6 +27,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_membarrier
 
diff --git a/tests/memfd_create.c b/tests/memfd_create.c
index ef49bed1..480fd177 100644
--- a/tests/memfd_create.c
+++ b/tests/memfd_create.c
@@ -1,5 +1,6 @@
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_memfd_create
 
diff --git a/tests/mlock2.c b/tests/mlock2.c
index e557042e..71a2003e 100644
--- a/tests/mlock2.c
+++ b/tests/mlock2.c
@@ -27,6 +27,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #ifdef __NR_mlock2
 
diff --git a/tests/pkey_alloc.c b/tests/pkey_alloc.c
index 19840f24..45772787 100644
--- a/tests/pkey_alloc.c
+++ b/tests/pkey_alloc.c
@@ -28,10 +28,10 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_alloc
+#ifdef __NR_pkey_alloc
 
 # include <stdio.h>
 # include <unistd.h>
diff --git a/tests/pkey_free.c b/tests/pkey_free.c
index 1815ad9f..95a2ad26 100644
--- a/tests/pkey_free.c
+++ b/tests/pkey_free.c
@@ -28,10 +28,10 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_free
+#ifdef __NR_pkey_free
 
 # include <stdio.h>
 # include <unistd.h>
diff --git a/tests/pkey_mprotect.c b/tests/pkey_mprotect.c
index 6ba77884..529abd1f 100644
--- a/tests/pkey_mprotect.c
+++ b/tests/pkey_mprotect.c
@@ -28,15 +28,14 @@
  */
 
 #include "tests.h"
-
 #include <asm/unistd.h>
+#include "scno.h"
 
-#if defined __NR_pkey_mprotect
+#ifdef __NR_pkey_mprotect
 
 # include <stdio.h>
 # include <unistd.h>
-
-#include <sys/mman.h>
+# include <sys/mman.h>
 
 const char *
 sprintptr(kernel_ulong_t ptr)
diff --git a/tests/preadv2-pwritev2.c b/tests/preadv2-pwritev2.c
index 97deb4f9..f7c46c0a 100644
--- a/tests/preadv2-pwritev2.c
+++ b/tests/preadv2-pwritev2.c
@@ -29,6 +29,7 @@
 
 #include "tests.h"
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_preadv2 && defined __NR_pwritev2
 
diff --git a/tests/userfaultfd.c b/tests/userfaultfd.c
index 254b84e9..60432fa3 100644
--- a/tests/userfaultfd.c
+++ b/tests/userfaultfd.c
@@ -28,6 +28,7 @@
 #include "tests.h"
 #include <fcntl.h>
 #include <asm/unistd.h>
+#include "scno.h"
 
 #if defined __NR_userfaultfd && defined O_CLOEXEC