1.1 --- a/xen/arch/x86/mtrr/generic.c	Wed May 04 09:41:40 2005 +0000
     1.2 +++ b/xen/arch/x86/mtrr/generic.c	Wed May 04 10:15:01 2005 +0000
     1.3 @@ -1,8 +1,8 @@
     1.4  /* This only handles 32bit MTRR on 32bit hosts. This is strictly wrong
     1.5     because MTRRs can span upto 40 bits (36bits on most modern x86) */ 
     1.6  #include <xen/init.h>
     1.7 +#include <xen/mm.h>
     1.8  #include <xen/slab.h>
     1.9 -#include <xen/mm.h>
    1.10  #include <asm/io.h>
    1.11  #include <asm/mtrr.h>
    1.12  #include <asm/msr.h>

     2.1 --- a/xen/include/xen/slab.h	Wed May 04 09:41:40 2005 +0000
     2.2 +++ b/xen/include/xen/slab.h	Wed May 04 10:15:01 2005 +0000
     2.3 @@ -10,10 +10,6 @@
     2.4  
     2.5  #else
     2.6  
     2.7 -#include <xen/mm.h>
     2.8 -#include <xen/cache.h>
     2.9 -#include <xen/types.h>
    2.10 -
    2.11  /* Allocate space for typed object. */
    2.12  #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
    2.13