Index: sys/x86/include/xen/xen-os.h
===================================================================
--- sys/x86/include/xen/xen-os.h
+++ sys/x86/include/xen/xen-os.h
@@ -30,6 +30,10 @@
 #ifndef _MACHINE_X86_XEN_XEN_OS_H_
 #define _MACHINE_X86_XEN_XEN_OS_H_
 
+#ifndef _XEN_XEN_OS_H_
+#error "do not #include machine/xen/xen-os.h, #include xen/xen-os.h instead"
+#endif
+
 /* x86 needs write-back as its mode */
 #define VM_MEMATTR_XEN VM_MEMATTR_WRITE_BACK
 
Index: sys/x86/xen/xen_intr.c
===================================================================
--- sys/x86/xen/xen_intr.c
+++ sys/x86/xen/xen_intr.c
@@ -57,7 +57,6 @@
 #include <machine/stdarg.h>
 
 #include <machine/xen/synch_bitops.h>
-#include <machine/xen/xen-os.h>
 
 #include <xen/xen-os.h>
 #include <xen/hvm.h>
Index: sys/xen/xen-os.h
===================================================================
--- sys/xen/xen-os.h
+++ sys/xen/xen-os.h
@@ -86,12 +86,6 @@
 
 	return (hypervisor_info.get_start_flags());
 }
-#endif
-
-#include <machine/xen/xen-os.h>
-
-/* Everything below this point is not included by assembler (.S) files. */
-#ifndef __ASSEMBLY__
 
 extern shared_info_t *HYPERVISOR_shared_info;
 
@@ -132,6 +126,12 @@
 
 	return (xen_domain() && (xen_get_start_flags() & SIF_INITDOMAIN) != 0);
 }
+#endif
+
+#include <machine/xen/xen-os.h>
+
+/* Everything below this point is not included by assembler (.S) files. */
+#ifndef __ASSEMBLY__
 
 /*
  * Based on ofed/include/linux/bitops.h