diff --git a/[refs] b/[refs]
index 03f2927bf69d..0e363195f2c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e831a9c6186ca1f63fdf2f41628193dd690ab440
+refs/heads/master: 9fb24cc50045ec8d13d0a6c3d4d454750b466d61
diff --git a/trunk/arch/score/include/asm/ucontext.h b/trunk/arch/score/include/asm/ucontext.h
new file mode 100644
index 000000000000..9bc07b9f30fb
--- /dev/null
+++ b/trunk/arch/score/include/asm/ucontext.h
@@ -0,0 +1 @@
+#include <asm-generic/ucontext.h>
diff --git a/trunk/arch/score/kernel/module.c b/trunk/arch/score/kernel/module.c
index 4ffce7fe1560..1a625572ecc8 100644
--- a/trunk/arch/score/kernel/module.c
+++ b/trunk/arch/score/kernel/module.c
@@ -23,6 +23,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/moduleloader.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 
diff --git a/trunk/arch/score/kernel/process.c b/trunk/arch/score/kernel/process.c
index d93966f7ac83..25d08030a883 100644
--- a/trunk/arch/score/kernel/process.c
+++ b/trunk/arch/score/kernel/process.c
@@ -24,6 +24,9 @@
  */
 
 #include <linux/module.h>
+#include <linux/reboot.h>
+#include <linux/elfcore.h>
+#include <linux/pm.h>
 
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
diff --git a/trunk/arch/score/kernel/signal.c b/trunk/arch/score/kernel/signal.c
index 5c004084d17d..252f6d95ad9e 100644
--- a/trunk/arch/score/kernel/signal.c
+++ b/trunk/arch/score/kernel/signal.c
@@ -27,7 +27,9 @@
 #include <linux/signal.h>
 #include <linux/unistd.h>
 #include <linux/uaccess.h>
-#include <asm-generic/ucontext.h>
+
+#include <asm/syscalls.h>
+#include <asm/ucontext.h>
 
 #include <asm/cacheflush.h>
 
diff --git a/trunk/arch/score/kernel/sys_score.c b/trunk/arch/score/kernel/sys_score.c
index 331886104325..eb4d2d3b97ad 100644
--- a/trunk/arch/score/kernel/sys_score.c
+++ b/trunk/arch/score/kernel/sys_score.c
@@ -28,6 +28,8 @@
 #include <linux/mman.h>
 #include <linux/module.h>
 #include <linux/unistd.h>
+#include <linux/syscalls.h>
+#include <asm/syscalls.h>
 
 unsigned long shm_align_mask = PAGE_SIZE - 1;
 EXPORT_SYMBOL(shm_align_mask);