diff --git a/sys/conf/files b/sys/conf/files
index 9800c016532c..6c7c6520d72a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3482,6 +3482,7 @@ dev/xdma/xdma_sglist.c		optional xdma
 dev/xen/balloon/balloon.c	optional xenhvm
 dev/xen/blkfront/blkfront.c	optional xenhvm
 dev/xen/blkback/blkback.c	optional xenhvm
+dev/xen/bus/xen_intr.c		optional xenhvm
 dev/xen/bus/xenpv.c		optional xenhvm
 dev/xen/console/xen_console.c	optional xenhvm
 dev/xen/control/control.c	optional xenhvm
diff --git a/sys/conf/files.x86 b/sys/conf/files.x86
index 54f6e8c8260a..2e7ce6c00b3b 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -345,6 +345,5 @@ x86/x86/tsc.c			standard
 x86/x86/ucode.c			standard
 x86/x86/delay.c			standard
 x86/xen/hvm.c			optional	xenhvm
-x86/xen/xen_intr.c		optional	xenhvm
 x86/xen/xen_apic.c		optional	xenhvm smp
 x86/xen/xen_arch_intr.c		optional	xenhvm
diff --git a/sys/x86/xen/xen_intr.c b/sys/dev/xen/bus/xen_intr.c
similarity index 100%
rename from sys/x86/xen/xen_intr.c
rename to sys/dev/xen/bus/xen_intr.c