diff --git a/[refs] b/[refs]
index 420e360aea4f..6508eadd0eb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 124fe663f93162d17b7e391705cac122101e93d8
+refs/heads/master: 180e001cd5fc2950dc6a7997dde5b65c954d0e79
diff --git a/trunk/fs/btrfs/extent_io.c b/trunk/fs/btrfs/extent_io.c
index 0306665cb1d7..f173c5af6461 100644
--- a/trunk/fs/btrfs/extent_io.c
+++ b/trunk/fs/btrfs/extent_io.c
@@ -4,7 +4,6 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/page-flags.h>
-#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/blkdev.h>
 #include <linux/swap.h>
diff --git a/trunk/fs/btrfs/extent_map.c b/trunk/fs/btrfs/extent_map.c
index fdb7a8db3b57..2834ca5768ea 100644
--- a/trunk/fs/btrfs/extent_map.c
+++ b/trunk/fs/btrfs/extent_map.c
@@ -1,6 +1,5 @@
 #include <linux/err.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/hardirq.h>
 #include "ctree.h"
diff --git a/trunk/fs/btrfs/sysfs.c b/trunk/fs/btrfs/sysfs.c
index daac9ae6d731..5b326cd60a4a 100644
--- a/trunk/fs/btrfs/sysfs.c
+++ b/trunk/fs/btrfs/sysfs.c
@@ -21,7 +21,6 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <linux/module.h>
 #include <linux/kobject.h>
 
 #include "ctree.h"
diff --git a/trunk/fs/btrfs/ulist.c b/trunk/fs/btrfs/ulist.c
index 99be4c138db6..ddc61cad0080 100644
--- a/trunk/fs/btrfs/ulist.c
+++ b/trunk/fs/btrfs/ulist.c
@@ -5,7 +5,7 @@
  */
 
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include "ulist.h"
 
 /*