From a97c4affc9c997d3ae627c659b8d3dcf21695212 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 10 Mar 2025 23:05:19 -0400
Subject: [PATCH] kernel: Rename basic "int" functions to "interrupt" (or at
 least "intr").
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"int" of course is also an abbrevation for "integer", so having
two abbreviations is sometimes confusing. The BeOS functions
just use "interrupt" (e.g. "install_io_interrupt_handler"); it
seems we inherited the "int" abbreviation from NewOS.

The basic kernel methods and files related to interrupts are
here adjusted to drop the abbreviation and just use "interrupt(s)".
The architecture-specific functions ("arch_int_*") are mostly
moment left alone for now, though of course architecture-specific
usages of the generic kernel methods are adjusted.

Change-Id: Ic113ea1280a3c78e25f8ca3cc55b24ed5f594eae
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9119
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
---
 headers/private/kernel/cpu.h                  |  2 +-
 .../private/kernel/{int.h => interrupts.h}    | 17 ++++++++-------
 headers/private/kernel/kscheduler.h           |  2 +-
 headers/private/kernel/smp.h                  |  2 +-
 headers/private/kernel/util/AutoLock.h        |  2 +-
 .../pci/designware/MsiInterruptCtrlDW.cpp     |  4 ++--
 .../input/virtio_input/virtio_input.cpp       |  1 -
 src/libs/compat/freebsd_network/bus.cpp       |  2 +-
 .../compat/openbsd_network/compat/sys/systm.h |  2 +-
 src/system/kernel/Jamfile                     |  2 +-
 src/system/kernel/arch/arm/arch_int.cpp       |  2 +-
 src/system/kernel/arch/arm/arch_int_gicv2.cpp |  5 +++--
 src/system/kernel/arch/arm/arch_smp.cpp       |  2 +-
 .../kernel/arch/arm/arch_user_debugger.cpp    |  2 +-
 .../arm/paging/32bit/ARMPagingMethod32Bit.cpp |  2 +-
 .../paging/32bit/ARMVMTranslationMap32Bit.cpp |  2 +-
 .../kernel/arch/arm/paging/32bit/paging.h     |  2 +-
 src/system/kernel/arch/arm/soc.h              |  2 +-
 src/system/kernel/arch/arm/soc_omap3.cpp      |  2 +-
 src/system/kernel/arch/arm/soc_pxa.cpp        |  2 +-
 src/system/kernel/arch/arm/soc_sun4i.cpp      |  6 +++---
 src/system/kernel/arch/arm64/arch_int.cpp     |  2 +-
 src/system/kernel/arch/arm64/arch_smp.cpp     |  2 +-
 src/system/kernel/arch/arm64/arch_timer.cpp   |  2 +-
 .../kernel/arch/arm64/arch_user_debugger.cpp  |  2 +-
 .../arch/generic/acpi_irq_routing_table.cpp   |  2 +-
 src/system/kernel/arch/m68k/arch_int.cpp      |  8 +++----
 src/system/kernel/arch/m68k/arch_smp.cpp      |  2 +-
 .../kernel/arch/m68k/arch_user_debugger.cpp   |  2 +-
 .../arch/m68k/arch_vm_translation_map.cpp     |  2 +-
 .../m68k/arch_vm_translation_map_impl.cpp     |  2 +-
 .../m68k/paging/040/M68KPagingMethod040.cpp   |  2 +-
 .../paging/040/M68KVMTranslationMap040.cpp    |  2 +-
 .../kernel/arch/m68k/paging/040/paging.h      |  2 +-
 src/system/kernel/arch/ppc/arch_int.cpp       |  4 ++--
 src/system/kernel/arch/ppc/arch_smp.cpp       |  2 +-
 .../kernel/arch/ppc/arch_user_debugger.cpp    |  2 +-
 .../arch/ppc/arch_vm_translation_map.cpp      |  2 +-
 .../ppc/paging/460/PPCPagingMethod460.cpp     |  2 +-
 .../ppc/paging/460/PPCVMTranslationMap460.cpp |  2 +-
 .../paging/classic/PPCPagingMethodClassic.cpp |  2 +-
 .../classic/PPCVMTranslationMapClassic.cpp    |  2 +-
 src/system/kernel/arch/riscv64/arch_int.cpp   |  6 +++---
 src/system/kernel/arch/riscv64/arch_smp.cpp   |  2 +-
 .../arch/riscv64/arch_user_debugger.cpp       |  2 +-
 src/system/kernel/arch/sparc/arch_int.cpp     |  2 +-
 src/system/kernel/arch/sparc/arch_smp.cpp     |  2 +-
 .../kernel/arch/sparc/arch_user_debugger.cpp  |  2 +-
 src/system/kernel/arch/x86/32/descriptors.cpp |  2 +-
 src/system/kernel/arch/x86/32/interrupts.S    | 16 +++++++-------
 src/system/kernel/arch/x86/32/thread.cpp      |  2 +-
 src/system/kernel/arch/x86/64/interrupts.S    | 14 ++++++-------
 src/system/kernel/arch/x86/64/thread.cpp      |  2 +-
 .../kernel/arch/x86/arch_debug_console.cpp    |  2 +-
 src/system/kernel/arch/x86/arch_int.cpp       |  4 ++--
 src/system/kernel/arch/x86/arch_smp.cpp       |  4 ++--
 src/system/kernel/arch/x86/arch_thread.cpp    |  2 +-
 src/system/kernel/arch/x86/arch_timer.cpp     |  2 +-
 .../kernel/arch/x86/arch_user_debugger.cpp    |  2 +-
 src/system/kernel/arch/x86/ioapic.cpp         |  4 ++--
 src/system/kernel/arch/x86/msi.cpp            |  2 +-
 .../x86/paging/32bit/X86PagingMethod32Bit.cpp |  2 +-
 .../paging/32bit/X86VMTranslationMap32Bit.cpp |  2 +-
 .../kernel/arch/x86/paging/32bit/paging.h     |  2 +-
 .../paging/64bit/X86PagingStructures64Bit.cpp |  2 +-
 .../paging/64bit/X86VMTranslationMap64Bit.cpp |  2 +-
 .../x86/paging/pae/X86PagingStructuresPAE.cpp |  2 +-
 .../x86/paging/pae/X86VMTranslationMapPAE.cpp |  2 +-
 src/system/kernel/arch/x86/pic.cpp            |  2 +-
 .../kernel/arch/x86/syscalls_compat.cpp       |  2 +-
 .../kernel/arch/x86/timers/x86_apic.cpp       |  2 +-
 .../kernel/arch/x86/timers/x86_hpet.cpp       |  2 +-
 src/system/kernel/condition_variable.cpp      |  2 +-
 src/system/kernel/debug/debug.cpp             |  8 +++----
 src/system/kernel/debug/tracing.cpp           |  2 +-
 src/system/kernel/heap.cpp                    |  2 +-
 src/system/kernel/{int.cpp => interrupts.cpp} | 21 ++++++++-----------
 src/system/kernel/locks/lock.cpp              |  2 +-
 src/system/kernel/main.cpp                    | 10 ++++-----
 src/system/kernel/scheduler/scheduler.cpp     |  2 +-
 src/system/kernel/sem.cpp                     |  2 +-
 src/system/kernel/slab/ObjectDepot.cpp        |  2 +-
 src/system/kernel/smp.cpp                     | 10 ++++-----
 src/system/kernel/syscalls.cpp                |  2 +-
 src/system/kernel/team.cpp                    |  2 +-
 src/system/kernel/thread.cpp                  |  2 +-
 .../kernel/util/KernelReferenceable.cpp       |  2 +-
 src/system/kernel/vm/VMCache.cpp              |  2 +-
 src/system/kernel/vm/VMPageQueue.h            |  2 +-
 src/system/kernel/vm/vm.cpp                   |  2 +-
 90 files changed, 143 insertions(+), 145 deletions(-)
 rename headers/private/kernel/{int.h => interrupts.h} (79%)
 rename src/system/kernel/{int.cpp => interrupts.cpp} (97%)

diff --git a/headers/private/kernel/cpu.h b/headers/private/kernel/cpu.h
index eb3ca2d8ab..a864d5fb16 100644
--- a/headers/private/kernel/cpu.h
+++ b/headers/private/kernel/cpu.h
@@ -11,7 +11,7 @@
 
 #include <setjmp.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <smp.h>
 #include <timer.h>
 #include <arch/cpu.h>
diff --git a/headers/private/kernel/int.h b/headers/private/kernel/interrupts.h
similarity index 79%
rename from headers/private/kernel/int.h
rename to headers/private/kernel/interrupts.h
index 5f2cdf41b7..f2d61fae1c 100644
--- a/headers/private/kernel/int.h
+++ b/headers/private/kernel/interrupts.h
@@ -5,8 +5,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_INT_H
-#define _KERNEL_INT_H
+#ifndef _KERNEL_INTERRUPTS_H
+#define _KERNEL_INTERRUPTS_H
 
 
 #include <KernelExport.h>
@@ -47,11 +47,11 @@ struct irq_assignment {
 extern "C" {
 #endif
 
-status_t int_init(struct kernel_args* args);
-status_t int_init_post_vm(struct kernel_args* args);
-status_t int_init_io(struct kernel_args* args);
-status_t int_init_post_device_manager(struct kernel_args* args);
-int int_io_interrupt_handler(int vector, bool levelTriggered);
+status_t interrupts_init(struct kernel_args* args);
+status_t interrupts_init_post_vm(struct kernel_args* args);
+status_t interrupts_init_io(struct kernel_args* args);
+status_t interrupts_init_post_device_manager(struct kernel_args* args);
+int io_interrupt_handler(int vector, bool levelTriggered);
 
 bool interrupts_enabled(void);
 
@@ -85,4 +85,5 @@ void free_io_interrupt_vectors(int32 count, int32 startVector);
 
 void assign_io_interrupt_to_cpu(int32 vector, int32 cpu);
 
-#endif /* _KERNEL_INT_H */
+
+#endif /* _KERNEL_INTERRUPTS_H */
diff --git a/headers/private/kernel/kscheduler.h b/headers/private/kernel/kscheduler.h
index 15072f4c9d..df8a71e551 100644
--- a/headers/private/kernel/kscheduler.h
+++ b/headers/private/kernel/kscheduler.h
@@ -9,7 +9,7 @@
 
 
 #include <cpu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <smp.h>
 #include <thread_types.h>
 
diff --git a/headers/private/kernel/smp.h b/headers/private/kernel/smp.h
index 4736183d4a..a1fab4ed78 100644
--- a/headers/private/kernel/smp.h
+++ b/headers/private/kernel/smp.h
@@ -94,7 +94,7 @@ int32 smp_get_num_cpus(void);
 void smp_set_num_cpus(int32 numCPUs);
 int32 smp_get_current_cpu(void);
 
-int smp_intercpu_int_handler(int32 cpu);
+int smp_intercpu_interrupt_handler(int32 cpu);
 
 void call_single_cpu(uint32 targetCPU, void (*func)(void*, int), void* cookie);
 void call_single_cpu_sync(uint32 targetCPU, void (*func)(void*, int),
diff --git a/headers/private/kernel/util/AutoLock.h b/headers/private/kernel/util/AutoLock.h
index c05b22e3f8..d05897598f 100644
--- a/headers/private/kernel/util/AutoLock.h
+++ b/headers/private/kernel/util/AutoLock.h
@@ -12,7 +12,7 @@
 
 #include <shared/AutoLocker.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <lock.h>
 
 
diff --git a/src/add-ons/kernel/busses/pci/designware/MsiInterruptCtrlDW.cpp b/src/add-ons/kernel/busses/pci/designware/MsiInterruptCtrlDW.cpp
index 2457ba115a..dffbf19736 100644
--- a/src/add-ons/kernel/busses/pci/designware/MsiInterruptCtrlDW.cpp
+++ b/src/add-ons/kernel/busses/pci/designware/MsiInterruptCtrlDW.cpp
@@ -6,7 +6,7 @@
 
 #include "DWPCIController.h"
 
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
@@ -104,7 +104,7 @@ MsiInterruptCtrlDW::InterruptReceivedInt()
 	for (int i = 0; i < 32; i++) {
 		if (((1 << i) & status) != 0) {
 //			dprintf("MSI IRQ: %d (%ld)\n", i, fStartMsiIrq + i);
-			int_io_interrupt_handler(fMsiStartIrq + i, false);
+			io_interrupt_handler(fMsiStartIrq + i, false);
 			fDbiRegs->msiIntr[0].status = (1 << i);
 		}
 	}
diff --git a/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp b/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp
index 635bca5009..5093d2c964 100644
--- a/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp
+++ b/src/add-ons/kernel/drivers/input/virtio_input/virtio_input.cpp
@@ -15,7 +15,6 @@
 
 #include <kernel.h>
 #include <fs/devfs.h>
-#include <int.h>
 
 #include <virtio_input_driver.h>
 
diff --git a/src/libs/compat/freebsd_network/bus.cpp b/src/libs/compat/freebsd_network/bus.cpp
index b0b601285b..3c73f66bb7 100644
--- a/src/libs/compat/freebsd_network/bus.cpp
+++ b/src/libs/compat/freebsd_network/bus.cpp
@@ -12,7 +12,7 @@ extern "C" {
 #include <cstdlib>
 
 #include <arch/cpu.h>
-#include <int.h>
+#include <interrupts.h>
 
 extern "C" {
 #include <compat/dev/pci/pcireg.h>
diff --git a/src/libs/compat/openbsd_network/compat/sys/systm.h b/src/libs/compat/openbsd_network/compat/sys/systm.h
index e684d4b545..1ea623b381 100644
--- a/src/libs/compat/openbsd_network/compat/sys/systm.h
+++ b/src/libs/compat/openbsd_network/compat/sys/systm.h
@@ -9,7 +9,7 @@
 #include_next <sys/systm.h>
 #include <sys/kernel.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 
 #define	INFSLP	UINT64_MAX
diff --git a/src/system/kernel/Jamfile b/src/system/kernel/Jamfile
index 795c44d3f2..e302d06bd1 100644
--- a/src/system/kernel/Jamfile
+++ b/src/system/kernel/Jamfile
@@ -35,7 +35,7 @@ KernelMergeObject kernel_core.o :
 	guarded_heap.cpp
 	heap.cpp
 	image.cpp
-	int.cpp
+	interrupts.cpp
 	kernel_daemon.cpp
 	linkhack.c
 	listeners.cpp
diff --git a/src/system/kernel/arch/arm/arch_int.cpp b/src/system/kernel/arch/arm/arch_int.cpp
index 2e35243a9e..aa985794a4 100644
--- a/src/system/kernel/arch/arm/arch_int.cpp
+++ b/src/system/kernel/arch/arm/arch_int.cpp
@@ -13,7 +13,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <arch_cpu_defs.h>
 #include <arch/smp.h>
diff --git a/src/system/kernel/arch/arm/arch_int_gicv2.cpp b/src/system/kernel/arch/arm/arch_int_gicv2.cpp
index fe87d82c87..74e8ce69a6 100644
--- a/src/system/kernel/arch/arm/arch_int_gicv2.cpp
+++ b/src/system/kernel/arch/arm/arch_int_gicv2.cpp
@@ -2,7 +2,8 @@
  * Copyright 2021-2022 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#include <int.h>
+
+#include <interrupts.h>
 #include <interrupt_controller.h>
 #include <kernel.h>
 #include <vm/vm.h>
@@ -80,7 +81,7 @@ void GICv2InterruptController::HandleInterrupt()
 	if ((irqnr == 1022) || (irqnr == 1023)) {
 		dprintf("spurious interrupt\n");
 	} else {
-		int_io_interrupt_handler(irqnr, true);
+		io_interrupt_handler(irqnr, true);
 	}
 
 	fGiccRegs[GICC_REG_EOIR] = iar;
diff --git a/src/system/kernel/arch/arm/arch_smp.cpp b/src/system/kernel/arch/arm/arch_smp.cpp
index 6c51cd0291..b45fd9bf8e 100644
--- a/src/system/kernel/arch/arm/arch_smp.cpp
+++ b/src/system/kernel/arch/arm/arch_smp.cpp
@@ -15,7 +15,7 @@
 #include <boot/stage2.h>
 #include <arch/smp.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
diff --git a/src/system/kernel/arch/arm/arch_user_debugger.cpp b/src/system/kernel/arch/arm/arch_user_debugger.cpp
index 5ae6e79b2f..8721605a06 100644
--- a/src/system/kernel/arch/arm/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/arm/arch_user_debugger.cpp
@@ -8,7 +8,7 @@
 
 
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/arm/paging/32bit/ARMPagingMethod32Bit.cpp b/src/system/kernel/arch/arm/paging/32bit/ARMPagingMethod32Bit.cpp
index fbbc0a7417..c25b8521d5 100644
--- a/src/system/kernel/arch/arm/paging/32bit/ARMPagingMethod32Bit.cpp
+++ b/src/system/kernel/arch/arm/paging/32bit/ARMPagingMethod32Bit.cpp
@@ -19,7 +19,7 @@
 #include <arch/smp.h>
 #include <arch_system_info.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <vm/vm.h>
 #include <vm/VMAddressSpace.h>
diff --git a/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp b/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp
index 32421bb2a8..3378c249bd 100644
--- a/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp
+++ b/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/arch/arm/paging/32bit/paging.h b/src/system/kernel/arch/arm/paging/32bit/paging.h
index b6479c2351..b05c35a655 100644
--- a/src/system/kernel/arch/arm/paging/32bit/paging.h
+++ b/src/system/kernel/arch/arm/paging/32bit/paging.h
@@ -13,7 +13,7 @@
 
 #include <SupportDefs.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 
 #include <arm_mmu.h>
diff --git a/src/system/kernel/arch/arm/soc.h b/src/system/kernel/arch/arm/soc.h
index 4597bf2675..83ef633952 100644
--- a/src/system/kernel/arch/arm/soc.h
+++ b/src/system/kernel/arch/arm/soc.h
@@ -4,7 +4,7 @@
 class InterruptController;
 
 #include <drivers/bus/FDT.h>
-#include <private/kernel/int.h>
+#include <private/kernel/interrupts.h>
 #include <private/kernel/timer.h>
 
 // ------------------------------------------------------ InterruptController
diff --git a/src/system/kernel/arch/arm/soc_omap3.cpp b/src/system/kernel/arch/arm/soc_omap3.cpp
index c57bf979f7..0df6eee48c 100644
--- a/src/system/kernel/arch/arm/soc_omap3.cpp
+++ b/src/system/kernel/arch/arm/soc_omap3.cpp
@@ -62,7 +62,7 @@ OMAP3InterruptController::HandleInterrupt()
 		irqnr &= 0x7f; /* ACTIVEIRQ */
 
 		if (irqnr) {
-			int_io_interrupt_handler(irqnr, true);
+			io_interrupt_handler(irqnr, true);
 			handledIRQ = true;
 		}
 	} while(irqnr);
diff --git a/src/system/kernel/arch/arm/soc_pxa.cpp b/src/system/kernel/arch/arm/soc_pxa.cpp
index 18d9c758fe..d7793273cd 100644
--- a/src/system/kernel/arch/arm/soc_pxa.cpp
+++ b/src/system/kernel/arch/arm/soc_pxa.cpp
@@ -37,7 +37,7 @@ PXAInterruptController::HandleInterrupt()
 {
 	for (int i=0; i < 32; i++) {
 		if (fRegBase[PXA_ICIP] & (1 << i))
-			int_io_interrupt_handler(i, true);
+			io_interrupt_handler(i, true);
 	}
 }
 
diff --git a/src/system/kernel/arch/arm/soc_sun4i.cpp b/src/system/kernel/arch/arm/soc_sun4i.cpp
index 3e0739e503..b53ace5b1e 100644
--- a/src/system/kernel/arch/arm/soc_sun4i.cpp
+++ b/src/system/kernel/arch/arm/soc_sun4i.cpp
@@ -56,17 +56,17 @@ Sun4iInterruptController::HandleInterrupt()
 	// FIXME can we use the hardware managed interrupt vector instead?
 	for (int i=0; i < 32; i++) {
 		if (fRegBase[SUN4I_INTC_PEND_REG0] & (1 << i))
-			int_io_interrupt_handler(i, true);
+			io_interrupt_handler(i, true);
 	}
 
 	for (int i=0; i < 32; i++) {
 		if (fRegBase[SUN4I_INTC_PEND_REG1] & (1 << i))
-			int_io_interrupt_handler(i + 32, true);
+			io_interrupt_handler(i + 32, true);
 	}
 
 	for (int i=0; i < 32; i++) {
 		if (fRegBase[SUN4I_INTC_PEND_REG2] & (1 << i))
-			int_io_interrupt_handler(i + 64, true);
+			io_interrupt_handler(i + 64, true);
 	}
 }
 
diff --git a/src/system/kernel/arch/arm64/arch_int.cpp b/src/system/kernel/arch/arm64/arch_int.cpp
index 319ff9caaf..a0c6426e5f 100644
--- a/src/system/kernel/arch/arm64/arch_int.cpp
+++ b/src/system/kernel/arch/arm64/arch_int.cpp
@@ -2,7 +2,7 @@
  * Copyright 2019-2022 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
-#include <int.h>
+#include <interrupts.h>
 
 #include <arch/smp.h>
 #include <boot/kernel_args.h>
diff --git a/src/system/kernel/arch/arm64/arch_smp.cpp b/src/system/kernel/arch/arm64/arch_smp.cpp
index db45b10bd6..3e8d78f956 100644
--- a/src/system/kernel/arch/arm64/arch_smp.cpp
+++ b/src/system/kernel/arch/arm64/arch_smp.cpp
@@ -7,7 +7,7 @@
 #include <boot/stage2.h>
 #include <arch/smp.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
diff --git a/src/system/kernel/arch/arm64/arch_timer.cpp b/src/system/kernel/arch/arm64/arch_timer.cpp
index d2c0ac631b..ae2de6de2f 100644
--- a/src/system/kernel/arch/arm64/arch_timer.cpp
+++ b/src/system/kernel/arch/arm64/arch_timer.cpp
@@ -5,7 +5,7 @@
 #include <boot/stage2.h>
 #include <kernel.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 #include <timer.h>
 #include <arch/timer.h>
diff --git a/src/system/kernel/arch/arm64/arch_user_debugger.cpp b/src/system/kernel/arch/arm64/arch_user_debugger.cpp
index d2a232046c..3f63b29e17 100644
--- a/src/system/kernel/arch/arm64/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/arm64/arch_user_debugger.cpp
@@ -3,7 +3,7 @@
  * Distributed under the terms of the MIT License.
  */
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/generic/acpi_irq_routing_table.cpp b/src/system/kernel/arch/generic/acpi_irq_routing_table.cpp
index dca41f1e4c..0a129dad1b 100644
--- a/src/system/kernel/arch/generic/acpi_irq_routing_table.cpp
+++ b/src/system/kernel/arch/generic/acpi_irq_routing_table.cpp
@@ -11,7 +11,7 @@
 
 #include "acpi.h"
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <PCI.h>
 
diff --git a/src/system/kernel/arch/m68k/arch_int.cpp b/src/system/kernel/arch/m68k/arch_int.cpp
index db40fbbba5..f44514be4c 100644
--- a/src/system/kernel/arch/m68k/arch_int.cpp
+++ b/src/system/kernel/arch/m68k/arch_int.cpp
@@ -12,7 +12,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <arch_platform.h>
 #include <arch/smp.h>
@@ -278,11 +278,11 @@ m68k_exception_entry(struct iframe *iframe)
 			M68KPlatform::Default()->AcknowledgeIOInterrupt(vector);
 
 dprintf("handling I/O interrupts...\n");
-			int_io_interrupt_handler(vector, true);
+			io_interrupt_handler(vector, true);
 #if 0
 			while ((irq = sPIC->acknowledge_io_interrupt(sPICCookie)) >= 0) {
 // TODO: correctly pass level-triggered vs. edge-triggered to the handler!
-				int_io_interrupt_handler(irq, true);
+				io_interrupt_handler(irq, true);
 			}
 #endif
 dprintf("handling I/O interrupts done\n");
@@ -295,7 +295,7 @@ dprintf("handling I/O interrupts done\n");
 			// vectors >= 64 are user defined vectors, used for IRQ
 			if (vector >= 64) {
 				if (M68KPlatform::Default()->AcknowledgeIOInterrupt(vector)) {
-					int_io_interrupt_handler(vector, true);
+					io_interrupt_handler(vector, true);
 					break;
 				}
 			}
diff --git a/src/system/kernel/arch/m68k/arch_smp.cpp b/src/system/kernel/arch/m68k/arch_smp.cpp
index 68f6608a95..7eb3985c6a 100644
--- a/src/system/kernel/arch/m68k/arch_smp.cpp
+++ b/src/system/kernel/arch/m68k/arch_smp.cpp
@@ -15,7 +15,7 @@
 #include <boot/stage2.h>
 #include <arch/smp.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
diff --git a/src/system/kernel/arch/m68k/arch_user_debugger.cpp b/src/system/kernel/arch/m68k/arch_user_debugger.cpp
index c678f42072..5bf9e3cf60 100644
--- a/src/system/kernel/arch/m68k/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/m68k/arch_user_debugger.cpp
@@ -8,7 +8,7 @@
 
 
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp b/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
index 17d2e6183b..612b716c83 100644
--- a/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
+++ b/src/system/kernel/arch/m68k/arch_vm_translation_map.cpp
@@ -13,7 +13,7 @@
 #include <vm/vm.h>
 #include <vm/vm_priv.h>
 #include <vm/VMAddressSpace.h>
-#include <int.h>
+#include <interrupts.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>
 #include <arch/cpu.h>
diff --git a/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp b/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
index 2df56e2a02..24bb8b2da7 100644
--- a/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
+++ b/src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp
@@ -47,7 +47,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_priv.h>
 #include <vm/VMAddressSpace.h>
-#include <int.h>
+#include <interrupts.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>
 #include <arch/cpu.h>
diff --git a/src/system/kernel/arch/m68k/paging/040/M68KPagingMethod040.cpp b/src/system/kernel/arch/m68k/paging/040/M68KPagingMethod040.cpp
index f593d73648..125bf7c817 100644
--- a/src/system/kernel/arch/m68k/paging/040/M68KPagingMethod040.cpp
+++ b/src/system/kernel/arch/m68k/paging/040/M68KPagingMethod040.cpp
@@ -18,7 +18,7 @@
 
 #include <arch_system_info.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <vm/vm.h>
 #include <vm/VMAddressSpace.h>
diff --git a/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp b/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp
index 01a446ea5e..b53d32a200 100644
--- a/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp
+++ b/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/arch/m68k/paging/040/paging.h b/src/system/kernel/arch/m68k/paging/040/paging.h
index 7d49fee5a0..312e519220 100644
--- a/src/system/kernel/arch/m68k/paging/040/paging.h
+++ b/src/system/kernel/arch/m68k/paging/040/paging.h
@@ -12,7 +12,7 @@
 
 #include <SupportDefs.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 
 #include <arch_040_mmu.h>
diff --git a/src/system/kernel/arch/ppc/arch_int.cpp b/src/system/kernel/arch/ppc/arch_int.cpp
index d3b1186876..842db53eba 100644
--- a/src/system/kernel/arch/ppc/arch_int.cpp
+++ b/src/system/kernel/arch/ppc/arch_int.cpp
@@ -11,7 +11,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <arch/smp.h>
 #include <boot/kernel_args.h>
@@ -189,7 +189,7 @@ dprintf("handling I/O interrupts...\n");
 			int irq;
 			while ((irq = sPIC->acknowledge_io_interrupt(sPICCookie)) >= 0) {
 // TODO: correctly pass level-triggered vs. edge-triggered to the handler!
-				int_io_interrupt_handler(irq, true);
+				io_interrupt_handler(irq, true);
 			}
 dprintf("handling I/O interrupts done\n");
 			break;
diff --git a/src/system/kernel/arch/ppc/arch_smp.cpp b/src/system/kernel/arch/ppc/arch_smp.cpp
index d72d5a0486..43f215dcc2 100644
--- a/src/system/kernel/arch/ppc/arch_smp.cpp
+++ b/src/system/kernel/arch/ppc/arch_smp.cpp
@@ -6,7 +6,7 @@
 
 #include <KernelExport.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <boot/stage2.h>
 #include <arch/smp.h>
diff --git a/src/system/kernel/arch/ppc/arch_user_debugger.cpp b/src/system/kernel/arch/ppc/arch_user_debugger.cpp
index 19a898cfea..2bbf678600 100644
--- a/src/system/kernel/arch/ppc/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/ppc/arch_user_debugger.cpp
@@ -5,7 +5,7 @@
 
 
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
index 89ca4f9320..8ef4065914 100644
--- a/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
+++ b/src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
@@ -81,7 +81,7 @@
 #include <arch/cpu.h>
 //#include <arch_mmu.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <slab/Slab.h>
 #include <vm/vm.h>
diff --git a/src/system/kernel/arch/ppc/paging/460/PPCPagingMethod460.cpp b/src/system/kernel/arch/ppc/paging/460/PPCPagingMethod460.cpp
index af21faaa68..b9b7f97023 100644
--- a/src/system/kernel/arch/ppc/paging/460/PPCPagingMethod460.cpp
+++ b/src/system/kernel/arch/ppc/paging/460/PPCPagingMethod460.cpp
@@ -19,7 +19,7 @@
 #include <arch_mmu.h>
 #include <arch_system_info.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <vm/vm.h>
 #include <vm/VMAddressSpace.h>
diff --git a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
index 7e43db1822..e05bce0845 100644
--- a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
+++ b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp
@@ -79,7 +79,7 @@
 
 #include <arch/cpu.h>
 #include <arch_mmu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/arch/ppc/paging/classic/PPCPagingMethodClassic.cpp b/src/system/kernel/arch/ppc/paging/classic/PPCPagingMethodClassic.cpp
index 2b81a50d84..c61244c9a1 100644
--- a/src/system/kernel/arch/ppc/paging/classic/PPCPagingMethodClassic.cpp
+++ b/src/system/kernel/arch/ppc/paging/classic/PPCPagingMethodClassic.cpp
@@ -19,7 +19,7 @@
 #include <arch_mmu.h>
 #include <arch_system_info.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <vm/vm.h>
 #include <vm/VMAddressSpace.h>
diff --git a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
index 7da3607737..d759d65e27 100644
--- a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
+++ b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp
@@ -79,7 +79,7 @@
 
 #include <arch/cpu.h>
 #include <arch_mmu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/arch/riscv64/arch_int.cpp b/src/system/kernel/arch/riscv64/arch_int.cpp
index cda6f69d31..69c42bba69 100644
--- a/src/system/kernel/arch/riscv64/arch_int.cpp
+++ b/src/system/kernel/arch/riscv64/arch_int.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 #include <cpu.h>
 #include <thread.h>
 #include <vm/vm_priv.h>
@@ -258,7 +258,7 @@ STrap(iframe* frame)
 		case causeInterrupt + sSoftInt: {
 			ClearBitsSip(1 << sSoftInt);
 			// dprintf("sSoftInt(%" B_PRId32 ")\n", smp_get_current_cpu());
-			smp_intercpu_int_handler(smp_get_current_cpu());
+			smp_intercpu_interrupt_handler(smp_get_current_cpu());
 			AfterInterrupt();
 			return;
 		}
@@ -271,7 +271,7 @@ STrap(iframe* frame)
 		}
 		case causeInterrupt + sExternInt: {
 			uint64 irq = gPlicRegs->contexts[sPlicContexts[smp_get_current_cpu()]].claimAndComplete;
-			int_io_interrupt_handler(irq, true);
+			io_interrupt_handler(irq, true);
 			gPlicRegs->contexts[sPlicContexts[smp_get_current_cpu()]].claimAndComplete = irq;
 			AfterInterrupt();
 			return;
diff --git a/src/system/kernel/arch/riscv64/arch_smp.cpp b/src/system/kernel/arch/riscv64/arch_smp.cpp
index d3fb59baf7..ae6b21d2b0 100644
--- a/src/system/kernel/arch/riscv64/arch_smp.cpp
+++ b/src/system/kernel/arch/riscv64/arch_smp.cpp
@@ -15,7 +15,7 @@
 #include <boot/stage2.h>
 #include <arch/smp.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 #include <cpu.h>
 #include <platform/sbi/sbi_syscalls.h>
diff --git a/src/system/kernel/arch/riscv64/arch_user_debugger.cpp b/src/system/kernel/arch/riscv64/arch_user_debugger.cpp
index 0178d93051..2b3d7512b2 100644
--- a/src/system/kernel/arch/riscv64/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/riscv64/arch_user_debugger.cpp
@@ -5,7 +5,7 @@
 
 
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/sparc/arch_int.cpp b/src/system/kernel/arch/sparc/arch_int.cpp
index 11d1d1bd14..777b1d3a36 100644
--- a/src/system/kernel/arch/sparc/arch_int.cpp
+++ b/src/system/kernel/arch/sparc/arch_int.cpp
@@ -7,7 +7,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
diff --git a/src/system/kernel/arch/sparc/arch_smp.cpp b/src/system/kernel/arch/sparc/arch_smp.cpp
index 5971139e11..ad7f92d17d 100644
--- a/src/system/kernel/arch/sparc/arch_smp.cpp
+++ b/src/system/kernel/arch/sparc/arch_smp.cpp
@@ -15,7 +15,7 @@
 #include <boot/stage2.h>
 #include <arch/smp.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 
 
 status_t
diff --git a/src/system/kernel/arch/sparc/arch_user_debugger.cpp b/src/system/kernel/arch/sparc/arch_user_debugger.cpp
index 08023893e8..8dbb14f89e 100644
--- a/src/system/kernel/arch/sparc/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/sparc/arch_user_debugger.cpp
@@ -5,7 +5,7 @@
 
 
 #include <debugger.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <arch/user_debugger.h>
 
diff --git a/src/system/kernel/arch/x86/32/descriptors.cpp b/src/system/kernel/arch/x86/32/descriptors.cpp
index 87d6cf42e4..688390e391 100644
--- a/src/system/kernel/arch/x86/32/descriptors.cpp
+++ b/src/system/kernel/arch/x86/32/descriptors.cpp
@@ -18,7 +18,7 @@
 
 #include <boot/kernel_args.h>
 #include <cpu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <tls.h>
 #include <vm/vm.h>
 #include <vm/vm_priv.h>
diff --git a/src/system/kernel/arch/x86/32/interrupts.S b/src/system/kernel/arch/x86/32/interrupts.S
index 080c8a39ad..e753ef7774 100644
--- a/src/system/kernel/arch/x86/32/interrupts.S
+++ b/src/system/kernel/arch/x86/32/interrupts.S
@@ -180,7 +180,7 @@ FUNCTION(name): \
 	pushl	$vector; \
 	pushl	%edx; \
 	pushl	%eax; \
-	jmp		int_bottom;	\
+	jmp		intr_bottom;	\
 FUNCTION_END(name)
 
 #define TRAP(name, vector) \
@@ -190,7 +190,7 @@ FUNCTION(name): \
 	pushl	$vector; \
 	pushl	%edx; \
 	pushl	%eax; \
-	jmp		int_bottom; \
+	jmp		intr_bottom; \
 FUNCTION_END(name)
 
 TRAP(trap0, 0)
@@ -490,7 +490,7 @@ FUNCTION_END(trap14_double_fault)
 
 
 .align 16
-STATIC_FUNCTION(int_bottom):
+STATIC_FUNCTION(intr_bottom):
 	PUSH_IFRAME_BOTTOM(IFRAME_TYPE_OTHER)
 
 	movl	$KERNEL_TLS_SELECTOR, %edx
@@ -504,7 +504,7 @@ STATIC_FUNCTION(int_bottom):
 	orl		$0x10000, IFRAME_flags(%ebp);
 
 	cmpw	$USER_CODE_SELECTOR, IFRAME_cs(%ebp)	// user mode
-	je		int_bottom_user
+	je		intr_bottom_user
 
 	// We need to recheck user mode using the thread's in_kernel flag, since
 	// sysexit introduces a raced condition: It doesn't reenable interrupts,
@@ -513,7 +513,7 @@ STATIC_FUNCTION(int_bottom):
 	// up everything for userland already.
 	movl	%gs:0, %edi						// thread pointer
 	cmpb	$0, THREAD_in_kernel(%edi)
-	je		int_bottom_user
+	je		intr_bottom_user
 
 	// disable interrupts -- the handler will enable them, if necessary
 	cli
@@ -523,10 +523,10 @@ STATIC_FUNCTION(int_bottom):
 	call	*gInterruptHandlerTable(, %eax, 4)
 
 	POP_IFRAME_AND_RETURN()
-FUNCTION_END(int_bottom)
+FUNCTION_END(intr_bottom)
 
 
-STATIC_FUNCTION(int_bottom_user):
+STATIC_FUNCTION(intr_bottom_user):
 	movl	$KERNEL_DATA_SELECTOR, %eax
 	cld
 	movl	%eax,%ds
@@ -566,7 +566,7 @@ STATIC_FUNCTION(int_bottom_user):
 	// update the thread's kernel time and return
 	UPDATE_THREAD_KERNEL_TIME()
 	POP_IFRAME_AND_RETURN()
-FUNCTION_END(int_bottom_user)
+FUNCTION_END(intr_bottom_user)
 
 
 // test interrupt handler for performance measurements
diff --git a/src/system/kernel/arch/x86/32/thread.cpp b/src/system/kernel/arch/x86/32/thread.cpp
index 95ae3f86be..e3d749b8b3 100644
--- a/src/system/kernel/arch/x86/32/thread.cpp
+++ b/src/system/kernel/arch/x86/32/thread.cpp
@@ -18,7 +18,7 @@
 #include <debug.h>
 #include <kernel.h>
 #include <ksignal.h>
-#include <int.h>
+#include <interrupts.h>
 #include <team.h>
 #include <thread.h>
 #include <tls.h>
diff --git a/src/system/kernel/arch/x86/64/interrupts.S b/src/system/kernel/arch/x86/64/interrupts.S
index a07bb70cf3..d8c100a3ec 100644
--- a/src/system/kernel/arch/x86/64/interrupts.S
+++ b/src/system/kernel/arch/x86/64/interrupts.S
@@ -145,14 +145,14 @@
 	ASM_CLAC							\
 	push	$0;							\
 	push	$nr;						\
-	jmp		int_bottom;
+	jmp		intr_bottom;
 
 // Interrupt with an error code.
 #define DEFINE_ISR_E(nr)				\
 	.align 16;							\
 	ASM_CLAC							\
 	push	$nr;						\
-	jmp		int_bottom;
+	jmp		intr_bottom;
 
 // Array of interrupt service routines.
 .align 16
@@ -200,10 +200,10 @@ SYMBOL(isr_array):
 
 
 // Common interrupt handling code.
-STATIC_FUNCTION(int_bottom):
+STATIC_FUNCTION(intr_bottom):
 	// Coming from user-mode requires special handling.
 	testl	$3, 24(%rsp)
-	jnz		int_bottom_user
+	jnz		intr_bottom_user
 
 	// Push the rest of the interrupt frame to the stack.
 	PUSH_IFRAME_BOTTOM(IFRAME_TYPE_OTHER)
@@ -249,11 +249,11 @@ STATIC_FUNCTION(int_bottom):
 	RESTORE_IFRAME()
 
 	iretq
-FUNCTION_END(int_bottom)
+FUNCTION_END(intr_bottom)
 
 
 // Handler for an interrupt that occurred in user-mode.
-STATIC_FUNCTION(int_bottom_user):
+STATIC_FUNCTION(intr_bottom_user):
 	// Load the kernel GS segment base.
 	swapgs
 	lfence
@@ -356,7 +356,7 @@ STATIC_FUNCTION(int_bottom_user):
 	sti
 	call	thread_at_kernel_exit
 	jmp		.Lkernel_exit_work_done
-FUNCTION_END(int_bottom_user)
+FUNCTION_END(intr_bottom_user)
 
 
 // SYSCALL entry point.
diff --git a/src/system/kernel/arch/x86/64/thread.cpp b/src/system/kernel/arch/x86/64/thread.cpp
index f8128da31f..2d7576b0fa 100644
--- a/src/system/kernel/arch/x86/64/thread.cpp
+++ b/src/system/kernel/arch/x86/64/thread.cpp
@@ -20,7 +20,7 @@
 #include <generic_syscall.h>
 #include <kernel.h>
 #include <ksignal.h>
-#include <int.h>
+#include <interrupts.h>
 #include <team.h>
 #include <thread.h>
 #include <tls.h>
diff --git a/src/system/kernel/arch/x86/arch_debug_console.cpp b/src/system/kernel/arch/x86/arch_debug_console.cpp
index 0507d89112..482ee631eb 100644
--- a/src/system/kernel/arch/x86/arch_debug_console.cpp
+++ b/src/system/kernel/arch/x86/arch_debug_console.cpp
@@ -12,7 +12,7 @@
 
 #include <KernelExport.h>
 #include <driver_settings.h>
-#include <int.h>
+#include <interrupts.h>
 
 #include <arch/cpu.h>
 #include <arch/debug_console.h>
diff --git a/src/system/kernel/arch/x86/arch_int.cpp b/src/system/kernel/arch/x86/arch_int.cpp
index d25c34b823..dddb542e21 100644
--- a/src/system/kernel/arch/x86/arch_int.cpp
+++ b/src/system/kernel/arch/x86/arch_int.cpp
@@ -12,7 +12,7 @@
 
 
 #include <cpu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kscheduler.h>
 #include <team.h>
 #include <thread.h>
@@ -254,7 +254,7 @@ x86_hardware_interrupt(struct iframe* frame)
 			apic_end_of_interrupt();
 	}
 
-	int_io_interrupt_handler(vector, levelTriggered);
+	io_interrupt_handler(vector, levelTriggered);
 
 	if (levelTriggered) {
 		if (!sCurrentPIC->end_of_interrupt(vector))
diff --git a/src/system/kernel/arch/x86/arch_smp.cpp b/src/system/kernel/arch/x86/arch_smp.cpp
index be77fe0db8..795524c021 100644
--- a/src/system/kernel/arch/x86/arch_smp.cpp
+++ b/src/system/kernel/arch/x86/arch_smp.cpp
@@ -12,7 +12,7 @@
 #include <boot/kernel_args.h>
 #include <vm/vm.h>
 #include <cpu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <smp.h>
 #include <smp_priv.h>
 
@@ -53,7 +53,7 @@ x86_ici_interrupt(void *data)
 	// genuine inter-cpu interrupt
 	int cpu = smp_get_current_cpu();
 	TRACE(("inter-cpu interrupt on cpu %d\n", cpu));
-	return smp_intercpu_int_handler(cpu);
+	return smp_intercpu_interrupt_handler(cpu);
 }
 
 
diff --git a/src/system/kernel/arch/x86/arch_thread.cpp b/src/system/kernel/arch/x86/arch_thread.cpp
index 4af28e33a0..b4cabeaaa7 100644
--- a/src/system/kernel/arch/x86/arch_thread.cpp
+++ b/src/system/kernel/arch/x86/arch_thread.cpp
@@ -15,7 +15,7 @@
 #include <cpu.h>
 #include <kernel.h>
 #include <ksignal.h>
-#include <int.h>
+#include <interrupts.h>
 #include <team.h>
 #include <thread.h>
 #include <vm/vm_types.h>
diff --git a/src/system/kernel/arch/x86/arch_timer.cpp b/src/system/kernel/arch/x86/arch_timer.cpp
index b533f5738f..6397927a44 100644
--- a/src/system/kernel/arch/x86/arch_timer.cpp
+++ b/src/system/kernel/arch/x86/arch_timer.cpp
@@ -16,7 +16,7 @@
 #include <console.h>
 #include <debug.h>
 #include <timer.h>
-#include <int.h>
+#include <interrupts.h>
 #include <safemode.h>
 
 #include <arch/timer.h>
diff --git a/src/system/kernel/arch/x86/arch_user_debugger.cpp b/src/system/kernel/arch/x86/arch_user_debugger.cpp
index 885a0de5aa..cc0750418a 100644
--- a/src/system/kernel/arch/x86/arch_user_debugger.cpp
+++ b/src/system/kernel/arch/x86/arch_user_debugger.cpp
@@ -10,7 +10,7 @@
 
 #include <debugger.h>
 #include <driver_settings.h>
-#include <int.h>
+#include <interrupts.h>
 #include <team.h>
 #include <thread.h>
 #include <util/AutoLock.h>
diff --git a/src/system/kernel/arch/x86/ioapic.cpp b/src/system/kernel/arch/x86/ioapic.cpp
index 9c4ba32082..662335c444 100644
--- a/src/system/kernel/arch/x86/ioapic.cpp
+++ b/src/system/kernel/arch/x86/ioapic.cpp
@@ -5,7 +5,7 @@
 
 #include <arch/x86/ioapic.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <vm/vm.h>
 
 #include "acpi_irq_routing_table.h"
@@ -417,7 +417,7 @@ ioapic_source_override_handler(void* data)
 {
 	int32 vector = (addr_t)data;
 	bool levelTriggered = ioapic_is_level_triggered_interrupt(vector);
-	return int_io_interrupt_handler(vector, levelTriggered);
+	return io_interrupt_handler(vector, levelTriggered);
 }
 
 
diff --git a/src/system/kernel/arch/x86/msi.cpp b/src/system/kernel/arch/x86/msi.cpp
index 1d5fb76921..9e6e10ad07 100644
--- a/src/system/kernel/arch/x86/msi.cpp
+++ b/src/system/kernel/arch/x86/msi.cpp
@@ -8,7 +8,7 @@
 #include <arch/x86/arch_smp.h>
 
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 #include <lock.h>
 
 
diff --git a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
index 590aa711bd..50a732d214 100644
--- a/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
+++ b/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
@@ -18,7 +18,7 @@
 #include <arch/smp.h>
 #include <arch_system_info.h>
 #include <boot/kernel_args.h>
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <vm/vm.h>
 #include <vm/VMAddressSpace.h>
diff --git a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp
index 9f553c707b..52d0f49f48 100644
--- a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp
+++ b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <thread.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/arch/x86/paging/32bit/paging.h b/src/system/kernel/arch/x86/paging/32bit/paging.h
index 2144e860c9..60834cf366 100644
--- a/src/system/kernel/arch/x86/paging/32bit/paging.h
+++ b/src/system/kernel/arch/x86/paging/32bit/paging.h
@@ -12,7 +12,7 @@
 
 #include <SupportDefs.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 
 
diff --git a/src/system/kernel/arch/x86/paging/64bit/X86PagingStructures64Bit.cpp b/src/system/kernel/arch/x86/paging/64bit/X86PagingStructures64Bit.cpp
index fd66356a5d..1fe124f2bb 100644
--- a/src/system/kernel/arch/x86/paging/64bit/X86PagingStructures64Bit.cpp
+++ b/src/system/kernel/arch/x86/paging/64bit/X86PagingStructures64Bit.cpp
@@ -11,7 +11,7 @@
 
 #include <KernelExport.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 #include "paging/64bit/X86PagingMethod64Bit.h"
 
diff --git a/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp b/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp
index 22a995b1fd..52667c7f23 100644
--- a/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp
+++ b/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp
@@ -11,7 +11,7 @@
 
 #include "paging/64bit/X86VMTranslationMap64Bit.h"
 
-#include <int.h>
+#include <interrupts.h>
 #include <slab/Slab.h>
 #include <thread.h>
 #include <util/AutoLock.h>
diff --git a/src/system/kernel/arch/x86/paging/pae/X86PagingStructuresPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86PagingStructuresPAE.cpp
index 99e3f1db0e..5bcdead238 100644
--- a/src/system/kernel/arch/x86/paging/pae/X86PagingStructuresPAE.cpp
+++ b/src/system/kernel/arch/x86/paging/pae/X86PagingStructuresPAE.cpp
@@ -11,7 +11,7 @@
 
 #include <KernelExport.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 #include "paging/pae/X86PagingMethodPAE.h"
 
diff --git a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp
index dc9d72ee0a..0f25e0b115 100644
--- a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp
+++ b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp
@@ -10,7 +10,7 @@
 
 #include "paging/pae/X86VMTranslationMapPAE.h"
 
-#include <int.h>
+#include <interrupts.h>
 #include <slab/Slab.h>
 #include <thread.h>
 #include <tracing.h>
diff --git a/src/system/kernel/arch/x86/pic.cpp b/src/system/kernel/arch/x86/pic.cpp
index a802ff32d9..b75be14b54 100644
--- a/src/system/kernel/arch/x86/pic.cpp
+++ b/src/system/kernel/arch/x86/pic.cpp
@@ -13,7 +13,7 @@
 
 #include <arch/x86/arch_int.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 
 //#define TRACE_PIC
diff --git a/src/system/kernel/arch/x86/syscalls_compat.cpp b/src/system/kernel/arch/x86/syscalls_compat.cpp
index f4d751a5d7..06ed51cc65 100644
--- a/src/system/kernel/arch/x86/syscalls_compat.cpp
+++ b/src/system/kernel/arch/x86/syscalls_compat.cpp
@@ -23,7 +23,7 @@
 #include <fs/fd.h>
 #include <fs/node_monitor.h>
 #include <generic_syscall.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <kimage.h>
 #include <ksignal.h>
diff --git a/src/system/kernel/arch/x86/timers/x86_apic.cpp b/src/system/kernel/arch/x86/timers/x86_apic.cpp
index c49580d358..f92ec08687 100644
--- a/src/system/kernel/arch/x86/timers/x86_apic.cpp
+++ b/src/system/kernel/arch/x86/timers/x86_apic.cpp
@@ -11,7 +11,7 @@
 #include <timer.h>
 #include <arch/x86/timer.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <arch/x86/apic.h>
 #include <arch/x86/arch_system_info.h>
 
diff --git a/src/system/kernel/arch/x86/timers/x86_hpet.cpp b/src/system/kernel/arch/x86/timers/x86_hpet.cpp
index 6f7e347966..1d5927e626 100644
--- a/src/system/kernel/arch/x86/timers/x86_hpet.cpp
+++ b/src/system/kernel/arch/x86/timers/x86_hpet.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 #include <smp.h>
 #include <timer.h>
 
diff --git a/src/system/kernel/condition_variable.cpp b/src/system/kernel/condition_variable.cpp
index b68dad6062..c97b15aa61 100644
--- a/src/system/kernel/condition_variable.cpp
+++ b/src/system/kernel/condition_variable.cpp
@@ -13,7 +13,7 @@
 #include <debug.h>
 #include <kscheduler.h>
 #include <ksignal.h>
-#include <int.h>
+#include <interrupts.h>
 #include <listeners.h>
 #include <scheduling_analysis.h>
 #include <thread.h>
diff --git a/src/system/kernel/debug/debug.cpp b/src/system/kernel/debug/debug.cpp
index d4ceabd806..ef67bab3e8 100644
--- a/src/system/kernel/debug/debug.cpp
+++ b/src/system/kernel/debug/debug.cpp
@@ -31,7 +31,7 @@
 #include <debug_paranoia.h>
 #include <driver_settings.h>
 #include <frame_buffer_console.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <ksystem_info.h>
 #include <safemode.h>
@@ -964,7 +964,7 @@ enter_kernel_debugger(int32 cpu, int32& previousCPU)
 		// us. Process ICIs to ensure we get the halt request. Then we are
 		// blocking there until everyone leaves the debugger and we can
 		// try to enter it again.
-		smp_intercpu_int_handler(cpu);
+		smp_intercpu_interrupt_handler(cpu);
 	}
 
 	arch_debug_save_registers(&sDebugRegisters[cpu]);
@@ -1814,7 +1814,7 @@ debug_trap_cpu_in_kdl(int32 cpu, bool returnIfHandedOver)
 	InterruptsLocker locker;
 
 	// return, if we've been called recursively (we call
-	// smp_intercpu_int_handler() below)
+	// smp_intercpu_interrupt_handler() below)
 	if (sCPUTrapped[cpu])
 		return;
 
@@ -1832,7 +1832,7 @@ debug_trap_cpu_in_kdl(int32 cpu, bool returnIfHandedOver)
 			kernel_debugger_internal(NULL, NULL,
 				sCurrentKernelDebuggerMessageArgs, cpu);
 		} else
-			smp_intercpu_int_handler(cpu);
+			smp_intercpu_interrupt_handler(cpu);
 	}
 
 	sCPUTrapped[cpu] = false;
diff --git a/src/system/kernel/debug/tracing.cpp b/src/system/kernel/debug/tracing.cpp
index 64407f965e..938ce29258 100644
--- a/src/system/kernel/debug/tracing.cpp
+++ b/src/system/kernel/debug/tracing.cpp
@@ -16,7 +16,7 @@
 #include <debug.h>
 #include <debug_heap.h>
 #include <elf.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <team.h>
 #include <thread.h>
diff --git a/src/system/kernel/heap.cpp b/src/system/kernel/heap.cpp
index a67a41ecc4..48faefdb54 100644
--- a/src/system/kernel/heap.cpp
+++ b/src/system/kernel/heap.cpp
@@ -12,7 +12,7 @@
 #include <debug.h>
 #include <elf.h>
 #include <heap.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <lock.h>
 #include <string.h>
diff --git a/src/system/kernel/int.cpp b/src/system/kernel/interrupts.cpp
similarity index 97%
rename from src/system/kernel/int.cpp
rename to src/system/kernel/interrupts.cpp
index 4c5585f9d0..828e7e72de 100644
--- a/src/system/kernel/int.cpp
+++ b/src/system/kernel/interrupts.cpp
@@ -1,10 +1,6 @@
 /*
  * Copyright 2013, Paweł Dziepak, pdziepak@quarnos.org.
- * Distributed under the terms of the MIT License.
-
  * Copyright 2011, Michael Lotz, mmlr@mlotz.ch.
- * Distributed under the terms of the MIT License.
- *
  * Copyright 2002-2010, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  *
@@ -13,7 +9,7 @@
  */
 
 
-#include <int.h>
+#include <interrupts.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -179,16 +175,16 @@ interrupts_enabled(void)
 
 
 status_t
-int_init(kernel_args* args)
+interrupts_init(kernel_args* args)
 {
-	TRACE(("init_int_handlers: entry\n"));
+	TRACE(("interrupts_init: entry\n"));
 
 	return arch_int_init(args);
 }
 
 
 status_t
-int_init_post_vm(kernel_args* args)
+interrupts_init_post_vm(kernel_args* args)
 {
 	int i;
 
@@ -232,14 +228,14 @@ int_init_post_vm(kernel_args* args)
 
 
 status_t
-int_init_io(kernel_args* args)
+interrupts_init_io(kernel_args* args)
 {
 	return arch_int_init_io(args);
 }
 
 
 status_t
-int_init_post_device_manager(kernel_args* args)
+interrupts_init_post_device_manager(kernel_args* args)
 {
 	arch_debug_install_interrupt_handlers();
 
@@ -268,7 +264,7 @@ update_int_load(int i)
 	vector (IRQ).
 */
 int
-int_io_interrupt_handler(int vector, bool levelTriggered)
+io_interrupt_handler(int vector, bool levelTriggered)
 {
 	int status = B_UNHANDLED_INTERRUPT;
 	struct io_handler* io;
@@ -725,7 +721,8 @@ free_io_interrupt_vectors(int32 count, int32 startVector)
 }
 
 
-void assign_io_interrupt_to_cpu(int32 vector, int32 newCPU)
+void
+assign_io_interrupt_to_cpu(int32 vector, int32 newCPU)
 {
 	ASSERT(sVectors[vector].type == INTERRUPT_TYPE_IRQ);
 
diff --git a/src/system/kernel/locks/lock.cpp b/src/system/kernel/locks/lock.cpp
index 4008d0b239..9ec4466bef 100644
--- a/src/system/kernel/locks/lock.cpp
+++ b/src/system/kernel/locks/lock.cpp
@@ -27,7 +27,7 @@ static void _mutex_unlock(struct mutex* lock);
 #include <stdlib.h>
 #include <string.h>
 
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <listeners.h>
 #include <scheduling_analysis.h>
diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp
index f4b948c9f4..2669b95996 100644
--- a/src/system/kernel/main.cpp
+++ b/src/system/kernel/main.cpp
@@ -32,7 +32,7 @@
 #include <find_directory_private.h>
 #include <fs/devfs.h>
 #include <fs/KPath.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kdevice_manager.h>
 #include <kdriver_settings.h>
 #include <kernel_daemon.h>
@@ -143,7 +143,7 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
 		cpu_init(&sKernelArgs);
 		cpu_init_percpu(&sKernelArgs, currentCPU);
 		TRACE("init interrupts\n");
-		int_init(&sKernelArgs);
+		interrupts_init(&sKernelArgs);
 
 		TRACE("init VM\n");
 		vm_init(&sKernelArgs);
@@ -170,7 +170,7 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
 		TRACE("init semaphores\n");
 		haiku_sem_init(&sKernelArgs);
 		TRACE("init interrupts post vm\n");
-		int_init_post_vm(&sKernelArgs);
+		interrupts_init_post_vm(&sKernelArgs);
 		cpu_init_post_vm(&sKernelArgs);
 		commpage_init();
 #ifdef _COMPAT_MODE
@@ -210,7 +210,7 @@ _start(kernel_args *bootKernelArgs, int currentCPU)
 		arch_platform_init_post_thread(&sKernelArgs);
 
 		TRACE("init I/O interrupts\n");
-		int_init_io(&sKernelArgs);
+		interrupts_init_io(&sKernelArgs);
 		TRACE("init VM threads\n");
 		vm_init_post_thread(&sKernelArgs);
 		low_resource_manager_init_post_thread();
@@ -337,7 +337,7 @@ main2(void* /*unused*/)
 	TRACE("Add preloaded old-style drivers\n");
 	legacy_driver_add_preloaded(&sKernelArgs);
 
-	int_init_post_device_manager(&sKernelArgs);
+	interrupts_init_post_device_manager(&sKernelArgs);
 
 	TRACE("Mount boot file system\n");
 	boot_splash_set_stage(BOOT_SPLASH_STAGE_4_MOUNT_BOOT_FS);
diff --git a/src/system/kernel/scheduler/scheduler.cpp b/src/system/kernel/scheduler/scheduler.cpp
index aeaab25058..0a4574c1aa 100644
--- a/src/system/kernel/scheduler/scheduler.cpp
+++ b/src/system/kernel/scheduler/scheduler.cpp
@@ -19,7 +19,7 @@
 #include <AutoDeleter.h>
 #include <cpu.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <kscheduler.h>
 #include <listeners.h>
diff --git a/src/system/kernel/sem.cpp b/src/system/kernel/sem.cpp
index a1b1ab7d99..02748a1b19 100644
--- a/src/system/kernel/sem.cpp
+++ b/src/system/kernel/sem.cpp
@@ -22,7 +22,7 @@
 #include <boot/kernel_args.h>
 #include <cpu.h>
 #include <debug.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <ksignal.h>
 #include <kscheduler.h>
diff --git a/src/system/kernel/slab/ObjectDepot.cpp b/src/system/kernel/slab/ObjectDepot.cpp
index 702b624461..716dafda9d 100644
--- a/src/system/kernel/slab/ObjectDepot.cpp
+++ b/src/system/kernel/slab/ObjectDepot.cpp
@@ -11,7 +11,7 @@
 
 #include <algorithm>
 
-#include <int.h>
+#include <interrupts.h>
 #include <slab/Slab.h>
 #include <smp.h>
 #include <util/AutoLock.h>
diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp
index 61b06fa6e2..9d423465e6 100644
--- a/src/system/kernel/smp.cpp
+++ b/src/system/kernel/smp.cpp
@@ -25,7 +25,7 @@
 #include <boot/kernel_args.h>
 #include <cpu.h>
 #include <generic_syscall.h>
-#include <int.h>
+#include <interrupts.h>
 #include <spinlock_contention.h>
 #include <thread.h>
 #include <util/atomic.h>
@@ -949,7 +949,7 @@ process_pending_ici(int32 currentCPU)
 			break;
 
 		default:
-			dprintf("smp_intercpu_int_handler: got unknown message %" B_PRId32 "\n",
+			dprintf("smp_intercpu_interrupt_handler: got unknown message %" B_PRId32 "\n",
 				msg->message);
 			break;
 	}
@@ -1028,13 +1028,13 @@ call_all_cpus_early(void (*function)(void*, int), void* cookie)
 
 
 int
-smp_intercpu_int_handler(int32 cpu)
+smp_intercpu_interrupt_handler(int32 cpu)
 {
-	TRACE("smp_intercpu_int_handler: entry on cpu %" B_PRId32 "\n", cpu);
+	TRACE("smp_intercpu_interrupt_handler: entry on cpu %" B_PRId32 "\n", cpu);
 
 	process_all_pending_ici(cpu);
 
-	TRACE("smp_intercpu_int_handler: done on cpu %" B_PRId32 "\n", cpu);
+	TRACE("smp_intercpu_interrupt_handler: done on cpu %" B_PRId32 "\n", cpu);
 
 	return B_HANDLED_INTERRUPT;
 }
diff --git a/src/system/kernel/syscalls.cpp b/src/system/kernel/syscalls.cpp
index e056520310..50bfe39dda 100644
--- a/src/system/kernel/syscalls.cpp
+++ b/src/system/kernel/syscalls.cpp
@@ -28,7 +28,7 @@
 #include <fs/fd.h>
 #include <fs/node_monitor.h>
 #include <generic_syscall.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <kimage.h>
 #include <ksignal.h>
diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index 5719efaf5e..c7dfb1339d 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -34,7 +34,7 @@
 #include <find_directory_private.h>
 #include <fs/KPath.h>
 #include <heap.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <kimage.h>
 #include <kscheduler.h>
diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp
index 70287c17a0..3d4481de84 100644
--- a/src/system/kernel/thread.cpp
+++ b/src/system/kernel/thread.cpp
@@ -32,7 +32,7 @@
 #include <boot/kernel_args.h>
 #include <condition_variable.h>
 #include <cpu.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kimage.h>
 #include <kscheduler.h>
 #include <ksignal.h>
diff --git a/src/system/kernel/util/KernelReferenceable.cpp b/src/system/kernel/util/KernelReferenceable.cpp
index af14c90d95..74cf93bd82 100644
--- a/src/system/kernel/util/KernelReferenceable.cpp
+++ b/src/system/kernel/util/KernelReferenceable.cpp
@@ -6,7 +6,7 @@
 
 #include <util/KernelReferenceable.h>
 
-#include <int.h>
+#include <interrupts.h>
 
 
 void
diff --git a/src/system/kernel/vm/VMCache.cpp b/src/system/kernel/vm/VMCache.cpp
index 1eca0b2391..5f19f77362 100644
--- a/src/system/kernel/vm/VMCache.cpp
+++ b/src/system/kernel/vm/VMCache.cpp
@@ -18,7 +18,7 @@
 #include <arch/cpu.h>
 #include <condition_variable.h>
 #include <heap.h>
-#include <int.h>
+#include <interrupts.h>
 #include <kernel.h>
 #include <slab/Slab.h>
 #include <smp.h>
diff --git a/src/system/kernel/vm/VMPageQueue.h b/src/system/kernel/vm/VMPageQueue.h
index 50bff83e6e..45ba542305 100644
--- a/src/system/kernel/vm/VMPageQueue.h
+++ b/src/system/kernel/vm/VMPageQueue.h
@@ -13,7 +13,7 @@
 #include <util/DoublyLinkedList.h>
 
 #include <lock.h>
-#include <int.h>
+#include <interrupts.h>
 #include <util/AutoLock.h>
 #include <vm/vm_types.h>
 
diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index fb0ea399a5..62306b6351 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -37,7 +37,7 @@
 #include <fs/fd.h>
 #include <heap.h>
 #include <kernel.h>
-#include <int.h>
+#include <interrupts.h>
 #include <lock.h>
 #include <low_resource_manager.h>
 #include <slab/Slab.h>