diff -r 60c4cd9ebaa1 linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Aug  3 16:11:32 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed Aug  3 18:05:00 2005
@@ -12,9 +12,6 @@
  */
 
 #include "common.h"
-#ifdef CONFIG_XEN_BLKDEV_GRANT
-#include <asm-xen/xen-public/grant_table.h>
-#endif
 
 /*
  * These are rather arbitrary. They are fairly large because adjacent requests
diff -r 60c4cd9ebaa1 linux-2.6-xen-sparse/drivers/xen/blkback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Wed Aug  3 16:11:32 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Wed Aug  3 18:05:00 2005
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/blkdev.h>
+#include <linux/vmalloc.h>
 #include <asm/io.h>
 #include <asm/setup.h>
 #include <asm/pgalloc.h>
@@ -17,6 +18,9 @@
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm-xen/xen-public/io/ring.h>
+#ifdef CONFIG_XEN_BLKDEV_GRANT
+#include <asm-xen/gnttab.h>
+#endif
 
 #if 0
 #define ASSERT(_p) \
diff -r 60c4cd9ebaa1 linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Aug  3 16:11:32 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Aug  3 18:05:00 2005
@@ -33,6 +33,7 @@
 #define __XEN_DRIVERS_BLOCK_H__
 
 #include <linux/config.h>
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -44,6 +45,7 @@
 #include <linux/blkdev.h>
 #include <linux/major.h>
 #include <linux/devfs_fs_kernel.h>
+#include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/xen.h>
 #include <asm-xen/xen-public/io/blkif.h>
 #include <asm-xen/xen-public/io/ring.h>