diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 179ddfaebc5..73a5525cc0a 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -14,9 +14,7 @@
 #include <linux/seq_file.h>
 #include <linux/kdev_t.h>
 #include "blk-cgroup.h"
-
-extern void cfq_unlink_blkio_group(void *, struct blkio_group *);
-extern void cfq_update_blkio_group_weight(struct blkio_group *, unsigned int);
+#include "cfq-iosched.h"
 
 struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT };
 
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 08b057b1b3b..43ec3340cb5 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -14,6 +14,7 @@
 #include <linux/ioprio.h>
 #include <linux/blktrace_api.h>
 #include "blk-cgroup.h"
+#include "cfq-iosched.h"
 
 /*
  * tunables
diff --git a/block/cfq-iosched.h b/block/cfq-iosched.h
new file mode 100644
index 00000000000..ef7b4798a34
--- /dev/null
+++ b/block/cfq-iosched.h
@@ -0,0 +1,7 @@
+#ifndef CFQ_IOSCHED_H
+#define CFQ_IOSCHED_H
+
+void cfq_unlink_blkio_group(void *, struct blkio_group *);
+void cfq_update_blkio_group_weight(struct blkio_group *, unsigned int);
+
+#endif