1.1 --- a/xen/include/public/io/blkif.h	Sat Dec 03 10:50:22 2005 +0100
     1.2 +++ b/xen/include/public/io/blkif.h	Sat Dec 03 11:00:03 2005 +0100
     1.3 @@ -10,7 +10,7 @@
     1.4  #define __XEN_PUBLIC_IO_BLKIF_H__
     1.5  
     1.6  #include "ring.h"
     1.7 -#include "../gnttab.h" /* for grant_ref_t */
     1.8 +#include "../grant_table.h"
     1.9  
    1.10  /*
    1.11   * Front->back notifications: When enqueuing a new request, sending a

     2.1 --- a/xen/include/public/io/netif.h	Sat Dec 03 10:50:22 2005 +0100
     2.2 +++ b/xen/include/public/io/netif.h	Sat Dec 03 11:00:03 2005 +0100
     2.3 @@ -10,7 +10,7 @@
     2.4  #define __XEN_PUBLIC_IO_NETIF_H__
     2.5  
     2.6  #include "ring.h"
     2.7 -#include "../gnttab.h" /* for grant_ref_t */
     2.8 +#include "../grant_table.h"
     2.9  
    2.10  /*
    2.11   * Note that there is *never* any need to notify the backend when enqueuing

     3.1 --- a/xen/include/public/io/tpmif.h	Sat Dec 03 10:50:22 2005 +0100
     3.2 +++ b/xen/include/public/io/tpmif.h	Sat Dec 03 11:00:03 2005 +0100
     3.3 @@ -16,7 +16,7 @@
     3.4  #ifndef __XEN_PUBLIC_IO_TPMIF_H__
     3.5  #define __XEN_PUBLIC_IO_TPMIF_H__
     3.6  
     3.7 -#include "../gnttab.h" /* for grant_ref_t */
     3.8 +#include "../grant_table.h"
     3.9  
    3.10  typedef struct {
    3.11      unsigned long addr;   /* Machine address of packet.   */