diff --git a/[refs] b/[refs]
index e4a89aa0b4fa..bde47f22ee92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d532dd50de1c0cd7d15ba06ad7261e13474fef2
+refs/heads/master: cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4
diff --git a/trunk/fs/jffs2/compr.h b/trunk/fs/jffs2/compr.h
index a77e830d85c5..509b8b1c0811 100644
--- a/trunk/fs/jffs2/compr.h
+++ b/trunk/fs/jffs2/compr.h
@@ -23,8 +23,8 @@
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/jffs2.h>
-#include <linux/jffs2_fs_i.h>
-#include <linux/jffs2_fs_sb.h>
+#include "jffs2_fs_i.h"
+#include "jffs2_fs_sb.h"
 #include "nodelist.h"
 
 #define JFFS2_RUBINMIPS_PRIORITY 10
diff --git a/trunk/fs/jffs2/dir.c b/trunk/fs/jffs2/dir.c
index f92840a3a52f..1c8e8c0f6cea 100644
--- a/trunk/fs/jffs2/dir.c
+++ b/trunk/fs/jffs2/dir.c
@@ -17,8 +17,8 @@
 #include <linux/fs.h>
 #include <linux/crc32.h>
 #include <linux/jffs2.h>
-#include <linux/jffs2_fs_i.h>
-#include <linux/jffs2_fs_sb.h>
+#include "jffs2_fs_i.h"
+#include "jffs2_fs_sb.h"
 #include <linux/time.h>
 #include "nodelist.h"
 
diff --git a/trunk/include/linux/jffs2_fs_i.h b/trunk/fs/jffs2/jffs2_fs_i.h
similarity index 100%
rename from trunk/include/linux/jffs2_fs_i.h
rename to trunk/fs/jffs2/jffs2_fs_i.h
diff --git a/trunk/include/linux/jffs2_fs_sb.h b/trunk/fs/jffs2/jffs2_fs_sb.h
similarity index 100%
rename from trunk/include/linux/jffs2_fs_sb.h
rename to trunk/fs/jffs2/jffs2_fs_sb.h
diff --git a/trunk/fs/jffs2/nodelist.h b/trunk/fs/jffs2/nodelist.h
index 23a67bb3052f..f6645afe88e4 100644
--- a/trunk/fs/jffs2/nodelist.h
+++ b/trunk/fs/jffs2/nodelist.h
@@ -18,8 +18,8 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 #include <linux/jffs2.h>
-#include <linux/jffs2_fs_sb.h>
-#include <linux/jffs2_fs_i.h>
+#include "jffs2_fs_sb.h"
+#include "jffs2_fs_i.h"
 #include "summary.h"
 
 #ifdef __ECOS