--- glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/user.h.orig	2008-09-17 12:34:49.000000000 -0400
+++ glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/user.h	2008-09-17 12:00:34.000000000 -0400
@@ -21,8 +21,6 @@
 
 #include <features.h>
 
-#include <asm/user.h>
-
 #undef start_thread
 
 #endif  /* sys/user.h */
--- glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h.orig	2008-09-17 12:35:05.000000000 -0400
+++ glibc-2.7/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2008-09-17 12:35:12.000000000 -0400
@@ -29,10 +29,15 @@
 #include <sys/types.h>
 #include <sys/ucontext.h>
 #include <sys/user.h>
-#include <asm/elf.h>
+#include <asm/ptrace.h>
 
 __BEGIN_DECLS
 
+typedef unsigned long elf_greg_t;
+#define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+typedef struct user_fpu_struct elf_fpregset_t;
+
 struct elf_siginfo
   {
     int si_signo;			/* Signal number.  */