16 files changed, 13 insertions, 14 deletions

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 27f978dfe6a3..7666117738c7 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -27,7 +27,7 @@
 #include <linux/mount.h>
 #include <linux/buffer_head.h>
 #include <linux/raid/md.h>
-#include <linux/raid/bitmap.h>
+#include "bitmap.h"
 
 /* debug macros */
 
diff --git a/include/linux/raid/bitmap.h b/drivers/md/bitmap.h
index e98900671ca9..e98900671ca9 100644
--- a/include/linux/raid/bitmap.h
+++ b/drivers/md/bitmap.h
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 09658b218474..3603ffa9edc5 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 */
 
-#include <linux/raid/linear.h>
+#include "linear.h"
 
 /*
  * find which device holds a particular offset 
diff --git a/include/linux/raid/linear.h b/drivers/md/linear.h
index f38b9c586afb..f38b9c586afb 100644
--- a/include/linux/raid/linear.h
+++ b/drivers/md/linear.h
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3efc0bceada2..9a3214c8585f 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -34,7 +34,6 @@
 
 #include <linux/kthread.h>
 #include <linux/raid/md.h>
-#include <linux/raid/bitmap.h>
 #include <linux/sysctl.h>
 #include <linux/buffer_head.h> /* for invalidate_bdev */
 #include <linux/poll.h>
@@ -45,6 +44,7 @@
 #include <linux/reboot.h>
 #include <linux/file.h>
 #include <linux/delay.h>
+#include "bitmap.h"
 
 /* 63 partitions with the alternate major number (mdp) */
 #define MdpMinorShift 6
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index f6d08f241671..547df09a7af3 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/raid/multipath.h>
+#include "multipath.h"
 
 #define MAX_WORK_PER_DISK 128
 
diff --git a/include/linux/raid/multipath.h b/drivers/md/multipath.h
index 6f53fc177a47..6f53fc177a47 100644
--- a/include/linux/raid/multipath.h
+++ b/drivers/md/multipath.h
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index c605ba805586..ef09ed04864e 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 */
 
-#include <linux/raid/raid0.h>
+#include "raid0.h"
 
 static void raid0_unplug(struct request_queue *q)
 {
diff --git a/include/linux/raid/raid0.h b/drivers/md/raid0.h
index fd42aa87c391..fd42aa87c391 100644
--- a/include/linux/raid/raid0.h
+++ b/drivers/md/raid0.h
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e2466425d9ca..bff32285f8bb 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -33,8 +33,8 @@
 
 #include "dm-bio-list.h"
 #include <linux/delay.h>
-#include <linux/raid/raid1.h>
-#include <linux/raid/bitmap.h>
+#include "raid1.h"
+#include "bitmap.h"
 
 #define DEBUG 0
 #if DEBUG
diff --git a/include/linux/raid/raid1.h b/drivers/md/raid1.h
index 0a9ba7c3302e..0a9ba7c3302e 100644
--- a/include/linux/raid/raid1.h
+++ b/drivers/md/raid1.h
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 7301631abe04..f03dd70d12a5 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -20,8 +20,8 @@
 
 #include "dm-bio-list.h"
 #include <linux/delay.h>
-#include <linux/raid/raid10.h>
-#include <linux/raid/bitmap.h>
+#include "raid10.h"
+#include "bitmap.h"
 
 /*
  * RAID10 provides a combination of RAID0 and RAID1 functionality.
diff --git a/include/linux/raid/raid10.h b/drivers/md/raid10.h
index e9091cfeb286..e9091cfeb286 100644
--- a/include/linux/raid/raid10.h
+++ b/drivers/md/raid10.h
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index a5ba080d303b..f75698b1f63d 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -44,10 +44,9 @@
  */
 
 #include <linux/kthread.h>
-#include "raid6.h"
-
-#include <linux/raid/bitmap.h>
 #include <linux/async_tx.h>
+#include "raid6.h"
+#include "bitmap.h"
 
 /*
  * Stripe cache
diff --git a/include/linux/raid/raid5.h b/drivers/md/raid5.h
index 3b2672792457..40f1d0335c74 100644
--- a/include/linux/raid/raid5.h
+++ b/drivers/md/raid5.h
@@ -319,7 +319,7 @@ struct r6_state {
  * PREREAD_ACTIVE is set, else we set DELAYED which will send it to the delayed queue.
  * HANDLE gets cleared if stripe_handle leave nothing locked.
  */
- 
+
 
 struct disk_info {
         mdk_rdev_t      *rdev;
diff --git a/drivers/md/raid6.h b/drivers/md/raid6.h
index 98dcde88470e..f6c13af65002 100644
--- a/drivers/md/raid6.h
+++ b/drivers/md/raid6.h
@@ -19,7 +19,7 @@
 #define RAID6_USE_EMPTY_ZERO_PAGE 0
 
 #include <linux/raid/md.h>
-#include <linux/raid/raid5.h>
+#include "raid5.h"
 
 typedef raid5_conf_t raid6_conf_t; /* Same configuration */