From 8f21420a1ded33cd305ce110b2a2fe819e06f620 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Fri, 24 Feb 2023 20:21:53 +0200
Subject: [PATCH] Kernel: Move all boot-related code to the new Boot
 subdirectory

---
 Kernel/Arch/aarch64/MMU.cpp                                 | 2 +-
 Kernel/Arch/aarch64/RPi/Framebuffer.cpp                     | 2 +-
 Kernel/Arch/init.cpp                                        | 6 +++---
 Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp            | 2 +-
 Kernel/Arch/x86_64/InterruptManagement.cpp                  | 2 +-
 Kernel/Arch/x86_64/PCI/Initializer.cpp                      | 2 +-
 Kernel/{ => Boot}/BootInfo.h                                | 2 +-
 Kernel/{ => Boot}/CommandLine.cpp                           | 2 +-
 Kernel/{ => Boot}/CommandLine.h                             | 0
 Kernel/{ => Boot}/Multiboot.h                               | 0
 Kernel/Bus/USB/USBManagement.cpp                            | 2 +-
 Kernel/Bus/VirtIO/Device.cpp                                | 2 +-
 Kernel/CMakeLists.txt                                       | 2 +-
 Kernel/Devices/HID/Management.cpp                           | 2 +-
 Kernel/Devices/Storage/ATA/AHCI/Controller.cpp              | 2 +-
 Kernel/Devices/Storage/NVMe/NVMeController.cpp              | 2 +-
 Kernel/Devices/Storage/StorageManagement.cpp                | 2 +-
 .../SysFS/Subsystems/Kernel/Constants/Directory.cpp         | 2 +-
 Kernel/Firmware/ACPI/Initialize.cpp                         | 2 +-
 Kernel/Firmware/ACPI/Parser.h                               | 2 +-
 Kernel/Graphics/GraphicsManagement.cpp                      | 4 ++--
 Kernel/Library/Panic.cpp                                    | 2 +-
 Kernel/Memory/MemoryManager.cpp                             | 4 ++--
 Kernel/Net/NetworkingManagement.cpp                         | 4 ++--
 Kernel/Prekernel/Prekernel.h                                | 2 +-
 Kernel/Prekernel/init.cpp                                   | 2 +-
 Kernel/Sections.h                                           | 2 +-
 Kernel/Syscalls/beep.cpp                                    | 2 +-
 Kernel/TTY/ConsoleManagement.cpp                            | 2 +-
 Kernel/TTY/VirtualConsole.cpp                               | 2 +-
 Kernel/Time/TimeManagement.cpp                              | 2 +-
 31 files changed, 34 insertions(+), 34 deletions(-)
 rename Kernel/{ => Boot}/BootInfo.h (97%)
 rename Kernel/{ => Boot}/CommandLine.cpp (99%)
 rename Kernel/{ => Boot}/CommandLine.h (100%)
 rename Kernel/{ => Boot}/Multiboot.h (100%)

diff --git a/Kernel/Arch/aarch64/MMU.cpp b/Kernel/Arch/aarch64/MMU.cpp
index 10eb030e161..23dc9154bd1 100644
--- a/Kernel/Arch/aarch64/MMU.cpp
+++ b/Kernel/Arch/aarch64/MMU.cpp
@@ -13,7 +13,7 @@
 #include <Kernel/Arch/aarch64/RPi/MMIO.h>
 #include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
index e0168b35faa..2c8834c01ba 100644
--- a/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
+++ b/Kernel/Arch/aarch64/RPi/Framebuffer.cpp
@@ -8,7 +8,7 @@
 #include <Kernel/Arch/aarch64/BootPPMParser.h>
 #include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
 #include <Kernel/Arch/aarch64/RPi/FramebufferMailboxMessages.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::RPi {
diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp
index 09e42b1ba52..d139131b2b6 100644
--- a/Kernel/Arch/init.cpp
+++ b/Kernel/Arch/init.cpp
@@ -7,12 +7,13 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/InterruptManagement.h>
 #include <Kernel/Arch/Processor.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
 #include <Kernel/Bus/USB/USBManagement.h>
 #include <Kernel/Bus/VirtIO/Device.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Audio/Management.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/Generic/DeviceControlDevice.h>
@@ -39,7 +40,6 @@
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Net/NetworkTask.h>
 #include <Kernel/Net/NetworkingManagement.h>
 #include <Kernel/Prekernel/Prekernel.h>
diff --git a/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp b/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
index 013cad97d96..9f86a0ce3eb 100644
--- a/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
+++ b/Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.cpp
@@ -8,7 +8,7 @@
 #include <AK/Singleton.h>
 #include <Kernel/API/MousePacket.h>
 #include <Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Arch/x86_64/InterruptManagement.cpp b/Kernel/Arch/x86_64/InterruptManagement.cpp
index 16d866ff3de..245e6593a97 100644
--- a/Kernel/Arch/x86_64/InterruptManagement.cpp
+++ b/Kernel/Arch/x86_64/InterruptManagement.cpp
@@ -11,7 +11,7 @@
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/Arch/x86_64/Interrupts/IOAPIC.h>
 #include <Kernel/Arch/x86_64/Interrupts/PIC.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/MultiProcessor/Parser.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Interrupts/SharedIRQHandler.h>
diff --git a/Kernel/Arch/x86_64/PCI/Initializer.cpp b/Kernel/Arch/x86_64/PCI/Initializer.cpp
index 264946639a8..be0bdab613b 100644
--- a/Kernel/Arch/x86_64/PCI/Initializer.cpp
+++ b/Kernel/Arch/x86_64/PCI/Initializer.cpp
@@ -6,10 +6,10 @@
 
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/x86_64/IO.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Initializer.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/BusDirectory.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Library/Panic.h>
diff --git a/Kernel/BootInfo.h b/Kernel/Boot/BootInfo.h
similarity index 97%
rename from Kernel/BootInfo.h
rename to Kernel/Boot/BootInfo.h
index 36c849945d3..54b4f000b6e 100644
--- a/Kernel/BootInfo.h
+++ b/Kernel/Boot/BootInfo.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <AK/StringView.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VirtualAddress.h>
-#include <Kernel/Multiboot.h>
 
 namespace Kernel::Memory {
 class PageTableEntry;
diff --git a/Kernel/CommandLine.cpp b/Kernel/Boot/CommandLine.cpp
similarity index 99%
rename from Kernel/CommandLine.cpp
rename to Kernel/Boot/CommandLine.cpp
index 51162cfa9f0..1db86eb84c5 100644
--- a/Kernel/CommandLine.cpp
+++ b/Kernel/Boot/CommandLine.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/StringBuilder.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/CommandLine.h b/Kernel/Boot/CommandLine.h
similarity index 100%
rename from Kernel/CommandLine.h
rename to Kernel/Boot/CommandLine.h
diff --git a/Kernel/Multiboot.h b/Kernel/Boot/Multiboot.h
similarity index 100%
rename from Kernel/Multiboot.h
rename to Kernel/Boot/Multiboot.h
diff --git a/Kernel/Bus/USB/USBManagement.cpp b/Kernel/Bus/USB/USBManagement.cpp
index 3bb784e659a..53a1c9950cf 100644
--- a/Kernel/Bus/USB/USBManagement.cpp
+++ b/Kernel/Bus/USB/USBManagement.cpp
@@ -5,10 +5,10 @@
  */
 
 #include <AK/Singleton.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBManagement.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/BusDirectory.h>
 #include <Kernel/Sections.h>
 
diff --git a/Kernel/Bus/VirtIO/Device.cpp b/Kernel/Bus/VirtIO/Device.cpp
index fda0d520626..2658f330f0d 100644
--- a/Kernel/Bus/VirtIO/Device.cpp
+++ b/Kernel/Bus/VirtIO/Device.cpp
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
 #include <Kernel/Bus/VirtIO/Console.h>
 #include <Kernel/Bus/VirtIO/Device.h>
 #include <Kernel/Bus/VirtIO/RNG.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::VirtIO {
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 4c57831f21c..a8c6c691bd9 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -19,6 +19,7 @@ set(KERNEL_SOURCES
     Arch/init.cpp
     Arch/PageFault.cpp
     Arch/DeferredCallPool.cpp
+    Boot/CommandLine.cpp
     Bus/PCI/Controller/HostController.cpp
     Bus/PCI/Controller/MemoryBackedHostBridge.cpp
     Bus/PCI/Controller/VolumeManagementDevice.cpp
@@ -40,7 +41,6 @@ set(KERNEL_SOURCES
     Bus/VirtIO/Device.cpp
     Bus/VirtIO/Queue.cpp
     Bus/VirtIO/RNG.cpp
-    CommandLine.cpp
     Devices/AsyncDeviceRequest.cpp
     Devices/Audio/AC97.cpp
     Devices/Audio/Channel.cpp
diff --git a/Kernel/Devices/HID/Management.cpp b/Kernel/Devices/HID/Management.cpp
index d6a19b3e507..970a4cee472 100644
--- a/Kernel/Devices/HID/Management.cpp
+++ b/Kernel/Devices/HID/Management.cpp
@@ -9,7 +9,7 @@
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/ISABus/I8042Controller.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/HID/Device.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
diff --git a/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp
index 6b78fda40bb..54709aea195 100644
--- a/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp
+++ b/Kernel/Devices/Storage/ATA/AHCI/Controller.cpp
@@ -9,8 +9,8 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/Delay.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/InterruptHandler.h>
 #include <Kernel/Library/LockRefPtr.h>
diff --git a/Kernel/Devices/Storage/NVMe/NVMeController.cpp b/Kernel/Devices/Storage/NVMe/NVMeController.cpp
index 239dc17c01c..ca6d104b28d 100644
--- a/Kernel/Devices/Storage/NVMe/NVMeController.cpp
+++ b/Kernel/Devices/Storage/NVMe/NVMeController.cpp
@@ -10,8 +10,8 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Arch/Interrupts.h>
 #include <Kernel/Arch/SafeMem.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/Device.h>
 #include <Kernel/Devices/Storage/NVMe/NVMeController.h>
 #include <Kernel/Devices/Storage/StorageManagement.h>
diff --git a/Kernel/Devices/Storage/StorageManagement.cpp b/Kernel/Devices/Storage/StorageManagement.cpp
index c4414a0f126..00d96e32d8e 100644
--- a/Kernel/Devices/Storage/StorageManagement.cpp
+++ b/Kernel/Devices/Storage/StorageManagement.cpp
@@ -16,10 +16,10 @@
 #if ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/RPi/SDHostController.h>
 #endif
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/Access.h>
 #include <Kernel/Bus/PCI/Controller/VolumeManagementDevice.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/Storage/ATA/AHCI/Controller.h>
diff --git a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp
index 483893f652d..9a68411b16c 100644
--- a/Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp
+++ b/Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp
@@ -6,7 +6,7 @@
 
 #include <AK/Error.h>
 #include <AK/Try.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/ConstantInformation.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.h>
diff --git a/Kernel/Firmware/ACPI/Initialize.cpp b/Kernel/Firmware/ACPI/Initialize.cpp
index 5588080a6f2..85c0b30e38f 100644
--- a/Kernel/Firmware/ACPI/Initialize.cpp
+++ b/Kernel/Firmware/ACPI/Initialize.cpp
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>
diff --git a/Kernel/Firmware/ACPI/Parser.h b/Kernel/Firmware/ACPI/Parser.h
index b8b4c3cf9f2..f9c9c7f81b7 100644
--- a/Kernel/Firmware/ACPI/Parser.h
+++ b/Kernel/Firmware/ACPI/Parser.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
 #include <Kernel/Firmware/ACPI/Definitions.h>
diff --git a/Kernel/Graphics/GraphicsManagement.cpp b/Kernel/Graphics/GraphicsManagement.cpp
index 1386c6b524f..3e372930194 100644
--- a/Kernel/Graphics/GraphicsManagement.cpp
+++ b/Kernel/Graphics/GraphicsManagement.cpp
@@ -9,9 +9,10 @@
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/Hypervisor/BochsDisplayConnector.h>
 #endif
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Bus/PCI/IDs.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Graphics/Bochs/GraphicsAdapter.h>
 #include <Kernel/Graphics/Console/BootFramebufferConsole.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
@@ -19,7 +20,6 @@
 #include <Kernel/Graphics/VMWare/GraphicsAdapter.h>
 #include <Kernel/Graphics/VirtIOGPU/GraphicsAdapter.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {
diff --git a/Kernel/Library/Panic.cpp b/Kernel/Library/Panic.cpp
index 227cc1b22ad..b77de7883e1 100644
--- a/Kernel/Library/Panic.cpp
+++ b/Kernel/Library/Panic.cpp
@@ -11,7 +11,7 @@
 #elif ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/RPi/Watchdog.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/KSyms.h>
 #include <Kernel/Library/Panic.h>
 #include <Kernel/Tasks/Thread.h>
diff --git a/Kernel/Memory/MemoryManager.cpp b/Kernel/Memory/MemoryManager.cpp
index d3e63442669..1c8c40e4d59 100644
--- a/Kernel/Memory/MemoryManager.cpp
+++ b/Kernel/Memory/MemoryManager.cpp
@@ -10,7 +10,8 @@
 #include <Kernel/Arch/PageDirectory.h>
 #include <Kernel/Arch/PageFault.h>
 #include <Kernel/Arch/RegisterState.h>
-#include <Kernel/BootInfo.h>
+#include <Kernel/Boot/BootInfo.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Heap/kmalloc.h>
 #include <Kernel/InterruptDisabler.h>
@@ -21,7 +22,6 @@
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/PhysicalRegion.h>
 #include <Kernel/Memory/SharedInodeVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/Process.h>
diff --git a/Kernel/Net/NetworkingManagement.cpp b/Kernel/Net/NetworkingManagement.cpp
index 1a647118898..323a9535470 100644
--- a/Kernel/Net/NetworkingManagement.cpp
+++ b/Kernel/Net/NetworkingManagement.cpp
@@ -5,11 +5,11 @@
  */
 
 #include <AK/Singleton.h>
+#include <Kernel/Boot/CommandLine.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Bus/PCI/API.h>
-#include <Kernel/CommandLine.h>
 #include <Kernel/Library/KString.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Net/Intel/E1000ENetworkAdapter.h>
 #include <Kernel/Net/Intel/E1000NetworkAdapter.h>
 #include <Kernel/Net/LoopbackAdapter.h>
diff --git a/Kernel/Prekernel/Prekernel.h b/Kernel/Prekernel/Prekernel.h
index 725ba90daf2..f649f8b6d99 100644
--- a/Kernel/Prekernel/Prekernel.h
+++ b/Kernel/Prekernel/Prekernel.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #ifdef __cplusplus
+#    include <Kernel/Boot/Multiboot.h>
 #    include <Kernel/Memory/PhysicalAddress.h>
 #    include <Kernel/Memory/VirtualAddress.h>
-#    include <Kernel/Multiboot.h>
 #endif
 
 #define MAX_KERNEL_SIZE 0x4000000
diff --git a/Kernel/Prekernel/init.cpp b/Kernel/Prekernel/init.cpp
index b8f27a25164..40d12f37206 100644
--- a/Kernel/Prekernel/init.cpp
+++ b/Kernel/Prekernel/init.cpp
@@ -7,9 +7,9 @@
  */
 
 #include <AK/Types.h>
+#include <Kernel/Boot/Multiboot.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 #include <Kernel/Memory/VirtualAddress.h>
-#include <Kernel/Multiboot.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <LibC/elf.h>
 #include <LibELF/Relocation.h>
diff --git a/Kernel/Sections.h b/Kernel/Sections.h
index eded3f09517..12c759c5d33 100644
--- a/Kernel/Sections.h
+++ b/Kernel/Sections.h
@@ -9,7 +9,7 @@
 #include <AK/Platform.h>
 #ifdef __cplusplus
 #    include <AK/Types.h>
-#    include <Kernel/BootInfo.h>
+#    include <Kernel/Boot/BootInfo.h>
 #endif
 
 #define READONLY_AFTER_INIT __attribute__((section(".ro_after_init")))
diff --git a/Kernel/Syscalls/beep.cpp b/Kernel/Syscalls/beep.cpp
index dde536132a5..a93fe8d9bee 100644
--- a/Kernel/Syscalls/beep.cpp
+++ b/Kernel/Syscalls/beep.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/PCSpeaker.h>
 #endif
diff --git a/Kernel/TTY/ConsoleManagement.cpp b/Kernel/TTY/ConsoleManagement.cpp
index 69c4e94cc3a..e648ac5679f 100644
--- a/Kernel/TTY/ConsoleManagement.cpp
+++ b/Kernel/TTY/ConsoleManagement.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <AK/Singleton.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Debug.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index e84a2fd0dbc..563d5ed1860 100644
--- a/Kernel/TTY/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
@@ -11,7 +11,7 @@
 #if ARCH(X86_64)
 #    include <Kernel/Arch/x86_64/PCSpeaker.h>
 #endif
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/HID/Management.h>
 #include <Kernel/Graphics/GraphicsManagement.h>
diff --git a/Kernel/Time/TimeManagement.cpp b/Kernel/Time/TimeManagement.cpp
index da744663798..5d672af49f9 100644
--- a/Kernel/Time/TimeManagement.cpp
+++ b/Kernel/Time/TimeManagement.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include <Kernel/Arch/CurrentTime.h>
-#include <Kernel/CommandLine.h>
+#include <Kernel/Boot/CommandLine.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/PerformanceManager.h>