diff -urN RC13-git7-other-helpers/arch/sparc/lib/bitext.c RC13-git7-includes/arch/sparc/lib/bitext.c
--- RC13-git7-other-helpers/arch/sparc/lib/bitext.c	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-includes/arch/sparc/lib/bitext.c	2005-09-07 13:55:01.000000000 -0400
@@ -10,6 +10,7 @@
  */
 
 #include <linux/smp_lock.h>
+#include <linux/string.h>
 #include <linux/bitops.h>
 
 #include <asm/bitext.h>
diff -urN RC13-git7-other-helpers/include/linux/hardirq.h RC13-git7-includes/include/linux/hardirq.h
--- RC13-git7-other-helpers/include/linux/hardirq.h	2005-08-28 23:09:48.000000000 -0400
+++ RC13-git7-includes/include/linux/hardirq.h	2005-09-07 13:55:01.000000000 -0400
@@ -4,6 +4,7 @@
 #include <linux/config.h>
 #include <linux/preempt.h>
 #include <linux/smp_lock.h>
+#include <linux/thread_info.h>
 #include <asm/hardirq.h>
 #include <asm/system.h>
 
@@ -90,6 +91,8 @@
 #define nmi_enter()		irq_enter()
 #define nmi_exit()		sub_preempt_count(HARDIRQ_OFFSET)
 
+struct task_struct;
+
 #ifndef CONFIG_VIRT_CPU_ACCOUNTING
 static inline void account_user_vtime(struct task_struct *tsk)
 {
diff -urN RC13-git7-other-helpers/include/linux/interrupt.h RC13-git7-includes/include/linux/interrupt.h
--- RC13-git7-other-helpers/include/linux/interrupt.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-includes/include/linux/interrupt.h	2005-09-07 13:55:01.000000000 -0400
@@ -12,6 +12,7 @@
 #include <asm/atomic.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
+#include <linux/sched.h>
 
 /*
  * For 2.4.x compatibility, 2.4.x can use
diff -urN RC13-git7-other-helpers/include/linux/sched.h RC13-git7-includes/include/linux/sched.h
--- RC13-git7-other-helpers/include/linux/sched.h	2005-09-07 13:55:00.000000000 -0400
+++ RC13-git7-includes/include/linux/sched.h	2005-09-07 13:55:01.000000000 -0400
@@ -1136,6 +1136,8 @@
 	spin_unlock(&p->alloc_lock);
 }
 
+#ifndef __HAVE_THREAD_FUNCTIONS
+
 #define task_thread_info(task) (task)->thread_info
 
 static inline void setup_thread_info(struct task_struct *p, struct thread_info *ti)
@@ -1176,6 +1178,8 @@
 	return test_ti_thread_flag(task_thread_info(tsk), flag);
 }
 
+#endif
+
 static inline void set_tsk_need_resched(struct task_struct *tsk)
 {
 	set_tsk_thread_flag(tsk,TIF_NEED_RESCHED);
diff -urN RC13-git7-other-helpers/include/linux/smp_lock.h RC13-git7-includes/include/linux/smp_lock.h
--- RC13-git7-other-helpers/include/linux/smp_lock.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-includes/include/linux/smp_lock.h	2005-09-07 13:55:01.000000000 -0400
@@ -2,11 +2,10 @@
 #define __LINUX_SMPLOCK_H
 
 #include <linux/config.h>
+#ifdef CONFIG_LOCK_KERNEL
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 
-#ifdef CONFIG_LOCK_KERNEL
-
 #define kernel_locked()		(current->lock_depth >= 0)
 
 extern int __lockfunc __reacquire_kernel_lock(void);
diff -urN RC13-git7-other-helpers/include/linux/thread_info.h RC13-git7-includes/include/linux/thread_info.h
--- RC13-git7-other-helpers/include/linux/thread_info.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-includes/include/linux/thread_info.h	2005-09-07 13:55:01.000000000 -0400
@@ -22,6 +22,7 @@
 
 #ifdef __KERNEL__
 
+#ifndef __HAVE_THREAD_FUNCTIONS
 /*
  * flag set/clear/test wrappers
  * - pass TIF_xxxx constants to these functions
@@ -88,5 +89,6 @@
 }
 
 #endif
+#endif
 
 #endif /* _LINUX_THREAD_INFO_H */