5 files changed, 5 insertions, 8 deletions
diff --git a/xen/arch/x86/x86_32/seg_fixup.c b/xen/arch/x86/x86_32/seg_fixup.c
index e465879e41..6b9ec395bb 100644
--- a/xen/arch/x86/x86_32/seg_fixup.c
+++ b/xen/arch/x86/x86_32/seg_fixup.c
@@ -28,6 +28,7 @@
 #include <xen/mm.h>
 #include <xen/perfc.h>
 #include <asm/processor.h>
+#include <asm/regs.h>
 #include <asm/x86_emulate.h>
 
 /* Make the scary benign errors go away. */
diff --git a/xen/arch/x86/x86_32/usercopy.c b/xen/arch/x86/x86_32/usercopy.c
index f26d916bab..c05ffd429d 100644
--- a/xen/arch/x86/x86_32/usercopy.c
+++ b/xen/arch/x86/x86_32/usercopy.c
@@ -5,8 +5,9 @@
  * Copyright 1997 Andi Kleen <ak@muc.de>
  * Copyright 1997 Linus Torvalds
  */
+
 #include <xen/config.h>
-#include <xen/mm.h>
+#include <xen/lib.h>
 #include <asm/uaccess.h>
 
 static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
diff --git a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c
index e96eb94d4d..685cd7b1a3 100644
--- a/xen/arch/x86/x86_64/usercopy.c
+++ b/xen/arch/x86/x86_64/usercopy.c
@@ -6,7 +6,8 @@
  * Copyright 2002 Andi Kleen <ak@suse.de>
  */
 
-#include <xen/string.h>
+#include <xen/config.h>
+#include <xen/lib.h>
 #include <asm/uaccess.h>
 
 /*
diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index bb9a09c439..126f3591ab 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -12,7 +12,6 @@
 
 #ifndef __ASSEMBLY__
 # include <asm/types.h>
-# include <xen/lib.h>
 #endif
 
 #if defined(__i386__)
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index bca07fe1e4..281e830451 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -6,7 +6,6 @@
 #include <xen/types.h>
 #include <xen/spinlock.h>
 #include <xen/cache.h>
-#include <asm/regs.h>
 #include <xen/smp.h>
 #include <asm/page.h>
 #include <asm/processor.h>
@@ -167,8 +166,6 @@ struct domain_setup_info
     unsigned int xen_elf_image;
 };
 
-#include <asm/uaccess.h> /* for KERNEL_DS */
-
 extern struct domain idle0_domain;
 extern struct vcpu idle0_vcpu;
 
@@ -275,8 +272,6 @@ extern void context_switch(
 extern void continue_running(
     struct vcpu *same);
 
-void domain_init(void);
-
 int idle_cpu(int cpu); /* Is CPU 'cpu' idle right now? */
 
 void startup_cpu_idle_loop(void);