diff -Naur strace-5.16.orig/bundled/linux/include/uapi/linux/input.h strace-5.16/bundled/linux/include/uapi/linux/input.h
--- strace-5.16.orig/bundled/linux/include/uapi/linux/input.h	2021-03-22 13:30:00.000000000 +0530
+++ strace-5.16/bundled/linux/include/uapi/linux/input.h	2022-04-01 12:44:09.097450926 +0530
@@ -17,6 +17,14 @@
 
 #include "input-event-codes.h"
 
+#ifndef __BITS_PER_LONG
+#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__aarch64__) || defined(__LP64__) || defined(__powerpc64__)
+#define __BITS_PER_LONG 64
+#else
+#define __BITS_PER_LONG 32
+#endif
+#endif
+
 /*
  * The event structure itself
  * Note that __USE_TIME_BITS64 is defined by libc based on
diff -Naur strace-5.16.orig/bundled/linux/include/uapi/linux/vm_sockets.h strace-5.16/bundled/linux/include/uapi/linux/vm_sockets.h
--- strace-5.16.orig/bundled/linux/include/uapi/linux/vm_sockets.h	2022-01-07 13:31:00.000000000 +0530
+++ strace-5.16/bundled/linux/include/uapi/linux/vm_sockets.h	2022-04-01 12:42:50.789281333 +0530
@@ -20,6 +20,14 @@
 #include <linux/socket.h>
 #include <linux/types.h>
 
+#ifndef __BITS_PER_LONG
+#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__aarch64__) || defined(__LP64__) || defined(__powerpc64__)
+#define __BITS_PER_LONG 64
+#else
+#define __BITS_PER_LONG 32
+#endif
+#endif
+
 /* Option name for STREAM socket buffer size.  Use as the option name in
  * setsockopt(3) or getsockopt(3) to set or get an unsigned long long that
  * specifies the size of the buffer underlying a vSockets STREAM socket.
diff --git a/bundled/linux/include/uapi/asm-generic/fcntl.h b/bundled/linux/include/uapi/asm-generic/fcntl.h
index 80f37a0..52820fd 100644
--- a/bundled/linux/include/uapi/asm-generic/fcntl.h
+++ b/bundled/linux/include/uapi/asm-generic/fcntl.h
@@ -4,6 +4,14 @@
 
 #include <linux/types.h>
 
+#ifndef __BITS_PER_LONG
+#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__aarch64__) || defined(__LP64__) || defined(__powerpc64__)
+#define __BITS_PER_LONG 64
+#else
+#define __BITS_PER_LONG 32
+#endif
+#endif
+
 /*
  * FMODE_EXEC is 0x20
  * FMODE_NONOTIFY is 0x4000000
diff --git a/bundled/linux/include/uapi/asm/fcntl.h b/bundled/linux/include/uapi/asm/fcntl.h
index 80f37a0..52820fd 100644
--- a/bundled/linux/include/uapi/asm/fcntl.h
+++ b/bundled/linux/include/uapi/asm/fcntl.h
@@ -4,6 +4,14 @@
 
 #include <linux/types.h>
 
+#ifndef __BITS_PER_LONG
+#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__aarch64__) || defined(__LP64__) || defined(__powerpc64__)
+#define __BITS_PER_LONG 64
+#else
+#define __BITS_PER_LONG 32
+#endif
+#endif
+
 /*
  * FMODE_EXEC is 0x20
  * FMODE_NONOTIFY is 0x4000000
diff --git a/bundled/linux/arch/mips/include/uapi/asm/fcntl.h b/bundled/linux/arch/mips/include/uapi/asm/fcntl.h
index 0369a38..f141bfc 100644
--- a/bundled/linux/arch/mips/include/uapi/asm/fcntl.h
+++ b/bundled/linux/arch/mips/include/uapi/asm/fcntl.h
@@ -11,6 +11,14 @@
 
 #include <asm/sgidefs.h>
 
+#ifndef __BITS_PER_LONG
+#if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__aarch64__) || defined(__LP64__) || defined(__powerpc64__) || defined(__mips64)
+#define __BITS_PER_LONG 64
+#else
+#define __BITS_PER_LONG 32
+#endif
+#endif
+
 #define O_APPEND	0x0008
 #define O_DSYNC		0x0010	/* used to be O_SYNC, see below */
 #define O_NONBLOCK	0x0080
-- 
2.25.1