diff --git a/[refs] b/[refs]
index 57ed15980189..086facd7c08e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3b9cf122eb097ed9fe8ae50e1b0dbba9bbe447
+refs/heads/master: 2c5d81a58106fa333467beab5f11dafab07b3e66
diff --git a/trunk/include/asm-x86_64/kexec.h b/trunk/include/asm-x86_64/kexec.h
index ae28cd44bcd3..c564bae03433 100644
--- a/trunk/include/asm-x86_64/kexec.h
+++ b/trunk/include/asm-x86_64/kexec.h
@@ -1,8 +1,9 @@
 #ifndef _X86_64_KEXEC_H
 #define _X86_64_KEXEC_H
 
+#include <linux/string.h>
+
 #include <asm/page.h>
-#include <asm/proto.h>
 #include <asm/ptrace.h>
 
 /*
diff --git a/trunk/include/linux/elfcore.h b/trunk/include/linux/elfcore.h
index dbd7bb4a33b7..0cf0bea010fe 100644
--- a/trunk/include/linux/elfcore.h
+++ b/trunk/include/linux/elfcore.h
@@ -5,6 +5,7 @@
 #include <linux/signal.h>
 #include <linux/time.h>
 #include <linux/user.h>
+#include <linux/ptrace.h>
 
 struct elf_siginfo
 {