diff --git a/[refs] b/[refs]
index 3892a8af0c2b..41b9a16169b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b259d74b39595f6ac74c3627b9c3657ac90249a0
+refs/heads/master: 7e80d0d0b64f5c00b0ac7e623d96189309c298ca
diff --git a/trunk/drivers/char/i8k.c b/trunk/drivers/char/i8k.c
index 353d9f3cf8d7..0289705967de 100644
--- a/trunk/drivers/char/i8k.c
+++ b/trunk/drivers/char/i8k.c
@@ -22,6 +22,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/dmi.h>
+#include <linux/capability.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
index 2939db0231f1..67d9b3148c06 100644
--- a/trunk/fs/binfmt_elf.c
+++ b/trunk/fs/binfmt_elf.c
@@ -38,6 +38,7 @@
 #include <linux/syscalls.h>
 #include <linux/random.h>
 #include <linux/elf.h>
+#include <linux/utsname.h>
 #include <asm/uaccess.h>
 #include <asm/param.h>
 #include <asm/page.h>
diff --git a/trunk/include/asm-i386/elf.h b/trunk/include/asm-i386/elf.h
index d304ab4161ff..b32df3a332da 100644
--- a/trunk/include/asm-i386/elf.h
+++ b/trunk/include/asm-i386/elf.h
@@ -9,8 +9,6 @@
 #include <asm/user.h>
 #include <asm/auxvec.h>
 
-#include <linux/utsname.h>
-
 #define R_386_NONE	0
 #define R_386_32	1
 #define R_386_PC32	2