--- lldb/source/Plugins/Process/Linux/Procfs.h.orig
+++ lldb/source/Plugins/Process/Linux/Procfs.h
@@ -11,12 +11,11 @@
 // sys/procfs.h on Android/Linux for all supported architectures.
 
 #include <sys/ptrace.h>
+#include <asm/ptrace.h>
 
 #ifndef __GLIBC__
 #if defined (__arm64__) || defined (__aarch64__)
-typedef unsigned long elf_greg_t;
-typedef elf_greg_t elf_gregset_t[(sizeof (struct user_pt_regs) / sizeof(elf_greg_t))];
-typedef struct user_fpsimd_state elf_fpregset_t;
+#include <sys/procfs.h>
 #ifndef NT_FPREGSET
     #define NT_FPREGSET NT_PRFPREG
 #endif // NT_FPREGSET
@@ -29,3 +28,4 @@
 #include <sys/procfs.h>
 #endif // __ANDROID__
 
+
--- lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp.orig
+++ lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp
@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 // NT_PRSTATUS and NT_FPREGSET definition
 #include <elf.h>
+#include <asm/ptrace.h>
 
 #define REG_CONTEXT_SIZE (GetGPRSize() + GetFPRSize())