diff --git a/tools/testing/selftests/filesystems/incfs/incfs_test.c b/tools/testing/selftests/filesystems/incfs/incfs_test.c
index fc2f55884972..40d1406a5812 100644
--- a/tools/testing/selftests/filesystems/incfs/incfs_test.c
+++ b/tools/testing/selftests/filesystems/incfs/incfs_test.c
@@ -35,7 +35,6 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 
-#include <kselftest.h>
 #include <include/uapi/linux/fsverity.h>
 
 #include "utils.h"
diff --git a/tools/testing/selftests/filesystems/incfs/utils.h b/tools/testing/selftests/filesystems/incfs/utils.h
index 17a1ac5eef7d..79eb4ce50ec8 100644
--- a/tools/testing/selftests/filesystems/incfs/utils.h
+++ b/tools/testing/selftests/filesystems/incfs/utils.h
@@ -5,9 +5,9 @@
 #include <stdbool.h>
 #include <sys/stat.h>
 
-#include <include/uapi/linux/incrementalfs.h>
+#include <kselftest.h>
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
+#include <include/uapi/linux/incrementalfs.h>
 
 #define __packed __attribute__((__packed__))