From b7da32e645a9f62fcd396b03aa67e418b907c6fb Mon Sep 17 00:00:00 2001
From: Elliott Mitchell <ehem+freebsd@m5p.com>
Date: Wed, 8 Jun 2022 15:58:22 -0700
Subject: [PATCH] intrcompat: replace many interrupt header includes with
 <machine/interrupt.h>

Referencing anything other than the fully compatible header is risky.
Many of these will be expected to break due to lacking later
compatibility adjustments.  Avoid direct #include of headers besides
<machine/interrupt.h>.

Differential Revision: https://reviews.freebsd.org/D35559
---
 sys/arm/annapurna/alpine/alpine_pci.c                | 1 -
 sys/arm/arm/busdma_machdep.c                         | 2 +-
 sys/arm/arm/nexus.c                                  | 3 +--
 sys/arm/broadcom/bcm2835/bcm2835_gpio.c              | 3 +--
 sys/arm/broadcom/bcm2835/bcm2838_pci.c               | 2 --
 sys/arm/mv/gpio.c                                    | 4 ++--
 sys/arm64/arm64/busdma_bounce.c                      | 2 +-
 sys/arm64/arm64/gic_v3.c                             | 3 +--
 sys/arm64/arm64/nexus.c                              | 3 +--
 sys/arm64/rockchip/rk3568_pcie.c                     | 2 --
 sys/cam/mmc/mmc_xpt.c                                | 2 +-
 sys/compat/linuxkpi/common/include/linux/hardirq.h   | 3 ++-
 sys/compat/linuxkpi/common/include/linux/interrupt.h | 3 ++-
 sys/compat/linuxkpi/common/src/linux_kthread.c       | 3 ++-
 sys/dev/acpica/acpi_apei.c                           | 3 ++-
 sys/dev/acpica/acpivar.h                             | 6 +++---
 sys/dev/amdgpio/amdgpio.c                            | 2 +-
 sys/dev/gpio/gpiobus.c                               | 3 ---
 sys/dev/gpio/gpiobusvar.h                            | 3 ++-
 sys/dev/gpio/pl061.c                                 | 1 -
 sys/dev/hyperv/pcib/vmbus_pcib.c                     | 2 +-
 sys/dev/iommu/busdma_iommu.c                         | 5 +++--
 sys/dev/iommu/iommu_gas.c                            | 2 +-
 sys/dev/mfi/mfi.c                                    | 2 +-
 sys/dev/mlx5/mlx5_en/en_rl.h                         | 3 ++-
 sys/dev/ntb/ntb_hw/ntb_hw_intel.c                    | 1 -
 sys/dev/ntb/ntb_hw/ntb_hw_plx.c                      | 1 -
 sys/dev/ofw/ofw_bus_subr.h                           | 2 +-
 sys/dev/pci/pci_host_generic_fdt.c                   | 4 ++--
 sys/dev/ppc/ppc.c                                    | 2 +-
 sys/dev/proto/proto_core.c                           | 3 ++-
 sys/dev/qat/qat_common/adf_vf_isr.c                  | 2 +-
 sys/dev/uart/uart_core.c                             | 5 +++--
 sys/dev/uart/uart_tty.c                              | 3 ++-
 sys/dev/usb/usb_process.h                            | 3 ++-
 sys/dev/wdatwd/wdatwd.c                              | 4 +++-
 sys/dev/xen/bus/xen_intr.c                           | 2 +-
 sys/kern/kern_clock.c                                | 3 ++-
 sys/kern/kern_cpuset.c                               | 3 ++-
 sys/kern/kern_intr.c                                 | 2 +-
 sys/kern/kern_timeout.c                              | 3 ++-
 sys/kern/pic_if.m                                    | 3 ++-
 sys/kern/subr_intr.c                                 | 3 +--
 sys/kern/subr_taskqueue.c                            | 3 ++-
 sys/net/if_epair.c                                   | 3 ++-
 sys/net/netisr.c                                     | 3 ++-
 sys/netinet/tcp_hpts.c                               | 3 ++-
 sys/netpfil/pf/if_pfsync.c                           | 3 ++-
 sys/netpfil/pf/pf.c                                  | 3 ++-
 sys/netpfil/pf/pf_ioctl.c                            | 3 ++-
 sys/netpfil/pf/pflow.c                               | 3 ++-
 sys/powerpc/powerpc/busdma_machdep.c                 | 2 +-
 sys/powerpc/powerpc/clock.c                          | 1 -
 sys/powerpc/powerpc/interrupt.c                      | 1 -
 sys/powerpc/powerpc/intr_machdep.c                   | 1 -
 sys/riscv/riscv/busdma_bounce.c                      | 4 ++--
 sys/riscv/riscv/intc.c                               | 3 +--
 sys/riscv/riscv/nexus.c                              | 3 +--
 sys/x86/iommu/intel_ctx.c                            | 2 +-
 sys/x86/iommu/intel_idpgtbl.c                        | 2 +-
 sys/x86/isa/atpic.c                                  | 1 -
 sys/x86/x86/busdma_bounce.c                          | 2 +-
 sys/x86/x86/intr_machdep.c                           | 1 -
 sys/x86/x86/mca.c                                    | 1 -
 sys/x86/x86/mp_x86.c                                 | 2 +-
 sys/x86/x86/msi.c                                    | 1 -
 sys/x86/x86/nexus.c                                  | 1 -
 sys/x86/xen/xen_arch_intr.c                          | 3 ++-
 68 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/sys/arm/annapurna/alpine/alpine_pci.c b/sys/arm/annapurna/alpine/alpine_pci.c
index 4d2a1ad36a62c9..6d55ffc2c2320b 100644
--- a/sys/arm/annapurna/alpine/alpine_pci.c
+++ b/sys/arm/annapurna/alpine/alpine_pci.c
@@ -36,7 +36,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index 99a72c9e79d0ca..85e5e254c08661 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -38,7 +38,6 @@
 #include <sys/bus.h>
 #include <sys/busdma_bufalloc.h>
 #include <sys/counter.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -59,6 +58,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 //#define ARM_BUSDMA_MAPLOAD_STATS
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 8274a792839d8e..346e54447129b6 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -42,7 +42,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -53,7 +52,7 @@
 
 #include <machine/bus.h>
 #include <machine/pcb.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index d245e677ec7d79..640d01fdbeadba 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
@@ -44,7 +43,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/fdt/fdt_pinctrl.h>
 #include <dev/gpio/gpiobusvar.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
index 0f41dcff37ca41..f3704965493cad 100644
--- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 #include <sys/mutex.h>
 
 #include <dev/ofw/openfirm.h>
@@ -47,7 +46,6 @@
 #include <dev/pci/pcib_private.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
 #include "pcib_if.h"
 #include "msi_if.h"
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index 6622abb3eb4d97..c06cde157aa9be 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -36,7 +36,6 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
@@ -45,8 +44,9 @@
 #include <sys/timetc.h>
 #include <sys/callout.h>
 #include <sys/gpio.h>
+
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
diff --git a/sys/arm64/arm64/busdma_bounce.c b/sys/arm64/arm64/busdma_bounce.c
index abfd5c195857e9..e7581a091bb3e3 100644
--- a/sys/arm64/arm64/busdma_bounce.c
+++ b/sys/arm64/arm64/busdma_bounce.c
@@ -36,7 +36,6 @@
 #include <sys/domainset.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -55,6 +54,7 @@
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <arm64/include/bus_dma_impl.h>
 
diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
index eaab7009af67d7..0f5a6c483d70f8 100644
--- a/sys/arm64/arm64/gic_v3.c
+++ b/sys/arm64/arm64/gic_v3.c
@@ -47,14 +47,13 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/smp.h>
-#include <sys/interrupt.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #ifdef FDT
 #include <dev/fdt/fdt_intr.h>
diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c
index 3e9399384855bb..7d372af2b9a752 100644
--- a/sys/arm64/arm64/nexus.c
+++ b/sys/arm64/arm64/nexus.c
@@ -43,7 +43,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -54,7 +53,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
 #include <machine/resource.h>
diff --git a/sys/arm64/rockchip/rk3568_pcie.c b/sys/arm64/rockchip/rk3568_pcie.c
index d55bfb1bcc7390..72c49acca01db4 100644
--- a/sys/arm64/rockchip/rk3568_pcie.c
+++ b/sys/arm64/rockchip/rk3568_pcie.c
@@ -34,7 +34,6 @@
 #include <sys/bus.h>
 #include <sys/proc.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 #include <sys/mutex.h>
 #include <sys/gpio.h>
 
@@ -55,7 +54,6 @@
 #include <dev/hwreset/hwreset.h>
 
 #include <machine/bus.h>
-#include <machine/intr.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c
index 0947e0addf59d7..c55cda057c87be 100644
--- a/sys/cam/mmc/mmc_xpt.c
+++ b/sys/cam/mmc/mmc_xpt.c
@@ -36,7 +36,6 @@
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/interrupt.h>
 #include <sys/sbuf.h>
 
 #include <sys/lock.h>
@@ -58,6 +57,7 @@
 #include <cam/mmc/mmc.h>
 #include <cam/mmc/mmc_bus.h>
 
+#include <machine/interrupt.h>
 #include <machine/stdarg.h>	/* for xpt_print below */
 #include <machine/_inttypes.h>  /* for PRIu64 */
 
diff --git a/sys/compat/linuxkpi/common/include/linux/hardirq.h b/sys/compat/linuxkpi/common/include/linux/hardirq.h
index f79451dd0d35a6..dfc960f4ea2e82 100644
--- a/sys/compat/linuxkpi/common/include/linux/hardirq.h
+++ b/sys/compat/linuxkpi/common/include/linux/hardirq.h
@@ -34,7 +34,8 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
+
+#include <machine/interrupt.h>
 
 #define	synchronize_irq(irq)	_intr_drain((irq))
 
diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h
index dfd9816da8bee7..baeeccd6ed10ac 100644
--- a/sys/compat/linuxkpi/common/include/linux/interrupt.h
+++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -36,7 +36,8 @@
 #include <linux/hardirq.h>
 
 #include <sys/param.h>
-#include <sys/interrupt.h>
+
+#include <machine/interrupt.h>
 
 typedef	irqreturn_t	(*irq_handler_t)(int, void *);
 
diff --git a/sys/compat/linuxkpi/common/src/linux_kthread.c b/sys/compat/linuxkpi/common/src/linux_kthread.c
index 2fba700fa28366..648861e283d7b4 100644
--- a/sys/compat/linuxkpi/common/src/linux_kthread.c
+++ b/sys/compat/linuxkpi/common/src/linux_kthread.c
@@ -31,9 +31,10 @@
 #include <linux/wait.h>
 
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/priority.h>
 
+#include <machine/interrupt.h>
+
 enum {
 	KTHREAD_SHOULD_STOP_MASK = (1 << 0),
 	KTHREAD_SHOULD_PARK_MASK = (1 << 1),
diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c
index 9cfd46c974300c..27a8dcdd65c15a 100644
--- a/sys/dev/acpica/acpi_apei.c
+++ b/sys/dev/acpica/acpi_apei.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -42,6 +41,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/interrupt.h>
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/aclocal.h>
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index a71eb9b47eb7f5..da98c28bd7a976 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -34,9 +34,6 @@
 #include "acpi_if.h"
 #include "bus_if.h"
 #include <sys/_eventhandler.h>
-#ifdef INTRNG
-#include <sys/intr.h>
-#endif
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -45,6 +42,9 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
+#ifdef INTRNG
+#include <machine/interrupt.h>
+#endif
 #include <machine/resource.h>
 
 struct apm_clone_data;
diff --git a/sys/dev/amdgpio/amdgpio.c b/sys/dev/amdgpio/amdgpio.c
index f39006d9580508..66211d2437535f 100644
--- a/sys/dev/amdgpio/amdgpio.c
+++ b/sys/dev/amdgpio/amdgpio.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
@@ -43,6 +42,7 @@
 #include <sys/sysctl.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 
 #include <contrib/dev/acpica/include/acpi.h>
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index 44484d82e2b968..1c1ca7f3d944d2 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -30,9 +30,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/gpio.h>
-#ifdef INTRNG
-#include <sys/intr.h>
-#endif
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h
index e3669e82e594bc..32720d4a6cd1ee 100644
--- a/sys/dev/gpio/gpiobusvar.h
+++ b/sys/dev/gpio/gpiobusvar.h
@@ -41,7 +41,8 @@
 #endif
 
 #ifdef	INTRNG
-#include <sys/intr.h>
+/* touched by LINT-ACPI */
+#include <machine/interrupt.h>
 #endif
 
 #include "gpio_if.h"
diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c
index 415fa38b449f13..7921408dde3087 100644
--- a/sys/dev/gpio/pl061.c
+++ b/sys/dev/gpio/pl061.c
@@ -36,7 +36,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/gpio.h>
-#include <sys/interrupt.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c
index 4e9cbceb8c76d2..29b8f0bde4416c 100644
--- a/sys/dev/hyperv/pcib/vmbus_pcib.c
+++ b/sys/dev/hyperv/pcib/vmbus_pcib.c
@@ -49,7 +49,7 @@
 #include <vm/pmap.h>
 
 #if defined(__aarch64__)
-#include <arm64/include/intr.h>
+#include <arm64/include/interrupt.h>
 #endif
 #include <machine/atomic.h>
 #include <machine/bus.h>
diff --git a/sys/dev/iommu/busdma_iommu.c b/sys/dev/iommu/busdma_iommu.c
index 4d295ed7c6b260..a023c020300ff2 100644
--- a/sys/dev/iommu/busdma_iommu.c
+++ b/sys/dev/iommu/busdma_iommu.c
@@ -34,7 +34,6 @@
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -57,10 +56,12 @@
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
 #include <dev/iommu/iommu.h>
+
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#include <machine/md_var.h>
+#include <machine/interrupt.h>
 #include <machine/iommu.h>
+#include <machine/md_var.h>
 #include <dev/iommu/busdma_iommu.h>
 
 /*
diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c
index d97bdee47b2800..711005a50ed1ef 100644
--- a/sys/dev/iommu/iommu_gas.c
+++ b/sys/dev/iommu/iommu_gas.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -63,6 +62,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
+#include <machine/interrupt.h>
 #include <machine/iommu.h>
 #include <dev/iommu/busdma_iommu.h>
 
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 328118ef959629..88e971dfef272d 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -75,12 +75,12 @@
 #include <sys/taskqueue.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 
 #include <dev/mfi/mfireg.h>
 #include <dev/mfi/mfi_ioctl.h>
 #include <dev/mfi/mfivar.h>
-#include <sys/interrupt.h>
 #include <sys/priority.h>
 
 static int	mfi_alloc_commands(struct mfi_softc *);
diff --git a/sys/dev/mlx5/mlx5_en/en_rl.h b/sys/dev/mlx5/mlx5_en/en_rl.h
index 09819b6ef56edf..35c03f8f766b0a 100644
--- a/sys/dev/mlx5/mlx5_en/en_rl.h
+++ b/sys/dev/mlx5/mlx5_en/en_rl.h
@@ -32,11 +32,12 @@
 #include <sys/sx.h>
 #include <sys/proc.h>
 #include <sys/condvar.h>
-#include <sys/interrupt.h>
 #include <sys/unistd.h>
 
 #include <sys/queue.h>
 
+#include <machine/interrupt.h>
+
 #define	MLX5E_RL_MAX_WORKERS		128	/* limited by Toeplitz hash */
 #define	MLX5E_RL_MAX_TX_RATES		(64 * 1024)	/* software limit */
 #define	MLX5E_RL_DEF_SQ_PER_WORKER	(12 * 1024)	/* software limit */
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
index 03ff321e569287..5c3895b8b48c47 100644
--- a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
@@ -41,7 +41,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
-#include <sys/interrupt.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
index 76805d30ceda04..3a33251d509d96 100644
--- a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
@@ -35,7 +35,6 @@
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/rman.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index 1a33d7655f77fc..0be71fd404e453 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -33,7 +33,7 @@
 
 #include <sys/bus.h>
 #ifdef INTRNG
-#include <sys/intr.h>
+#include <machine/interrupt.h>
 #endif
 #include <dev/ofw/openfirm.h>
 
diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c
index 3e057553999b8c..ee6266d41037ee 100644
--- a/sys/dev/pci/pci_host_generic_fdt.c
+++ b/sys/dev/pci/pci_host_generic_fdt.c
@@ -45,7 +45,7 @@
 #include <sys/rman.h>
 
 #if defined(INTRNG)
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #endif
 
 #include <dev/ofw/openfirm.h>
@@ -59,7 +59,7 @@
 #include <dev/pci/pci_host_generic.h>
 #include <dev/pci/pci_host_generic_fdt.h>
 
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include "pcib_if.h"
 
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 02004373222291..e40d76e805906d 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -35,13 +35,13 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/proto/proto_core.c b/sys/dev/proto/proto_core.c
index 2a7fe3bf9f3380..6cd49b4fe4fdd4 100644
--- a/sys/dev/proto/proto_core.c
+++ b/sys/dev/proto/proto_core.c
@@ -30,7 +30,6 @@
 #include <sys/conf.h>
 #include <sys/cons.h>
 #include <sys/fcntl.h>
-#include <sys/interrupt.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -41,6 +40,8 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/uio.h>
+
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/qat/qat_common/adf_vf_isr.c b/sys/dev/qat/qat_common/adf_vf_isr.c
index a34e23b8fb4b89..bd5f0686e4382c 100644
--- a/sys/dev/qat/qat_common/adf_vf_isr.c
+++ b/sys/dev/qat/qat_common/adf_vf_isr.c
@@ -5,7 +5,7 @@
 #include <sys/systm.h>
 
 #include <sys/types.h>
-#include <sys/interrupt.h>
+#include <machine/interrupt.h>
 #include <dev/pci/pcivar.h>
 #include <sys/param.h>
 #include <linux/workqueue.h>
diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
index e608d6c95eadc7..f77ff028fd51a9 100644
--- a/sys/dev/uart/uart_core.c
+++ b/sys/dev/uart/uart_core.c
@@ -32,15 +32,16 @@
 #include <sys/conf.h>
 #include <sys/cons.h>
 #include <sys/fcntl.h>
-#include <sys/interrupt.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
+#include <sys/rman.h>
 #include <sys/sysctl.h>
+
 #include <machine/bus.h>
-#include <sys/rman.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c
index faae077916f382..7c666bff383649 100644
--- a/sys/dev/uart/uart_tty.c
+++ b/sys/dev/uart/uart_tty.c
@@ -32,13 +32,14 @@
 #include <sys/conf.h>
 #include <sys/cons.h>
 #include <sys/fcntl.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <sys/tty.h>
+
+#include <machine/interrupt.h>
 #include <machine/resource.h>
 #include <machine/stdarg.h>
 
diff --git a/sys/dev/usb/usb_process.h b/sys/dev/usb/usb_process.h
index 6a8ac0acda339d..b7eb415f3ba9ce 100644
--- a/sys/dev/usb/usb_process.h
+++ b/sys/dev/usb/usb_process.h
@@ -29,9 +29,10 @@
 #define	_USB_PROCESS_H_
 
 #ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/interrupt.h>
 #include <sys/priority.h>
 #include <sys/runq.h>
+
+#include <machine/interrupt.h>
 #endif
 
 /* defines */
diff --git a/sys/dev/wdatwd/wdatwd.c b/sys/dev/wdatwd/wdatwd.c
index c67e3728130796..015354332ca5af 100644
--- a/sys/dev/wdatwd/wdatwd.c
+++ b/sys/dev/wdatwd/wdatwd.c
@@ -33,7 +33,6 @@
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/eventhandler.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -41,6 +40,9 @@
 #include <sys/rman.h>
 #include <sys/sysctl.h>
 #include <sys/watchdog.h>
+
+#include <machine/interrupt.h>
+
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c
index bfe080b16f0307..ada8dc2f38ef16 100644
--- a/sys/dev/xen/bus/xen_intr.c
+++ b/sys/dev/xen/bus/xen_intr.c
@@ -40,7 +40,6 @@
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/interrupt.h>
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 #include <sys/smp.h>
@@ -49,6 +48,7 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/interrupt.h>
 #include <machine/smp.h>
 #include <machine/stdarg.h>
 
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 6fa2272ed54a93..0bd52a63aac583 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -66,7 +66,6 @@
 #include <vm/vm_map.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/limits.h>
 #include <sys/timetc.h>
 
@@ -78,6 +77,8 @@ PMC_SOFT_DEFINE_EX( , , clock, prof, \
     cpu_startprofclock, cpu_stopprofclock);
 #endif
 
+#include <machine/interrupt.h>
+
 #ifdef DEVICE_POLLING
 extern void hardclock_device_poll(void);
 #endif /* DEVICE_POLLING */
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index 5d9e2f2f326be5..dfdb64e46e5ee3 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -59,7 +59,6 @@
 #include <sys/libkern.h>
 #include <sys/limits.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/vmmeter.h>
 #include <sys/ktrace.h>
 
@@ -77,6 +76,8 @@
 #include <ddb/ddb.h>
 #endif /* DDB */
 
+#include <machine/interrupt.h>
+
 /*
  * cpusets provide a mechanism for creating and manipulating sets of
  * processors for the purpose of constraining the scheduling of threads to
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index fb14011dbacca7..e484b1a76d7988 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -37,7 +37,6 @@
 #include <sys/cpuset.h>
 #include <sys/rtprio.h>
 #include <sys/systm.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/ktr.h>
@@ -58,6 +57,7 @@
 #include <sys/vmmeter.h>
 #include <machine/atomic.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 #include <machine/stdarg.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 0fa1af6ef5a76f..5cf5ab74df511f 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -45,7 +45,6 @@
 #include <sys/callout.h>
 #include <sys/domainset.h>
 #include <sys/file.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/kthread.h>
@@ -71,6 +70,8 @@
 #include <machine/cpu.h>
 #endif
 
+#include <machine/interrupt.h>
+
 DPCPU_DECLARE(sbintime_t, hardclocktime);
 
 SDT_PROVIDER_DEFINE(callout_execute);
diff --git a/sys/kern/pic_if.m b/sys/kern/pic_if.m
index 11dba5c766f1a7..390a887a06ce63 100644
--- a/sys/kern/pic_if.m
+++ b/sys/kern/pic_if.m
@@ -29,7 +29,8 @@
 #include <sys/bus.h>
 #include <sys/cpuset.h>
 #include <sys/resource.h>
-#include <sys/intr.h>
+
+#include <machine/interrupt.h>
 
 INTERFACE pic;
 
diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
index d0d2af32f81ba4..bd54fad381f9e6 100644
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -50,8 +50,6 @@
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/cpuset.h>
-#include <sys/interrupt.h>
-#include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
@@ -73,6 +71,7 @@
 
 #include <machine/atomic.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/smp.h>
 #include <machine/stdarg.h>
 
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index c4146922edc595..6eba22115ca632 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -30,7 +30,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpuset.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/libkern.h>
@@ -44,6 +43,8 @@
 #include <sys/smp.h>
 #include <sys/taskqueue.h>
 #include <sys/unistd.h>
+
+#include <machine/interrupt.h>
 #include <machine/stdarg.h>
 
 static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
index 7051e31565d4d6..5d0890b56bb368 100644
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -45,7 +45,6 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/hash.h>
-#include <sys/interrupt.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/libkern.h>
@@ -60,6 +59,8 @@
 #include <sys/sockio.h>
 #include <sys/taskqueue.h>
 
+#include <machine/interrupt.h>
+
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index 4ae1aa9ab89d20..f5539723343e3c 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -71,7 +71,6 @@
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
-#include <sys/interrupt.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
@@ -88,6 +87,8 @@
 #include <ddb/ddb.h>
 #endif
 
+#include <machine/interrupt.h>
+
 #define	_WANT_NETISR_INTERNAL	/* Enable definitions from netisr_internal.h */
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
index 85341cab07502e..a6efd57f226a28 100644
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -100,7 +100,6 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/hhook.h>
@@ -120,6 +119,8 @@
 #include <sys/kthread.h>
 #include <sys/kern_prefetch.h>
 
+#include <machine/interrupt.h>
+
 #include <vm/uma.h>
 #include <vm/vm.h>
 
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 0dd1b480b31370..ec46582addc51b 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -67,7 +67,6 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/endian.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
@@ -81,6 +80,8 @@
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 
+#include <machine/interrupt.h>
+
 #include <net/bpf.h>
 #include <net/if.h>
 #include <net/if_var.h>
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index bd8b709e396eb1..d43cfbf05d590e 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -49,7 +49,6 @@
 #include <sys/endian.h>
 #include <sys/gsb_crc32.h>
 #include <sys/hash.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/limits.h>
@@ -63,6 +62,8 @@
 #include <sys/taskqueue.h>
 #include <sys/ucred.h>
 
+#include <machine/interrupt.h>
+
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_private.h>
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index ce28a9cd6dc1ec..03ad9966a13638 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -52,7 +52,6 @@
 #include <sys/fcntl.h>
 #include <sys/filio.h>
 #include <sys/hash.h>
-#include <sys/interrupt.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
@@ -68,6 +67,8 @@
 #include <sys/md5.h>
 #include <sys/ucred.h>
 
+#include <machine/interrupt.h>
+
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_private.h>
diff --git a/sys/netpfil/pf/pflow.c b/sys/netpfil/pf/pflow.c
index 5ce1369d9f14e9..c96b9e2c28df61 100644
--- a/sys/netpfil/pf/pflow.c
+++ b/sys/netpfil/pf/pflow.c
@@ -25,7 +25,6 @@
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/endian.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -37,6 +36,8 @@
 #include <sys/systm.h>
 #include <sys/priv.h>
 
+#include <machine/interrupt.h>
+
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 34dcea8de9ee83..9ead5212d8b08c 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -53,6 +52,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 #include "iommu_if.h"
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index 191b07b8dcc7a8..2d5ae284690c7f 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -61,7 +61,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/pcpu.h>
 #include <sys/sysctl.h>
 #include <sys/timeet.h>
diff --git a/sys/powerpc/powerpc/interrupt.c b/sys/powerpc/powerpc/interrupt.c
index d81b07442b7c2e..90eb5677525451 100644
--- a/sys/powerpc/powerpc/interrupt.c
+++ b/sys/powerpc/powerpc/interrupt.c
@@ -37,7 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/ktr.h>
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 19b0a7a4fee340..4fe2a29c448f18 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -66,7 +66,6 @@
 #include <sys/queue.h>
 #include <sys/bus.h>
 #include <sys/cpuset.h>
-#include <sys/interrupt.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff --git a/sys/riscv/riscv/busdma_bounce.c b/sys/riscv/riscv/busdma_bounce.c
index f652f08bf5dc0e..917a529602d9cc 100644
--- a/sys/riscv/riscv/busdma_bounce.c
+++ b/sys/riscv/riscv/busdma_bounce.c
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -53,8 +52,9 @@
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#include <machine/md_var.h>
 #include <machine/bus_dma_impl.h>
+#include <machine/interrupt.h>
+#include <machine/md_var.h>
 
 #define MAX_BPAGES 4096
 
diff --git a/sys/riscv/riscv/intc.c b/sys/riscv/riscv/intc.c
index 71a4cfbc5c722f..b26aa1c021843e 100644
--- a/sys/riscv/riscv/intc.c
+++ b/sys/riscv/riscv/intc.c
@@ -42,14 +42,13 @@
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/cpuset.h>
-#include <sys/interrupt.h>
 #include <sys/smp.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/fdt/simplebus.h>
 
diff --git a/sys/riscv/riscv/nexus.c b/sys/riscv/riscv/nexus.c
index b8b4eb6604aed4..3255f077241457 100644
--- a/sys/riscv/riscv/nexus.c
+++ b/sys/riscv/riscv/nexus.c
@@ -45,14 +45,13 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/rman.h>
-#include <sys/interrupt.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #ifdef FDT
 #include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
index c2371d4d9c4f4f..a6c79914023da8 100644
--- a/sys/x86/iommu/intel_ctx.c
+++ b/sys/x86/iommu/intel_ctx.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/limits.h>
@@ -60,6 +59,7 @@
 #include <dev/pci/pcivar.h>
 #include <machine/atomic.h>
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <x86/include/busdma_impl.h>
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
index b133dc875515fd..34484b317c2292 100644
--- a/sys/x86/iommu/intel_idpgtbl.c
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -32,7 +32,6 @@
 #include <sys/systm.h>
 #include <sys/domainset.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -60,6 +59,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <x86/include/busdma_impl.h>
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index f4d502392494b8..2ae5e05a4dc8ad 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/asan.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
index 0401741131044b..8e765f83fc3eb8 100644
--- a/sys/x86/x86/busdma_bounce.c
+++ b/sys/x86/x86/busdma_bounce.c
@@ -31,7 +31,6 @@
 #include <sys/domainset.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -50,6 +49,7 @@
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <x86/include/busdma_impl.h>
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index 20be511ead72e0..f41490640bee91 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/ktr.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index 8c64810dfde35a..3bde8340d1a4b3 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c
index 0a683b3e841a78..0f78b15b350940 100644
--- a/sys/x86/x86/mp_x86.c
+++ b/sys/x86/x86/mp_x86.c
@@ -45,7 +45,6 @@
 #include <sys/cons.h>	/* cngetc() */
 #include <sys/cpuset.h>
 #include <sys/csan.h>
-#include <sys/interrupt.h>
 #include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
@@ -70,6 +69,7 @@
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
+#include <machine/interrupt.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c
index 893e29f3803aa3..ee52139295ae21 100644
--- a/sys/x86/x86/msi.c
+++ b/sys/x86/x86/msi.c
@@ -42,7 +42,6 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c
index 90363a202641fb..042c55a5b4e473 100644
--- a/sys/x86/x86/nexus.c
+++ b/sys/x86/x86/nexus.c
@@ -50,7 +50,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/linker.h>
 #include <sys/malloc.h>
diff --git a/sys/x86/xen/xen_arch_intr.c b/sys/x86/xen/xen_arch_intr.c
index eef02af2af9c49..00e7385dcde2f5 100644
--- a/sys/x86/xen/xen_arch_intr.c
+++ b/sys/x86/xen/xen_arch_intr.c
@@ -37,12 +37,13 @@
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <sys/interrupt.h>
 #include <sys/pcpu.h>
 #include <sys/proc.h>
 #include <sys/smp.h>
 #include <sys/stddef.h>
 
+#include <machine/interrupt.h>
+
 #include <xen/xen-os.h>
 #include <xen/xen_intr.h>
 #include <machine/xen/arch-intr.h>