diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -52,6 +52,7 @@
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
 #include <machine/trap.h>
+#include <sys/intr.h>
 
 #ifdef KDTRACE_HOOKS
 	.bss
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -28,11 +28,9 @@
  */
 
 #include <sys/param.h>
-#include <sys/bus.h>
 #include <sys/cpuset.h>
 #include <sys/systm.h>
 #include <sys/assym.h>
-#include <sys/intr.h>
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
@@ -131,8 +129,6 @@
 ASSYM(ICACHE_LINE_SIZE, offsetof(struct cpuinfo, icache_line_size));
 ASSYM(ICACHE_LINE_MASK, offsetof(struct cpuinfo, icache_line_mask));
 
-ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ);
-
 /*
  * Emit the LOCORE_MAP_MB option as a #define only if the option was set.
  */
diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S
--- a/sys/arm64/arm64/exception.S
+++ b/sys/arm64/arm64/exception.S
@@ -31,6 +31,7 @@
 #include <machine/armreg.h>
 
 #include "assym.inc"
+#include <sys/intr.h>
 
 	.text
 
diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c
--- a/sys/arm64/arm64/genassym.c
+++ b/sys/arm64/arm64/genassym.c
@@ -28,8 +28,6 @@
 
 #include <sys/param.h>
 #include <sys/assym.h>
-#include <sys/bus.h>
-#include <sys/intr.h>
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 
@@ -85,6 +83,3 @@
 ASSYM(TF_SPSR, offsetof(struct trapframe, tf_spsr));
 ASSYM(TF_ESR, offsetof(struct trapframe, tf_esr));
 ASSYM(TF_X, offsetof(struct trapframe, tf_x));
-
-ASSYM(INTR_ROOT_IRQ, INTR_ROOT_IRQ);
-ASSYM(INTR_ROOT_FIQ, INTR_ROOT_FIQ);
diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c
--- a/sys/riscv/riscv/genassym.c
+++ b/sys/riscv/riscv/genassym.c
@@ -38,7 +38,6 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/vmmeter.h>
-#include <sys/bus.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
@@ -51,7 +50,6 @@
 #include <machine/proc.h>
 #include <machine/cpufunc.h>
 #include <machine/pte.h>
-#include <machine/intr.h>
 #include <machine/machdep.h>
 #include <machine/vmparam.h>