Index: sys/amd64/acpica/acpi_wakeup.c
===================================================================
--- sys/amd64/acpica/acpi_wakeup.c
+++ sys/amd64/acpica/acpi_wakeup.c
@@ -48,7 +48,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
Index: sys/amd64/amd64/fpu.c
===================================================================
--- sys/amd64/amd64/fpu.c
+++ sys/amd64/amd64/fpu.c
@@ -55,7 +55,7 @@
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
Index: sys/amd64/amd64/machdep.c
===================================================================
--- sys/amd64/amd64/machdep.c
+++ sys/amd64/amd64/machdep.c
@@ -122,7 +122,7 @@
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
Index: sys/amd64/amd64/pmap.c
===================================================================
--- sys/amd64/amd64/pmap.c
+++ sys/amd64/amd64/pmap.c
@@ -157,7 +157,7 @@
 #include <vm/uma.h>
 
 #include <machine/asan.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <x86/ifunc.h>
 #include <machine/cpu.h>
Index: sys/amd64/amd64/trap.c
===================================================================
--- sys/amd64/amd64/trap.c
+++ sys/amd64/amd64/trap.c
@@ -88,7 +88,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
Index: sys/amd64/ia32/ia32_syscall.c
===================================================================
--- sys/amd64/ia32/ia32_syscall.c
+++ sys/amd64/ia32/ia32_syscall.c
@@ -77,7 +77,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 
 #include <compat/freebsd32/freebsd32_signal.h>
Index: sys/amd64/include/intr.h
===================================================================
--- sys/amd64/include/intr.h
+++ sys/amd64/include/intr.h
@@ -30,7 +30,7 @@
 #ifndef __MACHINE_INTR_MACHDEP_H__
 #define	__MACHINE_INTR_MACHDEP_H__
 
-#include <x86/intr_machdep.h>
+#include <x86/intr.h>
 
 /*
  * The following data structure holds per-cpu data, and is placed just
Index: sys/contrib/ncsw/user/env/xx.c
===================================================================
--- sys/contrib/ncsw/user/env/xx.c
+++ sys/contrib/ncsw/user/env/xx.c
@@ -43,7 +43,7 @@
 #include <vm/vm_page.h>
 
 #include <machine/cpufunc.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/pmap.h>
 #include <machine/stdarg.h>
 
Index: sys/dev/hwpmc/hwpmc_core.c
===================================================================
--- sys/dev/hwpmc/hwpmc_core.c
+++ sys/dev/hwpmc/hwpmc_core.c
@@ -40,7 +40,7 @@
 #include <sys/smp.h>
 #include <sys/systm.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
Index: sys/dev/hwpmc/hwpmc_uncore.c
===================================================================
--- sys/dev/hwpmc/hwpmc_uncore.c
+++ sys/dev/hwpmc/hwpmc_uncore.c
@@ -39,7 +39,7 @@
 #include <sys/pmckern.h>
 #include <sys/systm.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #if (__FreeBSD_version >= 1100000)
 #include <x86/apicvar.h>
 #else
Index: sys/dev/hwpmc/hwpmc_x86.c
===================================================================
--- sys/dev/hwpmc/hwpmc_x86.c
+++ sys/dev/hwpmc/hwpmc_x86.c
@@ -41,7 +41,7 @@
 
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #if (__FreeBSD_version >= 1100000)
 #include <x86/apicvar.h>
 #else
Index: sys/dev/hyperv/pcib/vmbus_pcib.c
===================================================================
--- sys/dev/hyperv/pcib/vmbus_pcib.c
+++ sys/dev/hyperv/pcib/vmbus_pcib.c
@@ -63,7 +63,7 @@
 #include <dev/pci/pcib_private.h>
 #include "pcib_if.h"
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicreg.h>
 
 #include <dev/hyperv/include/hyperv.h>
Index: sys/dev/hyperv/vmbus/vmbus.c
===================================================================
--- sys/dev/hyperv/vmbus/vmbus.c
+++ sys/dev/hyperv/vmbus/vmbus.c
@@ -51,7 +51,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/metadata.h>
 #include <machine/md_var.h>
 #include <machine/resource.h>
Index: sys/dev/ntb/ntb_hw/ntb_hw_intel.c
===================================================================
--- sys/dev/ntb/ntb_hw/ntb_hw_intel.c
+++ sys/dev/ntb/ntb_hw/ntb_hw_intel.c
@@ -59,7 +59,7 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
Index: sys/dev/ntb/ntb_hw/ntb_hw_plx.c
===================================================================
--- sys/dev/ntb/ntb_hw/ntb_hw_plx.c
+++ sys/dev/ntb/ntb_hw/ntb_hw_plx.c
@@ -47,7 +47,7 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
Index: sys/dev/pci/pci.c
===================================================================
--- sys/dev/pci/pci.c
+++ sys/dev/pci/pci.c
@@ -63,7 +63,7 @@
 #include <machine/stdarg.h>
 
 #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #endif
 
 #include <sys/pciio.h>
Index: sys/dev/sound/macio/davbus.c
===================================================================
--- sys/dev/sound/macio/davbus.c
+++ sys/dev/sound/macio/davbus.c
@@ -52,7 +52,7 @@
 #include <dev/sound/macio/aoa.h>
 #include <dev/sound/macio/davbusreg.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 
Index: sys/dev/sound/macio/i2s.c
===================================================================
--- sys/dev/sound/macio/i2s.c
+++ sys/dev/sound/macio/i2s.c
@@ -68,7 +68,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/dbdma.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
Index: sys/dev/sound/macio/onyx.c
===================================================================
--- sys/dev/sound/macio/onyx.c
+++ sys/dev/sound/macio/onyx.c
@@ -42,7 +42,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/dbdma.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
Index: sys/dev/sound/macio/snapper.c
===================================================================
--- sys/dev/sound/macio/snapper.c
+++ sys/dev/sound/macio/snapper.c
@@ -68,7 +68,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/dbdma.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
Index: sys/dev/sound/macio/tumbler.c
===================================================================
--- sys/dev/sound/macio/tumbler.c
+++ sys/dev/sound/macio/tumbler.c
@@ -68,7 +68,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <machine/dbdma.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
Index: sys/dev/vmd/vmd.c
===================================================================
--- sys/dev/vmd/vmd.c
+++ sys/dev/vmd/vmd.c
@@ -43,7 +43,7 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <sys/rman.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
Index: sys/dev/xen/control/control.c
===================================================================
--- sys/dev/xen/control/control.c
+++ sys/dev/xen/control/control.c
@@ -131,7 +131,7 @@
 
 #include <machine/_inttypes.h>
 #if defined(__amd64__) || defined(__i386__)
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include <x86/apicvar.h>
 #endif
Index: sys/i386/acpica/acpi_wakeup.c
===================================================================
--- sys/i386/acpica/acpi_wakeup.c
+++ sys/i386/acpica/acpi_wakeup.c
@@ -49,7 +49,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>
Index: sys/i386/i386/machdep.c
===================================================================
--- sys/i386/i386/machdep.c
+++ sys/i386/i386/machdep.c
@@ -121,7 +121,7 @@
 #include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
Index: sys/i386/i386/npx.c
===================================================================
--- sys/i386/i386/npx.c
+++ sys/i386/i386/npx.c
@@ -69,7 +69,7 @@
 #include <machine/ucontext.h>
 #include <x86/ifunc.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #ifdef DEV_ISA
 #include <isa/isavar.h>
Index: sys/i386/i386/pmap.c
===================================================================
--- sys/i386/i386/pmap.c
+++ sys/i386/i386/pmap.c
@@ -146,7 +146,7 @@
 
 #ifdef DEV_APIC
 #include <sys/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #endif
 #include <x86/ifunc.h>
Index: sys/i386/i386/pmap_base.c
===================================================================
--- sys/i386/i386/pmap_base.c
+++ sys/i386/i386/pmap_base.c
@@ -102,7 +102,7 @@
 #include <machine/md_var.h>
 #ifdef DEV_APIC
 #include <sys/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #endif
 #include <x86/ifunc.h>
Index: sys/i386/i386/trap.c
===================================================================
--- sys/i386/i386/trap.c
+++ sys/i386/i386/trap.c
@@ -88,7 +88,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
Index: sys/i386/include/intr.h
===================================================================
--- sys/i386/include/intr.h
+++ sys/i386/include/intr.h
@@ -3,4 +3,4 @@
  */
 /* $FreeBSD$ */
 
-#include <x86/intr_machdep.h>
+#include <x86/intr.h>
Index: sys/i386/include/smp.h
===================================================================
--- sys/i386/include/smp.h
+++ sys/i386/include/smp.h
@@ -23,7 +23,7 @@
 
 #include <sys/bus.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/pcb.h>
 
Index: sys/powerpc/aim/mp_cpudep.c
===================================================================
--- sys/powerpc/aim/mp_cpudep.c
+++ sys/powerpc/aim/mp_cpudep.c
@@ -41,7 +41,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/hid.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <machine/smp.h>
Index: sys/powerpc/amigaone/platform_amigaone.c
===================================================================
--- sys/powerpc/amigaone/platform_amigaone.c
+++ sys/powerpc/amigaone/platform_amigaone.c
@@ -33,7 +33,7 @@
 #include <sys/malloc.h>
 #include <sys/smp.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/platform.h>
 #include <machine/platformvar.h>
 
Index: sys/powerpc/include/intr_machdep.h
===================================================================
--- /dev/null
+++ sys/powerpc/include/intr_machdep.h
@@ -1,66 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (C) 2002 Benno Rice.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef	_MACHINE_INTR_MACHDEP_H_
-#define	_MACHINE_INTR_MACHDEP_H_
-
-#define	INTR_VECTORS	256
-
-#define	MAX_PICS		32
-#define	MAP_IRQ(node, pin)	powerpc_get_irq(node, pin)
-
-/*
- * Default base address for MSI messages on PowerPC
- */
-#define	MSI_INTEL_ADDR_BASE		0xfee00000
-
-extern device_t root_pic;
-
-struct trapframe;
-
-driver_filter_t powerpc_ipi_handler;
-
-void	intrcnt_add(const char *name, u_long **countp);
-
-u_int	powerpc_register_pic(device_t, uint32_t, u_int, u_int, u_int);
-u_int	powerpc_get_irq(uint32_t, u_int);
-
-void	powerpc_dispatch_intr(u_int, struct trapframe *);
-int	powerpc_enable_intr(void);
-int	powerpc_setup_intr(const char *, u_int, driver_filter_t, driver_intr_t,
-	    void *, enum intr_type, void **, int);
-int	powerpc_teardown_intr(void *);
-int	powerpc_bind_intr(u_int irq, u_char cpu);
-int	powerpc_config_intr(int, enum intr_trigger, enum intr_polarity);
-int	powerpc_fw_config_intr(int irq, int sense_code);
-
-void	powerpc_intr_mask(u_int irq);
-void	powerpc_intr_unmask(u_int irq);
-
-#endif /* _MACHINE_INTR_MACHDEP_H_ */
Index: sys/powerpc/mpc85xx/atpic.c
===================================================================
--- sys/powerpc/mpc85xx/atpic.c
+++ sys/powerpc/mpc85xx/atpic.c
@@ -37,7 +37,7 @@
 #include <sys/rman.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/pio.h>
 
 #include <powerpc/mpc85xx/mpc85xx.h>
Index: sys/powerpc/mpc85xx/isa.c
===================================================================
--- sys/powerpc/mpc85xx/isa.c
+++ sys/powerpc/mpc85xx/isa.c
@@ -34,7 +34,7 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 
 #include <isa/isareg.h>
Index: sys/powerpc/mpc85xx/pci_mpc85xx.c
===================================================================
--- sys/powerpc/mpc85xx/pci_mpc85xx.c
+++ sys/powerpc/mpc85xx/pci_mpc85xx.c
@@ -73,7 +73,7 @@
 
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include <powerpc/mpc85xx/mpc85xx.h>
 
Index: sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
===================================================================
--- sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
+++ sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
@@ -59,7 +59,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcib_private.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include "pcib_if.h"
 
Index: sys/powerpc/ofw/ofw_pcib_pci.c
===================================================================
--- sys/powerpc/ofw/ofw_pcib_pci.c
+++ sys/powerpc/ofw/ofw_pcib_pci.c
@@ -46,7 +46,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcib_private.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include "pcib_if.h"
 
Index: sys/powerpc/ofw/ofw_pcibus.c
===================================================================
--- sys/powerpc/ofw/ofw_pcibus.c
+++ sys/powerpc/ofw/ofw_pcibus.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 
 #include <dev/pci/pcireg.h>
Index: sys/powerpc/ofw/openpic_ofw.c
===================================================================
--- sys/powerpc/ofw/openpic_ofw.c
+++ sys/powerpc/ofw/openpic_ofw.c
@@ -43,7 +43,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powermac/ata_kauai.c
===================================================================
--- sys/powerpc/powermac/ata_kauai.c
+++ sys/powerpc/powermac/ata_kauai.c
@@ -52,7 +52,7 @@
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
Index: sys/powerpc/powermac/cpcht.c
===================================================================
--- sys/powerpc/powermac/cpcht.c
+++ sys/powerpc/powermac/cpcht.c
@@ -46,7 +46,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/openpicreg.h>
 #include <machine/openpicvar.h>
Index: sys/powerpc/powermac/cuda.c
===================================================================
--- sys/powerpc/powermac/cuda.c
+++ sys/powerpc/powermac/cuda.c
@@ -49,7 +49,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powermac/grackle.c
===================================================================
--- sys/powerpc/powermac/grackle.c
+++ sys/powerpc/powermac/grackle.c
@@ -49,7 +49,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powermac/hrowpic.c
===================================================================
--- sys/powerpc/powermac/hrowpic.c
+++ sys/powerpc/powermac/hrowpic.c
@@ -47,7 +47,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powermac/macgpio.c
===================================================================
--- sys/powerpc/powermac/macgpio.c
+++ sys/powerpc/powermac/macgpio.c
@@ -43,7 +43,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
Index: sys/powerpc/powermac/macio.c
===================================================================
--- sys/powerpc/powermac/macio.c
+++ sys/powerpc/powermac/macio.c
@@ -45,7 +45,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
Index: sys/powerpc/powermac/pmu.c
===================================================================
--- sys/powerpc/powermac/pmu.c
+++ sys/powerpc/powermac/pmu.c
@@ -54,7 +54,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/hid.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/pio.h>
Index: sys/powerpc/powermac/smu.c
===================================================================
--- sys/powerpc/powermac/smu.c
+++ sys/powerpc/powermac/smu.c
@@ -49,7 +49,7 @@
 #include <sys/unistd.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 
 #include <dev/iicbus/iicbus.h>
Index: sys/powerpc/powermac/uninorth.c
===================================================================
--- sys/powerpc/powermac/uninorth.c
+++ sys/powerpc/powermac/uninorth.c
@@ -43,7 +43,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powermac/uninorthpci.c
===================================================================
--- sys/powerpc/powermac/uninorthpci.c
+++ sys/powerpc/powermac/uninorthpci.c
@@ -48,7 +48,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/powernv/opal_pci.c
===================================================================
--- sys/powerpc/powernv/opal_pci.c
+++ sys/powerpc/powernv/opal_pci.c
@@ -48,7 +48,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 
 #include <vm/vm.h>
Index: sys/powerpc/powernv/xive.c
===================================================================
--- sys/powerpc/powernv/xive.c
+++ sys/powerpc/powernv/xive.c
@@ -46,7 +46,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 
 #include <dev/ofw/ofw_bus.h>
Index: sys/powerpc/powerpc/autoconf.c
===================================================================
--- sys/powerpc/powerpc/autoconf.c
+++ sys/powerpc/powerpc/autoconf.c
@@ -37,7 +37,7 @@
 #include <sys/cons.h>
 #include <sys/kernel.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #ifdef DEV_ISA
 extern void isa_probe_children(device_t dev);
Index: sys/powerpc/powerpc/clock.c
===================================================================
--- sys/powerpc/powerpc/clock.c
+++ sys/powerpc/powerpc/clock.c
@@ -75,7 +75,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 
Index: sys/powerpc/powerpc/interrupt.c
===================================================================
--- sys/powerpc/powerpc/interrupt.c
+++ sys/powerpc/powerpc/interrupt.c
@@ -59,7 +59,7 @@
 #include <machine/db_machdep.h>
 #include <machine/fpu.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
Index: sys/powerpc/powerpc/intr_machdep.c
===================================================================
--- sys/powerpc/powerpc/intr_machdep.c
+++ sys/powerpc/powerpc/intr_machdep.c
@@ -82,7 +82,7 @@
 #include <sys/proc.h>
 
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 #include <machine/trap.h>
Index: sys/powerpc/powerpc/mp_machdep.c
===================================================================
--- sys/powerpc/powerpc/mp_machdep.c
+++ sys/powerpc/powerpc/mp_machdep.c
@@ -53,7 +53,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/pcb.h>
 #include <machine/platform.h>
 #include <machine/md_var.h>
Index: sys/powerpc/powerpc/nexus.c
===================================================================
--- sys/powerpc/powerpc/nexus.c
+++ sys/powerpc/powerpc/nexus.c
@@ -55,7 +55,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/resource.h>
 
 /*
Index: sys/powerpc/powerpc/openpic.c
===================================================================
--- sys/powerpc/powerpc/openpic.c
+++ sys/powerpc/powerpc/openpic.c
@@ -39,7 +39,7 @@
 #include <sys/smp.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/ps3/ps3pic.c
===================================================================
--- sys/powerpc/ps3/ps3pic.c
+++ sys/powerpc/ps3/ps3pic.c
@@ -39,7 +39,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/platform.h>
 
Index: sys/powerpc/pseries/rtas_pci.c
===================================================================
--- sys/powerpc/pseries/rtas_pci.c
+++ sys/powerpc/pseries/rtas_pci.c
@@ -46,7 +46,7 @@
 #include <dev/pci/pcireg.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/powerpc/pseries/vdevice.c
===================================================================
--- sys/powerpc/pseries/vdevice.c
+++ sys/powerpc/pseries/vdevice.c
@@ -37,7 +37,7 @@
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
Index: sys/powerpc/pseries/xics.c
===================================================================
--- sys/powerpc/pseries/xics.c
+++ sys/powerpc/pseries/xics.c
@@ -45,7 +45,7 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/rtas.h>
 
Index: sys/powerpc/psim/openpic_iobus.c
===================================================================
--- sys/powerpc/psim/openpic_iobus.c
+++ sys/powerpc/psim/openpic_iobus.c
@@ -45,7 +45,7 @@
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/pio.h>
 #include <machine/resource.h>
Index: sys/x86/acpica/madt.c
===================================================================
--- sys/x86/acpica/madt.c
+++ sys/x86/acpica/madt.c
@@ -39,7 +39,7 @@
 #include <vm/pmap.h>
 
 #include <x86/apicreg.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/md_var.h>
 #include <x86/vmware.h>
Index: sys/x86/include/intr_machdep.h
===================================================================
--- /dev/null
+++ sys/x86/include/intr_machdep.h
@@ -1,175 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef __X86_INTR_MACHDEP_H__
-#define	__X86_INTR_MACHDEP_H__
-
-#ifdef _KERNEL
-
-/*
- * Values used in determining the allocation of IRQ values among
- * different types of I/O interrupts.  These values are used as
- * indices into a interrupt source array to map I/O interrupts to a
- * device interrupt source whether it be a pin on an interrupt
- * controller or an MSI interrupt.  The 16 ISA IRQs are assigned fixed
- * IDT vectors, but all other device interrupts allocate IDT vectors
- * on demand.  Currently we have 191 IDT vectors available for device
- * interrupts on each CPU.  On many systems with I/O APICs, a lot of
- * the IRQs are not used, so the total number of IRQ values reserved
- * can exceed the number of available IDT slots.
- *
- * The first 16 IRQs (0 - 15) are reserved for ISA IRQs.  Interrupt
- * pins on I/O APICs for non-ISA interrupts use IRQ values starting at
- * IRQ 17.  This layout matches the GSI numbering used by ACPI so that
- * IRQ values returned by ACPI methods such as _CRS can be used
- * directly by the ACPI bus driver.
- *
- * MSI interrupts allocate a block of interrupts starting at the end
- * of the I/O APIC range.  When running under the Xen Hypervisor, an
- * additional range of IRQ values are available for binding to event
- * channel events.
- */
-extern u_int first_msi_irq;
-extern u_int num_io_irqs;
-extern u_int num_msi_irqs;
-
-/*
- * Default base address for MSI messages on x86 platforms.
- */
-#define	MSI_INTEL_ADDR_BASE		0xfee00000
-
-#ifndef LOCORE
-
-typedef void inthand_t(void);
-
-#define	IDTVEC(name)	__CONCAT(X,name)
-
-struct intsrc;
-
-/*
- * Methods that a PIC provides to mask/unmask a given interrupt source,
- * "turn on" the interrupt on the CPU side by setting up an IDT entry, and
- * return the vector associated with this source.
- */
-struct pic {
-	void (*pic_register_sources)(struct pic *);
-	void (*pic_enable_source)(struct intsrc *);
-	void (*pic_disable_source)(struct intsrc *, int);
-	void (*pic_eoi_source)(struct intsrc *);
-	void (*pic_enable_intr)(struct intsrc *);
-	void (*pic_disable_intr)(struct intsrc *);
-	int (*pic_source_pending)(struct intsrc *);
-	void (*pic_suspend)(struct pic *);
-	void (*pic_resume)(struct pic *, bool suspend_cancelled);
-	int (*pic_config_intr)(struct intsrc *, enum intr_trigger,
-	    enum intr_polarity);
-	int (*pic_assign_cpu)(struct intsrc *, u_int apic_id);
-	void (*pic_reprogram_pin)(struct intsrc *);
-	TAILQ_ENTRY(pic) pics;
-};
-
-/* Flags for pic_disable_source() */
-enum {
-	PIC_EOI,
-	PIC_NO_EOI,
-};
-
-/*
- * An interrupt source.  The upper-layer code uses the PIC methods to
- * control a given source.  The lower-layer PIC drivers can store additional
- * private data in a given interrupt source such as an interrupt pin number
- * or an I/O APIC pointer.
- */
-struct intsrc {
-	struct pic *is_pic;
-	struct intr_event *is_event;
-	u_long *is_count;
-	u_long *is_straycount;
-	u_int is_index;
-	u_int is_handlers;
-	u_int is_domain;
-	u_int is_cpu;
-};
-
-struct trapframe;
-
-#ifdef SMP
-extern cpuset_t intr_cpus;
-#endif
-extern struct mtx icu_lock;
-extern int elcr_found;
-#ifdef SMP
-extern int msix_disable_migration;
-#endif
-
-#ifndef DEV_ATPIC
-void	atpic_reset(void);
-#endif
-/* XXX: The elcr_* prototypes probably belong somewhere else. */
-int	elcr_probe(void);
-enum intr_trigger elcr_read_trigger(u_int irq);
-void	elcr_resume(void);
-void	elcr_write_trigger(u_int irq, enum intr_trigger trigger);
-#ifdef SMP
-void	intr_add_cpu(u_int cpu);
-#endif
-int	intr_add_handler(const char *name, struct intsrc *isrc,
-     driver_filter_t filter, driver_intr_t handler, void *arg,
-     enum intr_type flags, void **cookiep, int domain);
-#ifdef SMP
-int	intr_bind(struct intsrc *isrc, u_char cpu);
-#endif
-int	intr_config_intr(struct intsrc *isrc, enum intr_trigger trig,
-    enum intr_polarity pol);
-int	intr_describe(struct intsrc *isrc, void *ih, const char *descr);
-void	intr_execute_handlers(u_int vector, struct intsrc *isrc,
-    struct trapframe *frame);
-u_int	intr_next_cpu(int domain);
-struct intsrc *intr_lookup_source(int vector);
-int	intr_register_pic(struct pic *pic);
-int	intr_register_source(u_int vector, struct intsrc *isrc);
-int	intr_remove_handler(void *cookie);
-void	intr_resume(bool suspend_cancelled);
-void	intr_suspend(void);
-void	intr_reprogram(void);
-void	intrcnt_add(const char *name, u_long **countp);
-void	nexus_add_irq(u_long irq);
-int	msi_alloc(device_t dev, int count, int maxcount, int *irqs);
-void	msi_init(void);
-int	msi_map(int irq, uint64_t *addr, uint32_t *data);
-int	msi_release(int *irqs, int count);
-int	msix_alloc(device_t dev, int *irq);
-int	msix_release(int irq);
-#ifdef XENHVM
-void	xen_intr_alloc_irqs(void);
-#endif
-
-#endif	/* !LOCORE */
-#endif	/* _KERNEL */
-#endif	/* !__X86_INTR_MACHDEP_H__ */
Index: sys/x86/include/x86_smp.h
===================================================================
--- sys/x86/include/x86_smp.h
+++ sys/x86/include/x86_smp.h
@@ -17,7 +17,7 @@
 
 #include <sys/bus.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/pcb.h>
 
Index: sys/x86/iommu/intel_drv.c
===================================================================
--- sys/x86/iommu/intel_drv.c
+++ sys/x86/iommu/intel_drv.c
@@ -74,7 +74,7 @@
 
 #ifdef DEV_APIC
 #include "pcib_if.h"
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicreg.h>
 #include <x86/apicvar.h>
 #endif
Index: sys/x86/iommu/intel_intrmap.c
===================================================================
--- sys/x86/iommu/intel_intrmap.c
+++ sys/x86/iommu/intel_intrmap.c
@@ -51,7 +51,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/include/apicreg.h>
 #include <x86/include/apicvar.h>
 #include <x86/include/busdma_impl.h>
Index: sys/x86/iommu/intel_utils.c
===================================================================
--- sys/x86/iommu/intel_utils.c
+++ sys/x86/iommu/intel_utils.c
@@ -61,7 +61,7 @@
 #include <dev/pci/pcivar.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/include/apicvar.h>
 #include <x86/include/busdma_impl.h>
 #include <dev/iommu/busdma_iommu.h>
Index: sys/x86/isa/atpic.c
===================================================================
--- sys/x86/isa/atpic.c
+++ sys/x86/isa/atpic.c
@@ -47,7 +47,7 @@
 
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/resource.h>
 #include <machine/segments.h>
Index: sys/x86/isa/atrtc.c
===================================================================
--- sys/x86/isa/atrtc.c
+++ sys/x86/isa/atrtc.c
@@ -53,7 +53,7 @@
 #include <isa/isareg.h>
 #include <isa/isavar.h>
 #endif
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include "clock_if.h"
 #ifdef DEV_ACPI
 #include <contrib/dev/acpica/include/acpi.h>
Index: sys/x86/isa/clock.c
===================================================================
--- sys/x86/isa/clock.c
+++ sys/x86/isa/clock.c
@@ -68,7 +68,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
 #include <x86/apicvar.h>
Index: sys/x86/isa/elcr.c
===================================================================
--- sys/x86/isa/elcr.c
+++ sys/x86/isa/elcr.c
@@ -49,7 +49,7 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/systm.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 
 #define	ELCR_PORT	0x4d0
 #define	ELCR_MASK(irq)	(1 << (irq))
Index: sys/x86/x86/identcpu.c
===================================================================
--- sys/x86/x86/identcpu.c
+++ sys/x86/x86/identcpu.c
@@ -60,7 +60,7 @@
 #include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
Index: sys/x86/x86/intr_machdep.c
===================================================================
--- sys/x86/x86/intr_machdep.c
+++ sys/x86/x86/intr_machdep.c
@@ -58,7 +58,7 @@
 #include <sys/taskqueue.h>
 #include <sys/vmmeter.h>
 #include <machine/clock.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/smp.h>
 #ifdef DDB
 #include <ddb/ddb.h>
Index: sys/x86/x86/io_apic.c
===================================================================
--- sys/x86/x86/io_apic.c
+++ sys/x86/x86/io_apic.c
@@ -51,7 +51,7 @@
 
 #include <x86/apicreg.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/resource.h>
 #include <machine/segments.h>
Index: sys/x86/x86/local_apic.c
===================================================================
--- sys/x86/x86/local_apic.c
+++ sys/x86/x86/local_apic.c
@@ -67,7 +67,7 @@
 #include <machine/cputypes.h>
 #include <machine/fpu.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
Index: sys/x86/x86/mca.c
===================================================================
--- sys/x86/x86/mca.c
+++ sys/x86/x86/mca.c
@@ -53,7 +53,7 @@
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/taskqueue.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
Index: sys/x86/x86/mptable.c
===================================================================
--- sys/x86/x86/mptable.c
+++ sys/x86/x86/mptable.c
@@ -52,7 +52,7 @@
 #include <x86/apicreg.h>
 #include <x86/mptable.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
Index: sys/x86/x86/msi.c
===================================================================
--- sys/x86/x86/msi.c
+++ sys/x86/x86/msi.c
@@ -56,7 +56,7 @@
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <x86/iommu/iommu_intrmap.h>
 #include <machine/specialreg.h>
Index: sys/x86/x86/nexus.c
===================================================================
--- sys/x86/x86/nexus.c
+++ sys/x86/x86/nexus.c
@@ -57,7 +57,7 @@
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <sys/rman.h>
 #include <sys/interrupt.h>
 
Index: sys/x86/xen/pv.c
===================================================================
--- sys/x86/xen/pv.c
+++ sys/x86/xen/pv.c
@@ -60,12 +60,12 @@
 #include <vm/vm_param.h>
 
 #include <machine/_inttypes.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <x86/init.h>
 #include <machine/pc/bios.h>
 #include <machine/smp.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 
Index: sys/x86/xen/xen_apic.c
===================================================================
--- sys/x86/xen/xen_apic.c
+++ sys/x86/xen/xen_apic.c
@@ -40,7 +40,7 @@
 
 #include <machine/cpufunc.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <machine/md_var.h>
 #include <machine/smp.h>
 
Index: sys/x86/xen/xen_intr.c
===================================================================
--- sys/x86/xen/xen_intr.c
+++ sys/x86/xen/xen_intr.c
@@ -50,7 +50,7 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/intr_machdep.h>
+#include <machine/intr.h>
 #include <x86/apicvar.h>
 #include <x86/apicreg.h>
 #include <machine/smp.h>