diff --git a/Kernel/Arch/x86/InterruptManagement.h b/Kernel/Arch/x86/InterruptManagement.h
index 597bd3e4bc..afb82a5074 100644
--- a/Kernel/Arch/x86/InterruptManagement.h
+++ b/Kernel/Arch/x86/InterruptManagement.h
@@ -11,9 +11,9 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/x86/IRQController.h>
+#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
 #include <Kernel/Firmware/ACPI/Definitions.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
-#include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Library/LockRefPtr.h>
 
 namespace Kernel {
diff --git a/Kernel/Arch/x86/common/InterruptManagement.cpp b/Kernel/Arch/x86/common/InterruptManagement.cpp
index 6d47dcfd2a..50b86f2809 100644
--- a/Kernel/Arch/x86/common/InterruptManagement.cpp
+++ b/Kernel/Arch/x86/common/InterruptManagement.cpp
@@ -9,11 +9,11 @@
 #include <Kernel/Arch/InterruptDisabler.h>
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/x86/InterruptManagement.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
-#include <Kernel/Interrupts/APIC.h>
-#include <Kernel/Interrupts/IOAPIC.h>
-#include <Kernel/Interrupts/PIC.h>
 #include <Kernel/Interrupts/SharedIRQHandler.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Memory/TypedMapping.h>
diff --git a/Kernel/Arch/x86/common/Interrupts.cpp b/Kernel/Arch/x86/common/Interrupts.cpp
index 271205aaa1..9a35656269 100644
--- a/Kernel/Arch/x86/common/Interrupts.cpp
+++ b/Kernel/Arch/x86/common/Interrupts.cpp
@@ -9,8 +9,8 @@
 #include <AK/Types.h>
 
 #include <Kernel/Arch/Interrupts.h>
+#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
-#include <Kernel/Interrupts/PIC.h>
 #include <Kernel/Interrupts/SharedIRQHandler.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Interrupts/UnhandledInterruptHandler.h>
diff --git a/Kernel/Interrupts/APIC.cpp b/Kernel/Arch/x86/common/Interrupts/APIC.cpp
similarity index 99%
rename from Kernel/Interrupts/APIC.cpp
rename to Kernel/Arch/x86/common/Interrupts/APIC.cpp
index c5f0b97403..fc873aa470 100644
--- a/Kernel/Interrupts/APIC.cpp
+++ b/Kernel/Arch/x86/common/Interrupts/APIC.cpp
@@ -11,9 +11,9 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Arch/x86/MSR.h>
 #include <Kernel/Arch/x86/ProcessorInfo.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Interrupts/APIC.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
diff --git a/Kernel/Interrupts/APIC.h b/Kernel/Arch/x86/common/Interrupts/APIC.h
similarity index 100%
rename from Kernel/Interrupts/APIC.h
rename to Kernel/Arch/x86/common/Interrupts/APIC.h
diff --git a/Kernel/Interrupts/IOAPIC.cpp b/Kernel/Arch/x86/common/Interrupts/IOAPIC.cpp
similarity index 99%
rename from Kernel/Interrupts/IOAPIC.cpp
rename to Kernel/Arch/x86/common/Interrupts/IOAPIC.cpp
index ff89921a07..9a9a72f741 100644
--- a/Kernel/Interrupts/IOAPIC.cpp
+++ b/Kernel/Arch/x86/common/Interrupts/IOAPIC.cpp
@@ -7,9 +7,9 @@
 #include <AK/Optional.h>
 #include <Kernel/Arch/InterruptDisabler.h>
 #include <Kernel/Arch/x86/InterruptManagement.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
 #include <Kernel/Debug.h>
-#include <Kernel/Interrupts/APIC.h>
-#include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Sections.h>
 
 #define IOAPIC_REDIRECTION_ENTRY_OFFSET 0x10
diff --git a/Kernel/Interrupts/IOAPIC.h b/Kernel/Arch/x86/common/Interrupts/IOAPIC.h
similarity index 100%
rename from Kernel/Interrupts/IOAPIC.h
rename to Kernel/Arch/x86/common/Interrupts/IOAPIC.h
diff --git a/Kernel/Interrupts/PIC.cpp b/Kernel/Arch/x86/common/Interrupts/PIC.cpp
similarity index 99%
rename from Kernel/Interrupts/PIC.cpp
rename to Kernel/Arch/x86/common/Interrupts/PIC.cpp
index 002e6fbbd8..7d131d9de1 100644
--- a/Kernel/Interrupts/PIC.cpp
+++ b/Kernel/Arch/x86/common/Interrupts/PIC.cpp
@@ -8,8 +8,8 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/InterruptDisabler.h>
 #include <Kernel/Arch/x86/IO.h>
+#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
 #include <Kernel/Interrupts/GenericInterruptHandler.h>
-#include <Kernel/Interrupts/PIC.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Interrupts/PIC.h b/Kernel/Arch/x86/common/Interrupts/PIC.h
similarity index 100%
rename from Kernel/Interrupts/PIC.h
rename to Kernel/Arch/x86/common/Interrupts/PIC.h
diff --git a/Kernel/Arch/x86/common/Processor.cpp b/Kernel/Arch/x86/common/Processor.cpp
index 21158c54ed..39e0b0a673 100644
--- a/Kernel/Arch/x86/common/Processor.cpp
+++ b/Kernel/Arch/x86/common/Processor.cpp
@@ -12,7 +12,7 @@
 #include <AK/StringBuilder.h>
 #include <AK/Types.h>
 
-#include <Kernel/Interrupts/APIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
 #include <Kernel/Process.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 53040da2cb..59fc46d9be 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -159,11 +159,8 @@ set(KERNEL_SOURCES
     Firmware/ACPI/Parser.cpp
     Firmware/MultiProcessor/Parser.cpp
     FutexQueue.cpp
-    Interrupts/APIC.cpp
     Interrupts/GenericInterruptHandler.cpp
-    Interrupts/IOAPIC.cpp
     Interrupts/IRQHandler.cpp
-    Interrupts/PIC.cpp
     Interrupts/SharedIRQHandler.cpp
     Interrupts/SpuriousInterruptHandler.cpp
     Interrupts/UnhandledInterruptHandler.cpp
@@ -321,6 +318,10 @@ if ("${SERENITY_ARCH}" STREQUAL "i686" OR "${SERENITY_ARCH}" STREQUAL "x86_64")
         ${KERNEL_SOURCES}
         Arch/Processor.cpp
 
+        Arch/x86/common/Interrupts/APIC.cpp
+        Arch/x86/common/Interrupts/IOAPIC.cpp
+        Arch/x86/common/Interrupts/PIC.cpp
+
         Arch/x86/common/CMOS.cpp
         Arch/x86/common/DebugOutput.cpp
         Arch/x86/common/Delay.cpp
diff --git a/Kernel/Firmware/MultiProcessor/Parser.cpp b/Kernel/Firmware/MultiProcessor/Parser.cpp
index 1883afc775..109292185f 100644
--- a/Kernel/Firmware/MultiProcessor/Parser.cpp
+++ b/Kernel/Firmware/MultiProcessor/Parser.cpp
@@ -7,10 +7,10 @@
  */
 
 #include <AK/StringView.h>
+#include <Kernel/Arch/x86/common/Interrupts/IOAPIC.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Firmware/BIOS.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
-#include <Kernel/Interrupts/IOAPIC.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
 #include <Kernel/StdLib.h>
diff --git a/Kernel/Interrupts/SpuriousInterruptHandler.cpp b/Kernel/Interrupts/SpuriousInterruptHandler.cpp
index 51fd499c75..5581b9a263 100644
--- a/Kernel/Interrupts/SpuriousInterruptHandler.cpp
+++ b/Kernel/Interrupts/SpuriousInterruptHandler.cpp
@@ -6,7 +6,6 @@
 
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Arch/x86/Interrupts.h>
-#include <Kernel/Interrupts/PIC.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Time/APICTimer.cpp b/Kernel/Time/APICTimer.cpp
index ae8507c67e..30a4652280 100644
--- a/Kernel/Time/APICTimer.cpp
+++ b/Kernel/Time/APICTimer.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/Interrupts/APIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
 #include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/APICTimer.h>
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index fd085cdbf3..66a336f546 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -8,10 +8,10 @@
 #include <AK/StdLibExtras.h>
 #include <AK/Time.h>
 #include <Kernel/Arch/InterruptDisabler.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
 #include <Kernel/Arch/x86/common/RTC.h>
 #include <Kernel/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Interrupts/APIC.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Scheduler.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index b34c8ed09a..9412a5a444 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -8,6 +8,8 @@
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/Arch/x86/Hypervisor/VMWareBackdoor.h>
+#include <Kernel/Arch/x86/common/Interrupts/APIC.h>
+#include <Kernel/Arch/x86/common/Interrupts/PIC.h>
 #include <Kernel/BootInfo.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
@@ -37,8 +39,6 @@
 #include <Kernel/Graphics/Console/VGATextModeConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
-#include <Kernel/Interrupts/APIC.h>
-#include <Kernel/Interrupts/PIC.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Multiboot.h>