diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S
index c112fa909adf..7dc5d1d93842 100644
--- a/sys/amd64/amd64/xen-locore.S
+++ b/sys/amd64/amd64/xen-locore.S
@@ -38,7 +38,7 @@
 
 #include <xen/xen-os.h>
 #define __ASSEMBLY__
-#include <xen/interface/elfnote.h>
+#include <contrib/xen/elfnote.h>
 
 #include "assym.inc"
 
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index 4470cc59a29a..792933402c93 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -80,8 +80,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/gnttab.h>
 #include <xen/xen_intr.h>
 
-#include <xen/interface/event_channel.h>
-#include <xen/interface/grant_table.h>
+#include <contrib/xen/event_channel.h>
+#include <contrib/xen/grant_table.h>
 
 #include <xen/xenbus/xenbusvar.h>
 
@@ -1280,7 +1280,7 @@ xbb_get_resources(struct xbb_softc *xbb, struct xbb_xen_reqlist **reqlist,
  * \param xbb     Per-instance xbb configuration structure.
  * \param req     The request structure to which to respond.
  * \param status  The status code to report.  See BLKIF_RSP_*
- *                in sys/xen/interface/io/blkif.h.
+ *                in sys/contrib/xen/io/blkif.h.
  */
 static void
 xbb_queue_response(struct xbb_softc *xbb, struct xbb_xen_req *req, int status)
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 72498620764b..3219c26222aa 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/gnttab.h>
-#include <xen/interface/grant_table.h>
-#include <xen/interface/io/protocols.h>
+#include <contrib/xen/grant_table.h>
+#include <contrib/xen/io/protocols.h>
 #include <xen/xenbus/xenbusvar.h>
 
 #include <machine/_inttypes.h>
diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c
index c26b741c37fe..27da02723dc3 100644
--- a/sys/dev/xen/console/xen_console.c
+++ b/sys/dev/xen/console/xen_console.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
-#include <xen/interface/io/console.h>
+#include <contrib/xen/io/console.h>
 
 #include "opt_ddb.h"
 #include "opt_printf.h"
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index b42b52a62411..903864d84598 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -148,8 +148,8 @@ __FBSDID("$FreeBSD$");
 
 #include <xen/hvm.h>
 
-#include <xen/interface/event_channel.h>
-#include <xen/interface/grant_table.h>
+#include <contrib/xen/event_channel.h>
+#include <contrib/xen/grant_table.h>
 
 #include <xen/xenbus/xenbusvar.h>
 
diff --git a/sys/dev/xen/efi/pvefi.c b/sys/dev/xen/efi/pvefi.c
index 65778b7bcee1..77557692cbf1 100644
--- a/sys/dev/xen/efi/pvefi.c
+++ b/sys/dev/xen/efi/pvefi.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/error.h>
 #include <xen/hypervisor.h>
 
-#include <xen/interface/platform.h>
+#include <contrib/xen/platform.h>
 
 extern char bootmethod[16];
 
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 8de4e11c61d9..bf54f3a2f28e 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
-#include <xen/interface/io/netif.h>
+#include <contrib/xen/io/netif.h>
 #include <xen/xenbus/xenbusvar.h>
 
 /*--------------------------- Compile-time Tunables --------------------------*/
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index 8dba5a8dc6d5..facab6550ca3 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/gnttab.h>
-#include <xen/interface/memory.h>
-#include <xen/interface/io/netif.h>
+#include <contrib/xen/memory.h>
+#include <contrib/xen/io/netif.h>
 #include <xen/xenbus/xenbusvar.h>
 
 #include "xenbus_if.h"
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index ecd4e0990652..fb646d8f0536 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/features.h>
 #include <xen/xen_intr.h>
 #include <xen/hypervisor.h>
-#include <xen/interface/io/xenbus.h>
-#include <xen/interface/vcpu.h>
+#include <contrib/xen/io/xenbus.h>
+#include <contrib/xen/vcpu.h>
 #include <xen/error.h>
 
 #include <machine/cpu.h>
diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c
index d09fd22f4eb1..534cb65ca152 100644
--- a/sys/dev/xen/xenstore/xenstore.c
+++ b/sys/dev/xen/xenstore/xenstore.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 
-#include <xen/interface/hvm/params.h>
+#include <contrib/xen/hvm/params.h>
 #include <xen/hvm.h>
 
 #include <xen/xenstore/xenstorevar.h>
diff --git a/sys/i386/include/xen/hypercall.h b/sys/i386/include/xen/hypercall.h
index 78052fac9355..4002aac58d84 100644
--- a/sys/i386/include/xen/hypercall.h
+++ b/sys/i386/include/xen/hypercall.h
@@ -31,8 +31,8 @@
 #define __HYPERCALL_H__
 
 #include <sys/systm.h>
-#include <xen/interface/xen.h>
-#include <xen/interface/sched.h>
+#include <contrib/xen/xen.h>
+#include <contrib/xen/sched.h>
 
 extern char *hypercall_page;
 
diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c
index 6eb16c3098fd..544b6e6439e8 100644
--- a/sys/x86/xen/hvm.c
+++ b/sys/x86/xen/hvm.c
@@ -58,9 +58,9 @@ __FBSDID("$FreeBSD$");
 #include <xen/hvm.h>
 #include <xen/xen_intr.h>
 
-#include <xen/interface/arch-x86/cpuid.h>
-#include <xen/interface/hvm/params.h>
-#include <xen/interface/vcpu.h>
+#include <contrib/xen/arch-x86/cpuid.h>
+#include <contrib/xen/hvm/params.h>
+#include <contrib/xen/vcpu.h>
 
 /*--------------------------- Forward Declarations ---------------------------*/
 static void xen_hvm_cpu_init(void);
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c
index e0c88992390e..c5d7629d0bc5 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -75,8 +75,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/xenstore/xenstorevar.h>
 #include <xen/xen_pv.h>
 
-#include <xen/interface/arch-x86/hvm/start_info.h>
-#include <xen/interface/vcpu.h>
+#include <contrib/xen/arch-x86/hvm/start_info.h>
+#include <contrib/xen/vcpu.h>
 
 #include <dev/xen/timer/timer.h>
 
diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c
index 77268d5f9846..3b7c220126fa 100644
--- a/sys/x86/xen/xen_apic.c
+++ b/sys/x86/xen/xen_apic.c
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <xen/hvm.h>
 #include <xen/xen_intr.h>
 
-#include <xen/interface/arch-x86/cpuid.h>
-#include <xen/interface/vcpu.h>
+#include <contrib/xen/arch-x86/cpuid.h>
+#include <contrib/xen/vcpu.h>
 
 /*--------------------------- Forward Declarations ---------------------------*/
 static driver_filter_t xen_smp_rendezvous_action;
diff --git a/sys/xen/blkif.h b/sys/xen/blkif.h
index 721bb93c3c48..abc321795516 100644
--- a/sys/xen/blkif.h
+++ b/sys/xen/blkif.h
@@ -23,9 +23,9 @@
 #ifndef __XEN_BLKIF_H__
 #define __XEN_BLKIF_H__
 
-#include <xen/interface/io/ring.h>
-#include <xen/interface/io/blkif.h>
-#include <xen/interface/io/protocols.h>
+#include <contrib/xen/io/ring.h>
+#include <contrib/xen/io/blkif.h>
+#include <contrib/xen/io/protocols.h>
 
 /* Not a real protocol.  Used to generate ring structs which contain
  * the elements common to all protocols only.  This way we get a
diff --git a/sys/xen/error.h b/sys/xen/error.h
index 6f25b0ab491a..245281604aca 100644
--- a/sys/xen/error.h
+++ b/sys/xen/error.h
@@ -29,7 +29,7 @@
 #ifndef __XEN_ERROR_H__
 #define __XEN_ERROR_H__
 
-#include <xen/interface/errno.h>
+#include <contrib/xen/errno.h>
 
 /* Translation table */
 static int xen_errors[] =
diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h
index c7c38df34a00..1f78755115ac 100644
--- a/sys/xen/evtchn/evtchnvar.h
+++ b/sys/xen/evtchn/evtchnvar.h
@@ -35,7 +35,7 @@
 #define __XEN_EVTCHN_EVTCHNVAR_H__
 
 #include <xen/hypervisor.h>
-#include <xen/interface/event_channel.h>
+#include <contrib/xen/event_channel.h>
 
 enum evtchn_type {
 	EVTCHN_TYPE_UNBOUND,
diff --git a/sys/xen/features.h b/sys/xen/features.h
index b4cce2fd4b1b..fa3c323d9b34 100644
--- a/sys/xen/features.h
+++ b/sys/xen/features.h
@@ -9,7 +9,7 @@
 #ifndef __ASM_XEN_FEATURES_H__
 #define __ASM_XEN_FEATURES_H__
 
-#include <xen/interface/version.h>
+#include <contrib/xen/version.h>
 
 extern void setup_xen_features(void);
 
diff --git a/sys/xen/gnttab.h b/sys/xen/gnttab.h
index 7d1f71fbee0d..d85f882c0c4b 100644
--- a/sys/xen/gnttab.h
+++ b/sys/xen/gnttab.h
@@ -41,7 +41,7 @@
 #include <xen/hypervisor.h>
 #include <xen/features.h>
 
-#include <xen/interface/grant_table.h>
+#include <contrib/xen/grant_table.h>
 
 #define GNTTAB_LIST_END GRANT_REF_INVALID
 
diff --git a/sys/xen/hvm.h b/sys/xen/hvm.h
index e34a552dc714..5ed31849f959 100644
--- a/sys/xen/hvm.h
+++ b/sys/xen/hvm.h
@@ -26,12 +26,12 @@
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 
-#include <xen/interface/hvm/params.h>
+#include <contrib/xen/hvm/params.h>
 
 /**
  * \brief Wrapper function to obtain a HVM parameter value.
  *
- * \param index	HVM parameter index; see <xen/interface/hvm/params.h>.
+ * \param index	HVM parameter index; see <contrib/xen/hvm/params.h>.
  * 
  * \returns	0 on failure; the value of the parameter otherwise.
  */
diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h
index 2be61597fc18..c42956d253c2 100644
--- a/sys/xen/hypervisor.h
+++ b/sys/xen/hypervisor.h
@@ -13,14 +13,14 @@
 
 #include <sys/cdefs.h>
 #include <sys/systm.h>
-#include <xen/interface/xen.h>
-#include <xen/interface/platform.h>
-#include <xen/interface/event_channel.h>
-#include <xen/interface/physdev.h>
-#include <xen/interface/sched.h>
-#include <xen/interface/callback.h>
-#include <xen/interface/memory.h>
-#include <xen/interface/hvm/dm_op.h>
+#include <contrib/xen/xen.h>
+#include <contrib/xen/platform.h>
+#include <contrib/xen/event_channel.h>
+#include <contrib/xen/physdev.h>
+#include <contrib/xen/sched.h>
+#include <contrib/xen/callback.h>
+#include <contrib/xen/memory.h>
+#include <contrib/xen/hvm/dm_op.h>
 #include <machine/xen/hypercall.h>
 
 extern uint64_t get_system_time(int ticks);
diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h
index 988da24dc878..183724be9749 100644
--- a/sys/xen/xen-os.h
+++ b/sys/xen/xen-os.h
@@ -38,11 +38,11 @@
 #define __ASSEMBLY__
 #endif
 
-#include <xen/interface/xen.h>
+#include <contrib/xen/xen.h>
 
 #ifndef __ASSEMBLY__
 #include <xen/hvm.h>
-#include <xen/interface/event_channel.h>
+#include <contrib/xen/event_channel.h>
 
 static inline vm_paddr_t
 xen_get_xenstore_mfn(void)
diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h
index 6725fa9e0399..5ebce0678222 100644
--- a/sys/xen/xen_intr.h
+++ b/sys/xen/xen_intr.h
@@ -33,7 +33,7 @@
 #ifndef _XEN_INTR_H_
 #define _XEN_INTR_H_
 
-#include <xen/interface/event_channel.h>
+#include <contrib/xen/event_channel.h>
 
 /** Registered Xen interrupt callback handle. */
 typedef void * xen_intr_handle_t;
diff --git a/sys/xen/xenbus/xenbusvar.h b/sys/xen/xenbus/xenbusvar.h
index bea65fff8e5a..b2957880b187 100644
--- a/sys/xen/xenbus/xenbusvar.h
+++ b/sys/xen/xenbus/xenbusvar.h
@@ -45,9 +45,9 @@
 #include <machine/stdarg.h>
 
 #include <xen/xen-os.h>
-#include <xen/interface/grant_table.h>
-#include <xen/interface/io/xenbus.h>
-#include <xen/interface/io/xs_wire.h>
+#include <contrib/xen/grant_table.h>
+#include <contrib/xen/io/xenbus.h>
+#include <contrib/xen/io/xs_wire.h>
 
 #include <xen/xenstore/xenstorevar.h>
 
diff --git a/sys/xen/xenstore/xenstorevar.h b/sys/xen/xenstore/xenstorevar.h
index 98d60f2646d2..d9b40dfd5f3d 100644
--- a/sys/xen/xenstore/xenstorevar.h
+++ b/sys/xen/xenstore/xenstorevar.h
@@ -43,9 +43,9 @@
 #include <machine/stdarg.h>
 
 #include <xen/xen-os.h>
-#include <xen/interface/grant_table.h>
-#include <xen/interface/io/xenbus.h>
-#include <xen/interface/io/xs_wire.h>
+#include <contrib/xen/grant_table.h>
+#include <contrib/xen/io/xenbus.h>
+#include <contrib/xen/io/xs_wire.h>
 
 #include "xenbus_if.h"