diff -r e17faaa612f0 xen/include/asm-x86/guest_access.h
--- a/xen/include/asm-x86/guest_access.h	Wed Sep 03 12:02:37 2008 +0100
+++ b/xen/include/asm-x86/guest_access.h	Wed Sep 03 12:02:39 2008 +0100
@@ -8,7 +8,7 @@
 #define __ASM_X86_GUEST_ACCESS_H__
 
 #include <asm/uaccess.h>
-#include <asm/shadow.h>
+#include <asm/paging.h>
 #include <asm/hvm/support.h>
 #include <asm/hvm/guest_access.h>
 
@@ -87,10 +87,10 @@
  * Allows use of faster __copy_* functions.
  */
 #define guest_handle_okay(hnd, nr)                      \
-    (shadow_mode_external(current->domain) ||           \
+    (paging_mode_external(current->domain) ||           \
      array_access_ok((hnd).p, (nr), sizeof(*(hnd).p)))
 #define guest_handle_subrange_okay(hnd, first, last)    \
-    (shadow_mode_external(current->domain) ||           \
+    (paging_mode_external(current->domain) ||           \
      array_access_ok((hnd).p + (first),                 \
                      (last)-(first)+1,                  \
                      sizeof(*(hnd).p)))
diff -r e17faaa612f0 xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c	Wed Sep 03 12:02:37 2008 +0100
+++ b/xen/arch/x86/domctl.c	Wed Sep 03 12:02:39 2008 +0100
@@ -20,7 +20,7 @@
 #include <xen/trace.h>
 #include <xen/console.h>
 #include <xen/iocap.h>
-#include <asm/paging.h>
+#include <xen/paging.h>
 #include <asm/irq.h>
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
diff -r e17faaa612f0 xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c	Wed Sep 03 12:02:37 2008 +0100
+++ b/xen/arch/x86/domain_build.c	Wed Sep 03 12:03:03 2008 +0100
@@ -26,6 +26,7 @@
 #include <asm/desc.h>
 #include <asm/i387.h>
 #include <asm/paging.h>
+#include <asm/p2m.h>
 #include <asm/e820.h>
 
 #include <public/version.h>
diff -r 2c777e37871b xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c	Wed Sep 03 12:03:23 2008 +0100
+++ b/xen/arch/x86/domain.c	Wed Sep 03 13:49:26 2008 +0100
@@ -31,6 +31,7 @@
 #include <xen/compat.h>
 #include <xen/acpi.h>
 #include <xen/pci.h>
+#include <xen/paging.h>
 #include <asm/regs.h>
 #include <asm/mc146818rtc.h>
 #include <asm/system.h>
@@ -40,7 +41,6 @@
 #include <asm/i387.h>
 #include <asm/mpspec.h>
 #include <asm/ldt.h>
-#include <asm/paging.h>
 #include <asm/hypercall.h>
 #include <asm/hvm/hvm.h>
 #include <asm/hvm/support.h>
diff -r 2c777e37871b xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c	Wed Sep 03 12:03:23 2008 +0100
+++ b/xen/arch/x86/hvm/hvm.c	Wed Sep 03 13:51:32 2008 +0100
@@ -31,10 +31,11 @@
 #include <xen/hypercall.h>
 #include <xen/guest_access.h>
 #include <xen/event.h>
+#include <xen/paging.h>
+#include <asm/shadow.h>
 #include <asm/current.h>
 #include <asm/e820.h>
 #include <asm/io.h>
-#include <asm/paging.h>
 #include <asm/regs.h>
 #include <asm/cpufeature.h>
 #include <asm/processor.h>
diff -r 2c777e37871b xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c	Wed Sep 03 12:03:23 2008 +0100
+++ b/xen/arch/x86/mm/hap/hap.c	Wed Sep 03 13:52:22 2008 +0100
@@ -37,6 +37,7 @@
 #include <asm/shared.h>
 #include <asm/hap.h>
 #include <asm/paging.h>
+#include <asm/p2m.h>
 #include <asm/domain.h>
 #include <xen/numa.h>
 
diff -r 2c777e37871b xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c	Wed Sep 03 12:03:23 2008 +0100
+++ b/xen/arch/x86/traps.c	Wed Sep 03 13:49:12 2008 +0100
@@ -47,7 +47,7 @@
 #include <xen/version.h>
 #include <xen/kexec.h>
 #include <xen/trace.h>
-#include <asm/paging.h>
+#include <xen/paging.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/atomic.h>