--- strace-4.8.orig/syscall.c	2013-05-14 16:10:42.000000000 +0200
+++ strace-4.8/syscall.c	2014-01-23 19:57:19.000000000 +0100
@@ -40,17 +40,6 @@
 # ifndef PTRACE_PEEKUSR
 #  define PTRACE_PEEKUSR PTRACE_PEEKUSER
 # endif
-#elif defined(HAVE_LINUX_PTRACE_H)
-# undef PTRACE_SYSCALL
-# ifdef HAVE_STRUCT_IA64_FPREG
-#  define ia64_fpreg XXX_ia64_fpreg
-# endif
-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
-#  define pt_all_user_regs XXX_pt_all_user_regs
-# endif
-# include <linux/ptrace.h>
-# undef ia64_fpreg
-# undef pt_all_user_regs
 #endif
 
 #if defined(SPARC64)
@@ -72,13 +61,7 @@
 # include <elf.h>
 #endif
 
-#if defined(AARCH64)
-# include <asm/ptrace.h>
-#endif
-
-#if defined(XTENSA)
-# include <asm/ptrace.h>
-#endif
+#include <asm/ptrace.h>
 
 #ifndef ERESTARTSYS
 # define ERESTARTSYS	512