diff --git a/AK/Userspace.h b/AK/Userspace.h
index 1d4e4f36b8..9314542ca2 100644
--- a/AK/Userspace.h
+++ b/AK/Userspace.h
@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 
 #ifdef KERNEL
-#    include <Kernel/VirtualAddress.h>
+#    include <Kernel/Memory/VirtualAddress.h>
 #endif
 
 namespace AK {
diff --git a/Kernel/Arch/PageFault.h b/Kernel/Arch/PageFault.h
index 85f8f8f8ac..6937c5a995 100644
--- a/Kernel/Arch/PageFault.h
+++ b/Kernel/Arch/PageFault.h
@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/ExecutionMode.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/aarch64/PageDirectory.h b/Kernel/Arch/aarch64/PageDirectory.h
index 079f444ddc..c464229167 100644
--- a/Kernel/Arch/aarch64/PageDirectory.h
+++ b/Kernel/Arch/aarch64/PageDirectory.h
@@ -15,8 +15,8 @@
 #include <AK/Types.h>
 #include <Kernel/Forward.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Arch/aarch64/Processor.h b/Kernel/Arch/aarch64/Processor.h
index b011411320..9f96de5aa3 100644
--- a/Kernel/Arch/aarch64/Processor.h
+++ b/Kernel/Arch/aarch64/Processor.h
@@ -16,7 +16,7 @@
 #include <Kernel/Arch/ProcessorSpecificDataID.h>
 #include <Kernel/Arch/aarch64/CPUID.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Arch/aarch64/RPi/MMIO.h b/Kernel/Arch/aarch64/RPi/MMIO.h
index cfdc61306f..edcefcd555 100644
--- a/Kernel/Arch/aarch64/RPi/MMIO.h
+++ b/Kernel/Arch/aarch64/RPi/MMIO.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::RPi {
diff --git a/Kernel/Arch/x86_64/DescriptorTable.h b/Kernel/Arch/x86_64/DescriptorTable.h
index 623325c12a..be5dc1273b 100644
--- a/Kernel/Arch/x86_64/DescriptorTable.h
+++ b/Kernel/Arch/x86_64/DescriptorTable.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 #include <AK/Platform.h>
 VALIDATE_IS_X86()
diff --git a/Kernel/Arch/x86_64/PageDirectory.h b/Kernel/Arch/x86_64/PageDirectory.h
index f45b88e249..f912e88c25 100644
--- a/Kernel/Arch/x86_64/PageDirectory.h
+++ b/Kernel/Arch/x86_64/PageDirectory.h
@@ -15,8 +15,8 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Locking/LockRank.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Arch/x86_64/Time/HPET.h b/Kernel/Arch/x86_64/Time/HPET.h
index 708a991288..5d2d347964 100644
--- a/Kernel/Arch/x86_64/Time/HPET.h
+++ b/Kernel/Arch/x86_64/Time/HPET.h
@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/BootInfo.h b/Kernel/BootInfo.h
index af3300f27a..36c849945d 100644
--- a/Kernel/BootInfo.h
+++ b/Kernel/BootInfo.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/StringView.h>
+#include <Kernel/Memory/PhysicalAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel::Memory {
 class PageTableEntry;
diff --git a/Kernel/Bus/PCI/Definitions.h b/Kernel/Bus/PCI/Definitions.h
index 8698452115..7196b5dd43 100644
--- a/Kernel/Bus/PCI/Definitions.h
+++ b/Kernel/Bus/PCI/Definitions.h
@@ -13,7 +13,7 @@
 #include <AK/Vector.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Locking/Spinlock.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::PCI {
 
diff --git a/Kernel/Devices/Audio/Channel.h b/Kernel/Devices/Audio/Channel.h
index d04826d78b..99e2fcd7bb 100644
--- a/Kernel/Devices/Audio/Channel.h
+++ b/Kernel/Devices/Audio/Channel.h
@@ -8,8 +8,8 @@
 
 #include <Kernel/Devices/CharacterDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Tasks/WaitQueue.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/Audio/Controller.h b/Kernel/Devices/Audio/Controller.h
index 1771d5aeee..8377f10abd 100644
--- a/Kernel/Devices/Audio/Controller.h
+++ b/Kernel/Devices/Audio/Controller.h
@@ -15,8 +15,8 @@
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Library/LockWeakable.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/Generic/MemoryDevice.h b/Kernel/Devices/Generic/MemoryDevice.h
index 25f97a5186..e2ded373a6 100644
--- a/Kernel/Devices/Generic/MemoryDevice.h
+++ b/Kernel/Devices/Generic/MemoryDevice.h
@@ -8,7 +8,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h
index f3931789d0..4514a6bbbd 100644
--- a/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h
@@ -13,8 +13,8 @@
 #include <Kernel/Interrupts/PCIIRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
diff --git a/Kernel/Devices/Storage/ATA/AHCI/Port.h b/Kernel/Devices/Storage/ATA/AHCI/Port.h
index d05fe938bb..88f9e2d2c0 100644
--- a/Kernel/Devices/Storage/ATA/AHCI/Port.h
+++ b/Kernel/Devices/Storage/ATA/AHCI/Port.h
@@ -19,9 +19,9 @@
 #include <Kernel/Locking/Mutex.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
 #include <Kernel/Memory/ScatterGatherList.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
diff --git a/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h
index c58b00ae35..d8501ec224 100644
--- a/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h
+++ b/Kernel/Devices/Storage/ATA/GenericIDE/Channel.h
@@ -26,8 +26,8 @@
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
 
diff --git a/Kernel/Devices/Storage/StorageController.h b/Kernel/Devices/Storage/StorageController.h
index 9a217d5372..7ea9eb5f85 100644
--- a/Kernel/Devices/Storage/StorageController.h
+++ b/Kernel/Devices/Storage/StorageController.h
@@ -12,8 +12,8 @@
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/PhysicalPage.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Security/Random.h>
 #include <Kernel/Tasks/WaitQueue.h>
 
diff --git a/Kernel/FileSystem/File.h b/Kernel/FileSystem/File.h
index a792ea1b58..6ecf7be4ec 100644
--- a/Kernel/FileSystem/File.h
+++ b/Kernel/FileSystem/File.h
@@ -13,9 +13,9 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Library/LockWeakable.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/UnixTypes.h>
 #include <Kernel/UserOrKernelBuffer.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/OpenFileDescription.h b/Kernel/FileSystem/OpenFileDescription.h
index 5fd82abf92..e4f02325a4 100644
--- a/Kernel/FileSystem/OpenFileDescription.h
+++ b/Kernel/FileSystem/OpenFileDescription.h
@@ -15,7 +15,7 @@
 #include <Kernel/FileSystem/InodeMetadata.h>
 #include <Kernel/Forward.h>
 #include <Kernel/KBuffer.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h
index a58ec9fc7c..f1406e6ef4 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h
@@ -11,7 +11,8 @@
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/KBuffer.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h
index 7324ac03fb..28fb136454 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h
@@ -10,7 +10,8 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/PowerStateSwitch.h b/Kernel/FileSystem/SysFS/Subsystems/Kernel/PowerStateSwitch.h
index fed9c242c6..5d7637a17b 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/PowerStateSwitch.h
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/PowerStateSwitch.h
@@ -13,9 +13,9 @@
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Directory.h>
 #include <Kernel/KBuffer.h>
 #include <Kernel/Memory/MappedROM.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Firmware/ACPI/Definitions.h b/Kernel/Firmware/ACPI/Definitions.h
index 9c432ece87..438a8ce6c9 100644
--- a/Kernel/Firmware/ACPI/Definitions.h
+++ b/Kernel/Firmware/ACPI/Definitions.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::ACPI {
 
diff --git a/Kernel/Firmware/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h
index 536300a4ac..b8b4c3cf9f 100644
--- a/Kernel/Firmware/ACPI/Parser.h
+++ b/Kernel/Firmware/ACPI/Parser.h
@@ -14,10 +14,10 @@
 #include <Kernel/Firmware/ACPI/Initialize.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel::ACPI {
 
diff --git a/Kernel/Firmware/BIOS.h b/Kernel/Firmware/BIOS.h
index c58af9675d..5571c9274b 100644
--- a/Kernel/Firmware/BIOS.h
+++ b/Kernel/Firmware/BIOS.h
@@ -8,9 +8,9 @@
 #pragma once
 
 #include <Kernel/Memory/MappedROM.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Firmware/MultiProcessor/Parser.h b/Kernel/Firmware/MultiProcessor/Parser.h
index 26094c8ab4..bd3644135a 100644
--- a/Kernel/Firmware/MultiProcessor/Parser.h
+++ b/Kernel/Firmware/MultiProcessor/Parser.h
@@ -8,9 +8,9 @@
 
 #include <AK/Types.h>
 #include <AK/Vector.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {
 namespace MultiProcessor {
diff --git a/Kernel/Graphics/Bochs/GraphicsAdapter.h b/Kernel/Graphics/Bochs/GraphicsAdapter.h
index 866070bcf6..d3c8e02086 100644
--- a/Kernel/Graphics/Bochs/GraphicsAdapter.h
+++ b/Kernel/Graphics/Bochs/GraphicsAdapter.h
@@ -11,8 +11,8 @@
 #include <Kernel/Graphics/Bochs/Definitions.h>
 #include <Kernel/Graphics/Console/GenericFramebufferConsole.h>
 #include <Kernel/Graphics/GenericGraphicsAdapter.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Console/GenericFramebufferConsole.h b/Kernel/Graphics/Console/GenericFramebufferConsole.h
index 88ace335bd..3101fd4591 100644
--- a/Kernel/Graphics/Console/GenericFramebufferConsole.h
+++ b/Kernel/Graphics/Console/GenericFramebufferConsole.h
@@ -8,7 +8,7 @@
 
 #include <AK/Types.h>
 #include <Kernel/Graphics/Console/Console.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Graphics {
 
diff --git a/Kernel/Graphics/GenericGraphicsAdapter.h b/Kernel/Graphics/GenericGraphicsAdapter.h
index b2fa69e7ea..802b7cac80 100644
--- a/Kernel/Graphics/GenericGraphicsAdapter.h
+++ b/Kernel/Graphics/GenericGraphicsAdapter.h
@@ -10,7 +10,7 @@
 #include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Library/LockWeakable.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 class GenericGraphicsAdapter
diff --git a/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp b/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp
index 3b599d562d..35ac1334b9 100644
--- a/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp
+++ b/Kernel/Graphics/Intel/Auxiliary/GMBusConnector.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Auxiliary/GMBusConnector.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
index 4a06e3a8d0..fa576b97d5 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
+++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.cpp
@@ -9,7 +9,7 @@
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Graphics/Intel/NativeGraphicsAdapter.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h
index 321e9763fe..697e1e216f 100644
--- a/Kernel/Graphics/Intel/NativeGraphicsAdapter.h
+++ b/Kernel/Graphics/Intel/NativeGraphicsAdapter.h
@@ -11,7 +11,7 @@
 #include <Kernel/Graphics/Definitions.h>
 #include <Kernel/Graphics/Intel/DisplayConnectorGroup.h>
 #include <Kernel/Graphics/Intel/NativeDisplayConnector.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <LibEDID/EDID.h>
 
 namespace Kernel {
diff --git a/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp b/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp
index c9681f6472..31b01011c6 100644
--- a/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp
+++ b/Kernel/Graphics/Intel/Plane/DisplayPlane.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Graphics/Intel/Plane/DisplayPlane.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp b/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp
index 3a45116b28..05d55dd798 100644
--- a/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp
+++ b/Kernel/Graphics/Intel/Plane/G33DisplayPlane.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <Kernel/Graphics/Intel/Plane/G33DisplayPlane.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp b/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
index 3d9600995d..206af11437 100644
--- a/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
+++ b/Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Transcoder/AnalogDisplayTranscoder.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp b/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp
index 4836538615..0ffa8bb8d8 100644
--- a/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp
+++ b/Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.cpp
@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Graphics/Intel/Transcoder/DisplayTranscoder.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Graphics/VMWare/GraphicsAdapter.h b/Kernel/Graphics/VMWare/GraphicsAdapter.h
index 06c35efaa5..65ad91a428 100644
--- a/Kernel/Graphics/VMWare/GraphicsAdapter.h
+++ b/Kernel/Graphics/VMWare/GraphicsAdapter.h
@@ -12,8 +12,8 @@
 #include <Kernel/Graphics/VMWare/Definitions.h>
 #include <Kernel/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/IOWindow.h b/Kernel/IOWindow.h
index ea4d7c5bb5..d07793681b 100644
--- a/Kernel/IOWindow.h
+++ b/Kernel/IOWindow.h
@@ -13,8 +13,8 @@
 #    include <Kernel/Arch/x86_64/IO.h>
 #endif
 #include <Kernel/Bus/PCI/Definitions.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel {
 
diff --git a/Kernel/Memory/AnonymousVMObject.h b/Kernel/Memory/AnonymousVMObject.h
index 6bee370e4c..3f491cdfae 100644
--- a/Kernel/Memory/AnonymousVMObject.h
+++ b/Kernel/Memory/AnonymousVMObject.h
@@ -9,8 +9,8 @@
 #include <Kernel/Memory/AllocationStrategy.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PageFaultResponse.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VMObject.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/MappedROM.h b/Kernel/Memory/MappedROM.h
index 486251df5e..dfef6d1a11 100644
--- a/Kernel/Memory/MappedROM.h
+++ b/Kernel/Memory/MappedROM.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/OwnPtr.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/PhysicalAddress.h b/Kernel/Memory/PhysicalAddress.h
similarity index 100%
rename from Kernel/PhysicalAddress.h
rename to Kernel/Memory/PhysicalAddress.h
diff --git a/Kernel/Memory/PhysicalPage.h b/Kernel/Memory/PhysicalPage.h
index c0869ffb00..e1ddbc84b8 100644
--- a/Kernel/Memory/PhysicalPage.h
+++ b/Kernel/Memory/PhysicalPage.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/NonnullRefPtr.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/RegionTree.h b/Kernel/Memory/RegionTree.h
index e028bb3130..d1b06f3ec1 100644
--- a/Kernel/Memory/RegionTree.h
+++ b/Kernel/Memory/RegionTree.h
@@ -10,8 +10,8 @@
 #include <AK/IntrusiveRedBlackTree.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/Region.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Memory/VirtualRange.h>
-#include <Kernel/VirtualAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/RingBuffer.h b/Kernel/Memory/RingBuffer.h
index 74ff355b29..7b35f7ac12 100644
--- a/Kernel/Memory/RingBuffer.h
+++ b/Kernel/Memory/RingBuffer.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel::Memory {
diff --git a/Kernel/Memory/ScatterGatherList.h b/Kernel/Memory/ScatterGatherList.h
index 2f6fb18533..8e97759db2 100644
--- a/Kernel/Memory/ScatterGatherList.h
+++ b/Kernel/Memory/ScatterGatherList.h
@@ -11,7 +11,7 @@
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Memory/SharedFramebufferVMObject.h b/Kernel/Memory/SharedFramebufferVMObject.h
index 296189c264..e860a2ff69 100644
--- a/Kernel/Memory/SharedFramebufferVMObject.h
+++ b/Kernel/Memory/SharedFramebufferVMObject.h
@@ -11,7 +11,7 @@
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PageFaultResponse.h>
-#include <Kernel/PhysicalAddress.h>
+#include <Kernel/Memory/PhysicalAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/VirtualAddress.h b/Kernel/Memory/VirtualAddress.h
similarity index 100%
rename from Kernel/VirtualAddress.h
rename to Kernel/Memory/VirtualAddress.h
diff --git a/Kernel/Memory/VirtualRange.h b/Kernel/Memory/VirtualRange.h
index bf3d537201..ef6a27bdb8 100644
--- a/Kernel/Memory/VirtualRange.h
+++ b/Kernel/Memory/VirtualRange.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AK/Error.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel::Memory {
 
diff --git a/Kernel/Prekernel/Prekernel.h b/Kernel/Prekernel/Prekernel.h
index 7c0176fc12..725ba90daf 100644
--- a/Kernel/Prekernel/Prekernel.h
+++ b/Kernel/Prekernel/Prekernel.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #ifdef __cplusplus
+#    include <Kernel/Memory/PhysicalAddress.h>
+#    include <Kernel/Memory/VirtualAddress.h>
 #    include <Kernel/Multiboot.h>
-#    include <Kernel/PhysicalAddress.h>
-#    include <Kernel/VirtualAddress.h>
 #endif
 
 #define MAX_KERNEL_SIZE 0x4000000
diff --git a/Kernel/Prekernel/init.cpp b/Kernel/Prekernel/init.cpp
index b892b75647..b8f27a2516 100644
--- a/Kernel/Prekernel/init.cpp
+++ b/Kernel/Prekernel/init.cpp
@@ -7,10 +7,10 @@
  */
 
 #include <AK/Types.h>
+#include <Kernel/Memory/PhysicalAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/Multiboot.h>
-#include <Kernel/PhysicalAddress.h>
 #include <Kernel/Prekernel/Prekernel.h>
-#include <Kernel/VirtualAddress.h>
 #include <LibC/elf.h>
 #include <LibELF/Relocation.h>
 
diff --git a/Userland/DevTools/UserspaceEmulator/Range.h b/Userland/DevTools/UserspaceEmulator/Range.h
index 29750e0530..98b489552f 100644
--- a/Userland/DevTools/UserspaceEmulator/Range.h
+++ b/Userland/DevTools/UserspaceEmulator/Range.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace UserspaceEmulator {
 
diff --git a/Userland/Libraries/LibELF/DynamicObject.h b/Userland/Libraries/LibELF/DynamicObject.h
index b515785c2b..c901baf6b9 100644
--- a/Userland/Libraries/LibELF/DynamicObject.h
+++ b/Userland/Libraries/LibELF/DynamicObject.h
@@ -12,7 +12,7 @@
 #include <AK/Concepts.h>
 #include <AK/DeprecatedString.h>
 #include <AK/RefCounted.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <LibC/elf.h>
 #include <LibC/link.h>
 
diff --git a/Userland/Libraries/LibELF/Image.h b/Userland/Libraries/LibELF/Image.h
index 80f2d49a29..f6805da8da 100644
--- a/Userland/Libraries/LibELF/Image.h
+++ b/Userland/Libraries/LibELF/Image.h
@@ -9,7 +9,7 @@
 
 #include <AK/Concepts.h>
 #include <AK/Vector.h>
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 #include <LibC/elf.h>
 
 #ifndef KERNEL
diff --git a/Userland/Libraries/LibELF/Relocation.h b/Userland/Libraries/LibELF/Relocation.h
index 6e36a58988..a00b1b7029 100644
--- a/Userland/Libraries/LibELF/Relocation.h
+++ b/Userland/Libraries/LibELF/Relocation.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Kernel/VirtualAddress.h>
+#include <Kernel/Memory/VirtualAddress.h>
 
 namespace ELF {