Everywhere: Move global Kernel pattern code to Kernel/Library directory

This has KString, KBuffer, DoubleBuffer, KBufferBuilder, IOWindow,
UserOrKernelBuffer and ScopedCritical classes being moved to the
Kernel/Library subdirectory.

Also, move the panic and assertions handling code to that directory.

AK/Assertions.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #if defined(KERNEL)
-#    include <Kernel/Assertions.h>
+#    include <Kernel/Library/Assertions.h>
 #else
 #    include <assert.h>
 extern "C" __attribute__((noreturn)) void ak_verification_failed(char const*);

AK/Hex.h

@@ -11,7 +11,7 @@
 #include <AK/StringView.h>
 
 #ifdef KERNEL
-#    include <Kernel/KString.h>
+#    include <Kernel/Library/KString.h>
 #else
 #    include <AK/DeprecatedString.h>
 #endif

AK/IPv4Address.h

@@ -14,7 +14,7 @@
 
 #ifdef KERNEL
 #    include <AK/Error.h>
-#    include <Kernel/KString.h>
+#    include <Kernel/Library/KString.h>
 #else
 #    include <AK/DeprecatedString.h>
 #    include <AK/String.h>

AK/IPv6Address.h

@@ -14,7 +14,7 @@
 
 #ifdef KERNEL
 #    include <AK/Error.h>
-#    include <Kernel/KString.h>
+#    include <Kernel/Library/KString.h>
 #else
 #    include <AK/DeprecatedString.h>
 #endif

AK/MACAddress.h

@@ -13,7 +13,7 @@
 #include <AK/Vector.h>
 
 #ifdef KERNEL
-#    include <Kernel/KString.h>
+#    include <Kernel/Library/KString.h>
 #else
 #    include <AK/DeprecatedString.h>
 #endif

AK/Memory.h

@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 
 #if defined(KERNEL)
-#    include <Kernel/StdLib.h>
+#    include <Kernel/Library/StdLib.h>
 #else
 #    include <string.h>
 #endif

AK/Singleton.h

@@ -11,8 +11,8 @@
 #include <AK/Noncopyable.h>
 #ifdef KERNEL
 #    include <Kernel/Arch/Processor.h>
+#    include <Kernel/Library/ScopedCritical.h>
 #    include <Kernel/Locking/SpinlockProtected.h>
-#    include <Kernel/ScopedCritical.h>
 #elif defined(AK_OS_WINDOWS)
 // Forward declare to avoid pulling Windows.h into every file in existence.
 extern "C" __declspec(dllimport) void __stdcall Sleep(unsigned long);

AK/StringUtils.cpp

@@ -15,7 +15,7 @@
 #include <AK/Vector.h>
 
 #ifdef KERNEL
-#    include <Kernel/StdLib.h>
+#    include <Kernel/Library/StdLib.h>
 #else
 #    include <AK/DeprecatedString.h>
 #    include <AK/FloatingPointStringConversions.h>

AK/UUID.h

@@ -12,7 +12,7 @@
 #include <AK/Types.h>
 
 #ifdef KERNEL
-#    include <Kernel/KString.h>
+#    include <Kernel/Library/KString.h>
 #else
 #    include <AK/String.h>
 #endif

Kernel/Arch/aarch64/CPUID.h

@@ -11,7 +11,7 @@
 #include <AK/Types.h>
 #include <AK/UFixedBigInt.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 #include <AK/Platform.h>
 VALIDATE_IS_AARCH64()

Kernel/Arch/aarch64/Exceptions.cpp

@@ -8,7 +8,7 @@
 #include <Kernel/Arch/aarch64/CPU.h>
 #include <Kernel/Arch/aarch64/Processor.h>
 #include <Kernel/Arch/aarch64/Registers.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 
 extern "C" uintptr_t vector_table_el1;
 

Kernel/Arch/aarch64/Interrupts.cpp

@@ -13,8 +13,8 @@
 #include <Kernel/Interrupts/SharedIRQHandler.h>
 #include <Kernel/Interrupts/UnhandledInterruptHandler.h>
 #include <Kernel/KSyms.h>
-#include <Kernel/Panic.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/Panic.h>
+#include <Kernel/Library/StdLib.h>
 
 namespace Kernel {
 

Kernel/Arch/aarch64/MMU.cpp

@@ -14,7 +14,7 @@
 #include <Kernel/Arch/aarch64/RPi/UART.h>
 #include <Kernel/Arch/aarch64/Registers.h>
 #include <Kernel/BootInfo.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 
 // Documentation here for Aarch64 Address Translations

Kernel/Arch/aarch64/Panic.cpp

@@ -6,9 +6,9 @@
 
 #include <Kernel/Arch/Processor.h>
 #include <Kernel/KSyms.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 
-// FIXME: Merge the code in this file with Kernel/Panic.cpp once the proper abstractions are in place.
+// FIXME: Merge the code in this file with Kernel/Library/Panic.cpp once the proper abstractions are in place.
 
 // Note: This is required here, since __assertion_failed should be out of the Kernel namespace,
 //       but the PANIC macro uses functions that require the Kernel namespace.

Kernel/Arch/aarch64/SafeMem.cpp

@@ -7,7 +7,7 @@
 
 #include <Kernel/Arch/RegisterState.h>
 #include <Kernel/Arch/SafeMem.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/StdLib.h>
 
 #define CODE_SECTION(section_name) __attribute__((section(section_name)))
 

Kernel/Arch/aarch64/ThreadRegisters.h

@@ -7,8 +7,8 @@
 #pragma once
 
 #include <AK/Types.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Memory/AddressSpace.h>
-#include <Kernel/StdLib.h>
 
 namespace Kernel {
 

Kernel/Arch/init.cpp

@@ -37,11 +37,11 @@
 #include <Kernel/Graphics/GraphicsManagement.h>
 #include <Kernel/Heap/kmalloc.h>
 #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/Panic.h>
 #include <Kernel/Prekernel/Prekernel.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>

Kernel/Arch/x86_64/CPU.cpp

@@ -6,7 +6,7 @@
 
 #include <AK/Assertions.h>
 #include <Kernel/Arch/CPU.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Tasks/Process.h>
 
 using namespace Kernel;

Kernel/Arch/x86_64/ISABus/SerialDevice.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Arch/x86_64/Interrupts.cpp

@@ -15,7 +15,7 @@
 #include <Kernel/Interrupts/SharedIRQHandler.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
 #include <Kernel/Interrupts/UnhandledInterruptHandler.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/PerformanceManager.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>

Kernel/Arch/x86_64/Interrupts/APIC.cpp

@@ -16,10 +16,10 @@
 #include <Kernel/Debug.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
 #include <Kernel/Interrupts/SpuriousInterruptHandler.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
-#include <Kernel/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/Scheduler.h>
 #include <Kernel/Tasks/Thread.h>

Kernel/Arch/x86_64/PCI/Initializer.cpp

@@ -12,7 +12,7 @@
 #include <Kernel/CommandLine.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/BusDirectory.h>
 #include <Kernel/Firmware/ACPI/Parser.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel::PCI {

Kernel/Arch/x86_64/Processor.cpp

@@ -14,9 +14,9 @@
 
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/InterruptDisabler.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Security/Random.h>
-#include <Kernel/StdLib.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/Scheduler.h>
 #include <Kernel/Tasks/Thread.h>
@@ -28,7 +28,7 @@
 #include <Kernel/Arch/x86_64/CPUID.h>
 #include <Kernel/Arch/x86_64/MSR.h>
 #include <Kernel/Arch/x86_64/ProcessorInfo.h>
-#include <Kernel/ScopedCritical.h>
+#include <Kernel/Library/ScopedCritical.h>
 
 #include <Kernel/Arch/PageDirectory.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>

Kernel/Arch/x86_64/Processor.h

@@ -20,7 +20,7 @@
 #include <Kernel/Arch/x86_64/SIMDState.h>
 #include <Kernel/Arch/x86_64/TSS.h>
 #include <Kernel/Forward.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 #include <AK/Platform.h>
 VALIDATE_IS_X86()

Kernel/Arch/x86_64/ProcessorInfo.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 #include <AK/Platform.h>
 VALIDATE_IS_X86()

Kernel/Arch/x86_64/SyscallEntry.cpp

@@ -8,8 +8,8 @@
 #include <Kernel/Arch/TrapFrame.h>
 #include <Kernel/Arch/x86_64/DescriptorTable.h>
 #include <Kernel/Arch/x86_64/Processor.h>
-#include <Kernel/Assertions.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Assertions.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/Scheduler.h>
 #include <Kernel/Tasks/Thread.h>

Kernel/Arch/x86_64/Time/APICTimer.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Arch/x86_64/Interrupts/APIC.h>
 #include <Kernel/Arch/x86_64/Time/APICTimer.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/TimeManagement.h>
 

Kernel/Arch/x86_64/Time/HPETComparator.cpp

@@ -5,9 +5,9 @@
  */
 
 #include <Kernel/Arch/x86_64/Time/HPETComparator.h>
-#include <Kernel/Assertions.h>
 #include <Kernel/Debug.h>
 #include <Kernel/InterruptDisabler.h>
+#include <Kernel/Library/Assertions.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Time/TimeManagement.h>
 

Kernel/Bus/USB/UHCI/UHCIController.cpp

@@ -12,10 +12,10 @@
 #include <Kernel/Bus/USB/UHCI/UHCIController.h>
 #include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/Debug.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Sections.h>
-#include <Kernel/StdLib.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Time/TimeManagement.h>
 

Kernel/Bus/USB/UHCI/UHCIController.h

@@ -15,8 +15,8 @@
 #include <Kernel/Bus/USB/UHCI/UHCIDescriptorTypes.h>
 #include <Kernel/Bus/USB/UHCI/UHCIRootHub.h>
 #include <Kernel/Bus/USB/USBController.h>
-#include <Kernel/IOWindow.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Tasks/Process.h>

Kernel/Bus/USB/UHCI/UHCIDescriptorPool.h

@@ -9,10 +9,10 @@
 #include <AK/NonnullOwnPtr.h>
 #include <AK/OwnPtr.h>
 #include <AK/Stack.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Locking/Spinlock.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/Region.h>
-#include <Kernel/StdLib.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBConfiguration.cpp

@@ -9,7 +9,7 @@
 #include <Kernel/Bus/USB/USBConfiguration.h>
 #include <Kernel/Bus/USB/USBInterface.h>
 #include <Kernel/Bus/USB/USBRequest.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/StdLib.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBDevice.cpp

@@ -12,7 +12,7 @@
 #include <Kernel/Bus/USB/USBDevice.h>
 #include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/DeviceInformation.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/StdLib.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBHub.cpp

@@ -10,8 +10,8 @@
 #include <Kernel/Bus/USB/USBHub.h>
 #include <Kernel/Bus/USB/USBRequest.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/BusDirectory.h>
-#include <Kernel/IOWindow.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/IOWindow.h>
+#include <Kernel/Library/StdLib.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/USB/USBTransfer.cpp

@@ -5,8 +5,8 @@
  */
 
 #include <Kernel/Bus/USB/USBTransfer.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Memory/MemoryManager.h>
-#include <Kernel/StdLib.h>
 
 namespace Kernel::USB {
 

Kernel/Bus/VirtIO/Device.h

@@ -10,8 +10,8 @@
 #include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Bus/VirtIO/Definitions.h>
 #include <Kernel/Bus/VirtIO/Queue.h>
-#include <Kernel/IOWindow.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Memory/MemoryManager.h>
 
 namespace Kernel::VirtIO {

Kernel/CMakeLists.txt

@@ -114,9 +114,7 @@ set(KERNEL_SOURCES
     Graphics/VirtIOGPU/Console.cpp
     Graphics/VirtIOGPU/GPU3DDevice.cpp
     Graphics/VirtIOGPU/GraphicsAdapter.cpp
-    IOWindow.cpp
     SanCov.cpp
-    DoubleBuffer.cpp
     FileSystem/AnonymousFile.cpp
     FileSystem/BlockBasedFileSystem.cpp
     FileSystem/Custody.cpp
@@ -217,9 +215,6 @@ set(KERNEL_SOURCES
     Interrupts/PCIIRQHandler.cpp
     Interrupts/SharedIRQHandler.cpp
     Interrupts/UnhandledInterruptHandler.cpp
-    KBufferBuilder.cpp
-    KLexicalPath.cpp
-    KString.cpp
     KSyms.cpp
     Memory/AddressSpace.cpp
     Memory/AnonymousVMObject.cpp
@@ -238,9 +233,18 @@ set(KERNEL_SOURCES
     Memory/SharedInodeVMObject.cpp
     Memory/VMObject.cpp
     Memory/VirtualRange.cpp
-    MiniStdLib.cpp
     Locking/LockRank.cpp
     Locking/Mutex.cpp
+    Library/DoubleBuffer.cpp
+    Library/IOWindow.cpp
+    Library/MiniStdLib.cpp
+    Library/Panic.cpp
+    Library/ScopedCritical.cpp
+    Library/StdLib.cpp
+    Library/KBufferBuilder.cpp
+    Library/KLexicalPath.cpp
+    Library/KString.cpp
+    Library/UserOrKernelBuffer.cpp
     Net/Intel/E1000ENetworkAdapter.cpp
     Net/Intel/E1000NetworkAdapter.cpp
     Net/Realtek/RTL8168NetworkAdapter.cpp
@@ -254,10 +258,7 @@ set(KERNEL_SOURCES
     Net/Socket.cpp
     Net/TCPSocket.cpp
     Net/UDPSocket.cpp
-    Panic.cpp
     PerformanceEventBuffer.cpp
-    ScopedCritical.cpp
-    StdLib.cpp
     Syscall.cpp
     Security/AddressSanitizer.cpp
     Security/Credentials.cpp
@@ -358,7 +359,6 @@ set(KERNEL_SOURCES
     Tasks/WorkQueue.cpp
     Time/TimeManagement.cpp
     TimerQueue.cpp
-    UserOrKernelBuffer.cpp
 )
 
 if ("${SERENITY_ARCH}" STREQUAL "x86_64")
@@ -405,7 +405,7 @@ if ("${SERENITY_ARCH}" STREQUAL "x86_64")
 
         # TODO: Share these with the aarch64 build
         Interrupts/SpuriousInterruptHandler.cpp
-        kprintf.cpp
+        kprintf.cpp        
     )
 
     set(KERNEL_SOURCES
@@ -599,7 +599,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 
 
     # Prevent naively implemented string functions (like strlen) from being "optimized" into a call to themselves.
-    set_source_files_properties(MiniStdLib.cpp
+    set_source_files_properties(Library/MiniStdLib.cpp
         PROPERTIES COMPILE_FLAGS "-fno-tree-loop-distribution -fno-tree-loop-distribute-patterns")
 
     add_link_options(LINKER:-z,pack-relative-relocs)

Kernel/CommandLine.cpp

@@ -6,9 +6,9 @@
 
 #include <AK/StringBuilder.h>
 #include <Kernel/CommandLine.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
+#include <Kernel/Library/StdLib.h>
 #include <Kernel/Sections.h>
-#include <Kernel/StdLib.h>
 
 namespace Kernel {
 

Kernel/CommandLine.h

@@ -9,7 +9,7 @@
 #include <AK/HashMap.h>
 #include <AK/Optional.h>
 #include <AK/Vector.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/Devices/AsyncDeviceRequest.h

@@ -8,11 +8,11 @@
 
 #include <AK/IntrusiveList.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 #include <Kernel/Memory/ScopedAddressSpaceSwitcher.h>
 #include <Kernel/Tasks/Process.h>
 #include <Kernel/Tasks/Thread.h>
 #include <Kernel/Tasks/WaitQueue.h>
-#include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/Devices/Audio/AC97.cpp

@@ -8,7 +8,6 @@
 #include <Kernel/Arch/Delay.h>
 #include <Kernel/Devices/Audio/AC97.h>
 #include <Kernel/Devices/DeviceManagement.h>
-#include <Kernel/IOWindow.h>
 #include <Kernel/InterruptDisabler.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 

Kernel/Devices/Audio/AC97.h

@@ -12,8 +12,8 @@
 #include <Kernel/Bus/PCI/Device.h>
 #include <Kernel/Devices/Audio/Controller.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/IOWindow.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 
 namespace Kernel {

Kernel/Devices/Audio/IntelHDA/Codec.h

@@ -14,7 +14,7 @@
 #include <AK/RefPtr.h>
 #include <AK/Vector.h>
 #include <Kernel/Devices/Audio/IntelHDA/Format.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel::Audio::IntelHDA {
 

Kernel/Devices/Audio/IntelHDA/Controller.h

@@ -16,7 +16,7 @@
 #include <Kernel/Devices/Audio/Controller.h>
 #include <Kernel/Devices/Audio/IntelHDA/OutputPath.h>
 #include <Kernel/Devices/Audio/IntelHDA/RingBuffer.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 
 namespace Kernel::Audio::IntelHDA {
 

Kernel/Devices/Audio/IntelHDA/OutputPath.h

@@ -12,7 +12,7 @@
 #include <AK/Vector.h>
 #include <Kernel/Devices/Audio/Channel.h>
 #include <Kernel/Devices/Audio/IntelHDA/Stream.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel::Audio::IntelHDA {
 

Kernel/Devices/Audio/IntelHDA/RingBuffer.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <Kernel/Devices/Audio/IntelHDA/Timing.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 
 namespace Kernel::Audio::IntelHDA {
 

Kernel/Devices/Audio/IntelHDA/Stream.h

@@ -11,7 +11,7 @@
 #include <AK/OwnPtr.h>
 #include <Kernel/Devices/Audio/IntelHDA/Codec.h>
 #include <Kernel/Devices/Audio/IntelHDA/Format.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 
 namespace Kernel::Audio::IntelHDA {

Kernel/Devices/KCOVDevice.cpp

@@ -12,7 +12,7 @@
 #include <Kernel/Devices/KCOVInstance.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 
 namespace Kernel {
 

Kernel/Devices/PCISerialDevice.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/Bus/PCI/API.h>
 #include <Kernel/Devices/PCISerialDevice.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Devices/SerialDevice.cpp

@@ -7,7 +7,7 @@
 
 #include <Kernel/Devices/DeviceManagement.h>
 #include <Kernel/Devices/SerialDevice.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Sections.h>
 
 namespace Kernel {

Kernel/Devices/SerialDevice.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 
 namespace Kernel {
 

Kernel/Devices/Storage/ATA/GenericIDE/Channel.cpp

@@ -13,7 +13,7 @@
 #include <Kernel/Devices/Storage/ATA/Definitions.h>
 #include <Kernel/Devices/Storage/ATA/GenericIDE/Channel.h>
 #include <Kernel/Devices/Storage/ATA/GenericIDE/Controller.h>
-#include <Kernel/IOWindow.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Sections.h>
 #include <Kernel/Tasks/Process.h>

Kernel/Devices/Storage/ATA/GenericIDE/Channel.h

@@ -22,8 +22,8 @@
 #include <Kernel/Devices/Storage/ATA/ATADevice.h>
 #include <Kernel/Devices/Storage/ATA/ATAPort.h>
 #include <Kernel/Devices/Storage/StorageDevice.h>
-#include <Kernel/IOWindow.h>
 #include <Kernel/Interrupts/IRQHandler.h>
+#include <Kernel/Library/IOWindow.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Locking/Mutex.h>
 #include <Kernel/Memory/PhysicalAddress.h>

Kernel/Devices/Storage/NVMe/NVMeQueue.cpp

@@ -9,7 +9,7 @@
 #include <Kernel/Devices/Storage/NVMe/NVMeInterruptQueue.h>
 #include <Kernel/Devices/Storage/NVMe/NVMePollQueue.h>
 #include <Kernel/Devices/Storage/NVMe/NVMeQueue.h>
-#include <Kernel/StdLib.h>
+#include <Kernel/Library/StdLib.h>
 
 namespace Kernel {
 ErrorOr<NonnullLockRefPtr<NVMeQueue>> NVMeQueue::try_create(NVMeController& device, u16 qid, u8 irq, u32 q_depth, OwnPtr<Memory::Region> cq_dma_region, OwnPtr<Memory::Region> sq_dma_region, Memory::TypedMapping<DoorbellRegister volatile> db_regs, QueueType queue_type)

Kernel/Devices/Storage/SD/SDHostController.cpp

@@ -10,7 +10,6 @@
 #include <Kernel/Devices/Storage/SD/Commands.h>
 #include <Kernel/Devices/Storage/SD/SDHostController.h>
 #include <Kernel/Devices/Storage/StorageManagement.h>
-#include <Kernel/Panic.h>
 #include <Kernel/Time/TimeManagement.h>
 #if ARCH(AARCH64)
 #    include <Kernel/Arch/aarch64/RPi/SDHostController.h>

Kernel/Devices/Storage/StorageManagement.cpp

@@ -30,7 +30,7 @@
 #include <Kernel/Devices/Storage/StorageManagement.h>
 #include <Kernel/FileSystem/Ext2FS/FileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/Panic.h>
+#include <Kernel/Library/Panic.h>
 #include <LibPartition/EBRPartitionTable.h>
 #include <LibPartition/GUIDPartitionTable.h>
 #include <LibPartition/MBRPartitionTable.h>

Kernel/FileSystem/Custody.h

@@ -10,7 +10,7 @@
 #include <AK/IntrusiveList.h>
 #include <AK/RefPtr.h>
 #include <Kernel/Forward.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 #include <Kernel/Library/ListedRefCounted.h>
 #include <Kernel/Locking/SpinlockProtected.h>
 

Kernel/FileSystem/Ext2FS/DirectoryEntry.h

@@ -9,7 +9,7 @@
 #include <AK/OwnPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/Ext2FS/FileSystem.h

@@ -11,7 +11,7 @@
 #include <Kernel/FileSystem/BlockBasedFileSystem.h>
 #include <Kernel/FileSystem/Ext2FS/Definitions.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 #include <Kernel/UnixTypes.h>
 
 namespace Kernel {

Kernel/FileSystem/FATFS/FileSystem.h

@@ -13,7 +13,7 @@
 #include <Kernel/FileSystem/FATFS/Definitions.h>
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/Forward.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/FATFS/Inode.cpp

@@ -7,7 +7,7 @@
 #include <AK/Time.h>
 #include <Kernel/Debug.h>
 #include <Kernel/FileSystem/FATFS/Inode.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/FATFS/Inode.h

@@ -11,8 +11,8 @@
 #include <Kernel/FileSystem/FATFS/Definitions.h>
 #include <Kernel/FileSystem/FATFS/FileSystem.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/KBuffer.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KBuffer.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/FIFO.h

@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Kernel/DoubleBuffer.h>
 #include <Kernel/FileSystem/File.h>
+#include <Kernel/Library/DoubleBuffer.h>
 #include <Kernel/Locking/Mutex.h>
 #include <Kernel/Tasks/WaitQueue.h>
 #include <Kernel/UnixTypes.h>

Kernel/FileSystem/File.h

@@ -13,9 +13,9 @@
 #include <Kernel/Forward.h>
 #include <Kernel/Library/LockWeakable.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 #include <Kernel/Memory/VirtualAddress.h>
 #include <Kernel/UnixTypes.h>
-#include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/FileSystem.h

@@ -12,9 +12,9 @@
 #include <Kernel/FileSystem/InodeIdentifier.h>
 #include <Kernel/Forward.h>
 #include <Kernel/Library/LockRefPtr.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 #include <Kernel/Locking/Mutex.h>
 #include <Kernel/UnixTypes.h>
-#include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/ISO9660FS/DirectoryEntry.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/ISO9660FS/DirectoryIterator.cpp

@@ -7,7 +7,7 @@
 #include <AK/Types.h>
 #include <Kernel/FileSystem/ISO9660FS/Definitions.h>
 #include <Kernel/FileSystem/ISO9660FS/DirectoryIterator.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/ISO9660FS/DirectoryIterator.h

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/ISO9660FS/Definitions.h>
 #include <Kernel/FileSystem/ISO9660FS/DirectoryEntry.h>
 #include <Kernel/FileSystem/ISO9660FS/FileSystem.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/ISO9660FS/FileSystem.h

@@ -16,7 +16,7 @@
 #include <Kernel/FileSystem/ISO9660FS/Definitions.h>
 #include <Kernel/FileSystem/ISO9660FS/DirectoryEntry.h>
 #include <Kernel/FileSystem/Inode.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 #include <Kernel/Library/NonnullLockRefPtr.h>
 
 namespace Kernel {

Kernel/FileSystem/Inode.cpp

@@ -14,7 +14,7 @@
 #include <Kernel/FileSystem/InodeWatcher.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/Memory/SharedInodeVMObject.h>
 #include <Kernel/Net/LocalSocket.h>
 #include <Kernel/Tasks/Process.h>

Kernel/FileSystem/OpenFileDescription.h

@@ -14,7 +14,7 @@
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/InodeMetadata.h>
 #include <Kernel/Forward.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 #include <Kernel/Memory/VirtualAddress.h>
 
 namespace Kernel {

Kernel/FileSystem/Plan9FS/FileSystem.h

@@ -11,7 +11,7 @@
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/Plan9FS/Definitions.h>
 #include <Kernel/FileSystem/Plan9FS/Message.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/Plan9FS/Inode.h

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/Inode.h>
 #include <Kernel/FileSystem/Plan9FS/FileSystem.h>
 #include <Kernel/FileSystem/Plan9FS/Message.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/Plan9FS/Message.h

@@ -8,8 +8,8 @@
 
 #include <AK/Types.h>
 #include <Kernel/FileSystem/Plan9FS/Definitions.h>
-#include <Kernel/KBuffer.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/ProcFS/Inode.h

@@ -11,7 +11,7 @@
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/ProcFS/Definitions.h>
 #include <Kernel/FileSystem/ProcFS/FileSystem.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/UnixTypes.h>
 
 namespace Kernel {

Kernel/FileSystem/ProcFS/ProcessExposed.cpp

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/Custody.h>
 #include <Kernel/FileSystem/ProcFS/Inode.h>
 #include <Kernel/InterruptDisabler.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/Memory/AnonymousVMObject.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/TTY/TTY.h>

Kernel/FileSystem/SysFS/Component.cpp

@@ -9,7 +9,7 @@
 #include <Kernel/FileSystem/SysFS/Inode.h>
 #include <Kernel/FileSystem/SysFS/LinkInode.h>
 #include <Kernel/FileSystem/SysFS/Registry.h>
-#include <Kernel/KLexicalPath.h>
+#include <Kernel/Library/KLexicalPath.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Bus/PCI/DeviceDirectory.h

@@ -9,7 +9,7 @@
 #include <AK/NonnullRefPtr.h>
 #include <Kernel/Bus/PCI/Definitions.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Bus/USB/BusDirectory.cpp

@@ -6,7 +6,7 @@
 
 #include <Kernel/FileSystem/SysFS/Registry.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Bus/USB/BusDirectory.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Bus/USB/DeviceInformation.h

@@ -8,8 +8,8 @@
 
 #include <Kernel/Bus/USB/USBDevice.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/KString.h>
 #include <Kernel/Locking/Mutex.h>
 
 namespace Kernel {

Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/DeviceComponent.h

@@ -8,7 +8,7 @@
 
 #include <AK/IntrusiveList.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/SymbolicLinkDeviceComponent.h

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/BlockDevicesDirectory.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/DeviceIdentifiers/CharacterDevicesDirectory.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceAttribute.h

@@ -9,7 +9,7 @@
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h>
 #include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Devices/Graphics/DisplayConnector/DeviceDirectory.h

@@ -8,7 +8,7 @@
 
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/Graphics/DisplayConnector.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceAttribute.h

@@ -8,7 +8,7 @@
 
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Devices/Storage/DeviceDirectory.h

@@ -8,7 +8,7 @@
 
 #include <Kernel/Devices/Storage/StorageDevice.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/KString.h>
+#include <Kernel/Library/KString.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.cpp

@@ -8,7 +8,7 @@
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h>
 #include <Kernel/Firmware/BIOS.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>

Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h

@@ -10,7 +10,7 @@
 #include <AK/Types.h>
 #include <AK/Vector.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
-#include <Kernel/KBuffer.h>
+#include <Kernel/Library/KBuffer.h>
 #include <Kernel/Library/LockRefPtr.h>
 #include <Kernel/Memory/PhysicalAddress.h>
 

Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Definitions.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h>
 #include <Kernel/Firmware/BIOS.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 #include <Kernel/Memory/MemoryManager.h>
 #include <Kernel/Memory/TypedMapping.h>
 #include <Kernel/Sections.h>

Kernel/FileSystem/SysFS/Subsystems/Kernel/CPUInfo.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/ConstantInformation.h

@@ -10,7 +10,7 @@
 #include <AK/Error.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.cpp

@@ -10,7 +10,7 @@
 #include <Kernel/FileSystem/SysFS/Component.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/ConstantInformation.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/Constants/Directory.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/DiskUsage.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h

@@ -13,9 +13,9 @@
 #include <Kernel/FileSystem/FileSystem.h>
 #include <Kernel/FileSystem/OpenFileDescription.h>
 #include <Kernel/FileSystem/SysFS/Component.h>
-#include <Kernel/KBufferBuilder.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 #include <Kernel/Locking/Mutex.h>
-#include <Kernel/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Interrupts.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Jails.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Keymap.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Log.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/MemoryStatus.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {
 

Kernel/FileSystem/SysFS/Subsystems/Kernel/Network/ARP.h

@@ -9,8 +9,8 @@
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/FileSystem/SysFS/Subsystems/Kernel/GlobalInformation.h>
-#include <Kernel/KBufferBuilder.h>
-#include <Kernel/UserOrKernelBuffer.h>
+#include <Kernel/Library/KBufferBuilder.h>
+#include <Kernel/Library/UserOrKernelBuffer.h>
 
 namespace Kernel {