1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Mon Sep 12 21:42:26 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Tue Sep 13 08:35:41 2005 +0000
     1.3 @@ -37,12 +37,12 @@
     1.4  #include <linux/wait.h>
     1.5  #include <linux/fs.h>
     1.6  
     1.7 -#include "xenstored.h"
     1.8  #include "xenbus_comms.h"
     1.9  
    1.10  #include <asm/uaccess.h>
    1.11  #include <asm-xen/xenbus.h>
    1.12  #include <asm-xen/xen_proc.h>
    1.13 +#include <asm-xen/linux-public/xenstored.h>
    1.14  
    1.15  struct xenbus_dev_data {
    1.16  	/* Are there bytes left to be read in this message? */

     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Mon Sep 12 21:42:26 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_xs.c	Tue Sep 13 08:35:41 2005 +0000
     2.3 @@ -38,7 +38,7 @@
     2.4  #include <linux/fcntl.h>
     2.5  #include <linux/kthread.h>
     2.6  #include <asm-xen/xenbus.h>
     2.7 -#include "xenstored.h"
     2.8 +#include <asm-xen/linux-public/xenstored.h>
     2.9  #include "xenbus_comms.h"
    2.10  
    2.11  #define streq(a, b) (strcmp((a), (b)) == 0)

     3.1 --- a/linux-2.6-xen-sparse/mkbuildtree	Mon Sep 12 21:42:26 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/mkbuildtree	Tue Sep 13 08:35:41 2005 +0000
     3.3 @@ -108,5 +108,5 @@ mkdir  ${AD}/include/asm-xen/xen-public
     3.4  cd     ${AD}/include/asm-xen/xen-public
     3.5  relative_lndir ../../../${RS}/../xen/include/public
     3.6  
     3.7 -cd ${AD}/drivers/xen/xenbus
     3.8 +cd ${AD}/include/asm-xen/linux-public
     3.9  ln -sf ../../../${RS}/../tools/xenstore/xenstored.h