diff --git a/[refs] b/[refs]
index 114ba9e5d222..f61fb5562f91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfc7bc896f45251bdcfa45e0d62fda0566e95c4a
+refs/heads/master: c9b3a8ccb77e063a28a9567eb72e0c1222c4ade4
diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h
index 2439054a6c9a..8685d1be12c7 100644
--- a/trunk/include/linux/jbd.h
+++ b/trunk/include/linux/jbd.h
@@ -27,7 +27,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/lockdep.h>
diff --git a/trunk/include/linux/jbd2.h b/trunk/include/linux/jbd2.h
index a79783faecad..25d9c9ea7a14 100644
--- a/trunk/include/linux/jbd2.h
+++ b/trunk/include/linux/jbd2.h
@@ -26,7 +26,6 @@
 #include <linux/buffer_head.h>
 #include <linux/journal-head.h>
 #include <linux/stddef.h>
-#include <linux/bit_spinlock.h>
 #include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/slab.h>
diff --git a/trunk/include/linux/jbd_common.h b/trunk/include/linux/jbd_common.h
index b1f708976ffd..3dc53432355f 100644
--- a/trunk/include/linux/jbd_common.h
+++ b/trunk/include/linux/jbd_common.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_JBD_STATE_H
 #define _LINUX_JBD_STATE_H
 
+#include <linux/bit_spinlock.h>
+
 static inline struct buffer_head *jh2bh(struct journal_head *jh)
 {
 	return jh->b_bh;