diff --git a/[refs] b/[refs]
index ad2f1a9fb07f..799f37a9851f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb5629b10d64a8006622ce3a52bc887d91057d69
+refs/heads/master: ed850a52af971528b048812c4215cef298af0d3b
diff --git a/trunk/include/linux/ima.h b/trunk/include/linux/ima.h
index 6db30a328d98..0e2aa45cb0ce 100644
--- a/trunk/include/linux/ima.h
+++ b/trunk/include/linux/ima.h
@@ -7,11 +7,12 @@
  * the Free Software Foundation, version 2 of the License.
  */
 
-#include <linux/fs.h>
-
 #ifndef _LINUX_IMA_H
 #define _LINUX_IMA_H
 
+#include <linux/fs.h>
+struct linux_binprm;
+
 #ifdef CONFIG_IMA
 extern int ima_bprm_check(struct linux_binprm *bprm);
 extern int ima_inode_alloc(struct inode *inode);
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 75199888a6bd..8135fac294ee 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -28,6 +28,7 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/swap.h>
+#include <linux/ima.h>
 
 static struct vfsmount *shm_mnt;
 
@@ -59,7 +60,6 @@ static struct vfsmount *shm_mnt;
 #include <linux/highmem.h>
 #include <linux/seq_file.h>
 #include <linux/magic.h>
-#include <linux/ima.h>
 
 #include <asm/uaccess.h>
 #include <asm/div64.h>