1.1 --- a/xen/arch/x86/i8259.c	Wed Nov 24 11:34:32 2004 +0000
     1.2 +++ b/xen/arch/x86/i8259.c	Wed Nov 24 13:37:40 2004 +0000
     1.3 @@ -7,6 +7,7 @@
     1.4  
     1.5  #include <xen/config.h>
     1.6  #include <xen/init.h>
     1.7 +#include <xen/types.h>
     1.8  #include <asm/regs.h>
     1.9  #include <xen/errno.h>
    1.10  #include <xen/sched.h>

     2.1 --- a/xen/include/asm-x86/x86_32/regs.h	Wed Nov 24 11:34:32 2004 +0000
     2.2 +++ b/xen/include/asm-x86/x86_32/regs.h	Wed Nov 24 13:37:40 2004 +0000
     2.3 @@ -1,8 +1,6 @@
     2.4  #ifndef _I386_REGS_H
     2.5  #define _I386_REGS_H
     2.6  
     2.7 -#include <xen/types.h>
     2.8 -
     2.9  struct xen_regs
    2.10  {
    2.11      /* All saved activations contain the following fields. */

     3.1 --- a/xen/include/xen/keyhandler.h	Wed Nov 24 11:34:32 2004 +0000
     3.2 +++ b/xen/include/xen/keyhandler.h	Wed Nov 24 13:37:40 2004 +0000
     3.3 @@ -10,7 +10,7 @@
     3.4  #ifndef __XEN_KEYHANDLER_H__
     3.5  #define __XEN_KEYHANDLER_H__
     3.6  
     3.7 -#include <asm/regs.h>
     3.8 +struct xen_regs;
     3.9  
    3.10  /*
    3.11   * Register a callback function for key @key. The callback occurs in