1.1 --- a/xen/arch/x86/dmi_scan.c	Tue May 31 22:15:40 2005 +0000
     1.2 +++ b/xen/arch/x86/dmi_scan.c	Tue May 31 22:30:52 2005 +0000
     1.3 @@ -3,6 +3,7 @@
     1.4  #include <xen/kernel.h>
     1.5  #include <xen/string.h>
     1.6  #include <xen/init.h>
     1.7 +#include <xen/cache.h>
     1.8  #include <xen/slab.h>
     1.9  #include <xen/acpi.h>
    1.10  #include <asm/io.h>

     2.1 --- a/xen/arch/x86/mtrr/main.c	Tue May 31 22:15:40 2005 +0000
     2.2 +++ b/xen/arch/x86/mtrr/main.c	Tue May 31 22:30:52 2005 +0000
     2.3 @@ -33,7 +33,7 @@
     2.4  
     2.5  #include <xen/config.h>
     2.6  #include <xen/init.h>
     2.7 -#include <xen/slab.h>
     2.8 +#include <xen/lib.h>
     2.9  #include <xen/smp.h>
    2.10  #include <xen/spinlock.h>
    2.11  #include <asm/mtrr.h>

     3.1 --- a/xen/arch/x86/setup.c	Tue May 31 22:15:40 2005 +0000
     3.2 +++ b/xen/arch/x86/setup.c	Tue May 31 22:30:52 2005 +0000
     3.3 @@ -3,6 +3,7 @@
     3.4  #include <xen/init.h>
     3.5  #include <xen/lib.h>
     3.6  #include <xen/sched.h>
     3.7 +#include <xen/domain.h>
     3.8  #include <xen/serial.h>
     3.9  #include <xen/softirq.h>
    3.10  #include <xen/acpi.h>

     4.1 --- a/xen/common/dom0_ops.c	Tue May 31 22:15:40 2005 +0000
     4.2 +++ b/xen/common/dom0_ops.c	Tue May 31 22:30:52 2005 +0000
     4.3 @@ -12,6 +12,7 @@
     4.4  #include <xen/mm.h>
     4.5  #include <public/dom0_ops.h>
     4.6  #include <xen/sched.h>
     4.7 +#include <xen/domain.h>
     4.8  #include <xen/event.h>
     4.9  #include <asm/domain_page.h>
    4.10  #include <xen/trace.h>

     5.1 --- a/xen/common/domain.c	Tue May 31 22:15:40 2005 +0000
     5.2 +++ b/xen/common/domain.c	Tue May 31 22:30:52 2005 +0000
     5.3 @@ -10,6 +10,7 @@
     5.4  #include <xen/sched.h>
     5.5  #include <xen/errno.h>
     5.6  #include <xen/sched.h>
     5.7 +#include <xen/domain.h>
     5.8  #include <xen/mm.h>
     5.9  #include <xen/event.h>
    5.10  #include <xen/time.h>

     6.1 --- a/xen/common/grant_table.c	Tue May 31 22:15:40 2005 +0000
     6.2 +++ b/xen/common/grant_table.c	Tue May 31 22:30:52 2005 +0000
     6.3 @@ -26,6 +26,7 @@
     6.4  #define GRANT_DEBUG_VERBOSE 0
     6.5  
     6.6  #include <xen/config.h>
     6.7 +#include <xen/lib.h>
     6.8  #include <xen/sched.h>
     6.9  #include <xen/shadow.h>
    6.10  #include <xen/mm.h>

     7.1 --- a/xen/common/keyhandler.c	Tue May 31 22:15:40 2005 +0000
     7.2 +++ b/xen/common/keyhandler.c	Tue May 31 22:30:52 2005 +0000
     7.3 @@ -10,6 +10,7 @@
     7.4  #include <xen/serial.h>
     7.5  #include <xen/sched.h>
     7.6  #include <xen/softirq.h>
     7.7 +#include <xen/domain.h>
     7.8  #include <asm/debugger.h>
     7.9  
    7.10  #define KEY_MAX 256

     8.1 --- a/xen/common/schedule.c	Tue May 31 22:15:40 2005 +0000
     8.2 +++ b/xen/common/schedule.c	Tue May 31 22:30:52 2005 +0000
     8.3 @@ -26,6 +26,7 @@
     8.4  #include <xen/init.h>
     8.5  #include <xen/lib.h>
     8.6  #include <xen/sched.h>
     8.7 +#include <xen/domain.h>
     8.8  #include <xen/delay.h>
     8.9  #include <xen/event.h>
    8.10  #include <xen/time.h>

     9.1 --- a/xen/include/xen/lib.h	Tue May 31 22:15:40 2005 +0000
     9.2 +++ b/xen/include/xen/lib.h	Tue May 31 22:30:52 2005 +0000
     9.3 @@ -5,6 +5,7 @@
     9.4  #include <stdarg.h>
     9.5  #include <xen/config.h>
     9.6  #include <xen/types.h>
     9.7 +#include <xen/slab.h>
     9.8  #include <xen/string.h>
     9.9  
    9.10  #define BUG() do {					\

    10.1 --- a/xen/include/xen/sched.h	Tue May 31 22:15:40 2005 +0000
    10.2 +++ b/xen/include/xen/sched.h	Tue May 31 22:30:52 2005 +0000
    10.3 @@ -409,9 +409,6 @@ static inline void exec_domain_unblock(s
    10.4  
    10.5  #define VM_ASSIST(_d,_t) (test_bit((_t), &(_d)->vm_assist))
    10.6  
    10.7 -#include <xen/slab.h>
    10.8 -#include <xen/domain.h>
    10.9 -
   10.10  #endif /* __SCHED_H__ */
   10.11  
   10.12  /*

    11.1 --- a/xen/include/xen/slab.h	Tue May 31 22:15:40 2005 +0000
    11.2 +++ b/xen/include/xen/slab.h	Tue May 31 22:30:52 2005 +0000
    11.3 @@ -2,9 +2,6 @@
    11.4  #ifndef __SLAB_H__
    11.5  #define __SLAB_H__
    11.6  
    11.7 -#include <xen/config.h>
    11.8 -#include <xen/mm.h>
    11.9 -
   11.10  /* Allocate space for typed object. */
   11.11  #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))
   11.12