diff --git a/AK/BufferStream.h b/AK/BufferStream.h
index a1809f6d03..8c703927c0 100644
--- a/AK/BufferStream.h
+++ b/AK/BufferStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ByteBuffer.h>
 
 namespace AK {
diff --git a/AK/ELF/ELFImage.h b/AK/ELF/ELFImage.h
index c6050bf6a8..84380f3d8d 100644
--- a/AK/ELF/ELFImage.h
+++ b/AK/ELF/ELFImage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ELF/exec_elf.h>
 #include <AK/HashMap.h>
 #include <AK/OwnPtr.h>
diff --git a/AK/FileSystemPath.h b/AK/FileSystemPath.h
index e93622aa43..3b03b64eaf 100644
--- a/AK/FileSystemPath.h
+++ b/AK/FileSystemPath.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "AKString.h"
+#include <AK/String.h>
 
 namespace AK {
 
@@ -35,5 +35,5 @@ String canonicalized_path(const StringView&);
 
 };
 
-using AK::FileSystemPath;
 using AK::canonicalized_path;
+using AK::FileSystemPath;
diff --git a/AK/IPv4Address.h b/AK/IPv4Address.h
index f8a5fb4089..eb5747bdf5 100644
--- a/AK/IPv4Address.h
+++ b/AK/IPv4Address.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 #include <AK/NetworkOrdered.h>
 #include <AK/Optional.h>
diff --git a/AK/JsonObject.h b/AK/JsonObject.h
index 57c612c64b..be80f8df61 100644
--- a/AK/JsonObject.h
+++ b/AK/JsonObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObjectSerializer.h>
diff --git a/AK/JsonValue.h b/AK/JsonValue.h
index 59415fdac8..0ca665f6c5 100644
--- a/AK/JsonValue.h
+++ b/AK/JsonValue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/IPv4Address.h>
 #include <AK/Optional.h>
 #include <AK/StringBuilder.h>
diff --git a/AK/LogStream.cpp b/AK/LogStream.cpp
index d0d29de11e..0d92bea067 100644
--- a/AK/LogStream.cpp
+++ b/AK/LogStream.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 #include <AK/StringView.h>
 
diff --git a/AK/MappedFile.cpp b/AK/MappedFile.cpp
index 73265c5a7f..19801a9ad1 100644
--- a/AK/MappedFile.cpp
+++ b/AK/MappedFile.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/MappedFile.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/AK/String.cpp b/AK/String.cpp
index 40513aa6db..63cef36cdb 100644
--- a/AK/String.cpp
+++ b/AK/String.cpp
@@ -1,6 +1,6 @@
-#include "AKString.h"
-#include "StdLibExtras.h"
-#include "StringBuilder.h"
+#include <AK/StdLibExtras.h>
+#include <AK/String.h>
+#include <AK/StringBuilder.h>
 #include <stdarg.h>
 
 namespace AK {
diff --git a/AK/AKString.h b/AK/String.h
similarity index 100%
rename from AK/AKString.h
rename to AK/String.h
diff --git a/AK/StringBuilder.h b/AK/StringBuilder.h
index 30b123ea0b..9da31a7e86 100644
--- a/AK/StringBuilder.h
+++ b/AK/StringBuilder.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "AKString.h"
-#include "Vector.h"
+#include <AK/String.h>
+#include <AK/Vector.h>
 #include <stdarg.h>
 
 namespace AK {
diff --git a/AK/StringView.cpp b/AK/StringView.cpp
index 95786eaf7c..ae4d857c12 100644
--- a/AK/StringView.cpp
+++ b/AK/StringView.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/StringView.h>
 
 namespace AK {
diff --git a/AK/TestSuite.h b/AK/TestSuite.h
index 47b9ef58ae..478b18b652 100644
--- a/AK/TestSuite.h
+++ b/AK/TestSuite.h
@@ -12,9 +12,9 @@
 #define ASSERT_NOT_REACHED() fprintf(stderr, "\033[31;1mASSERT_NOT_REACHED\033[0m\n");
 #define RELEASE_ASSERT ASSERT
 
-#include "AKString.h"
-#include "Function.h"
-#include "NonnullRefPtrVector.h"
+#include <AK/Function.h>
+#include <AK/NonnullRefPtrVector.h>
+#include <AK/String.h>
 #include <chrono>
 
 namespace AK {
diff --git a/AK/Tests/TestFileSystemPath.cpp b/AK/Tests/TestFileSystemPath.cpp
index e019f53b16..3280cddb50 100644
--- a/AK/Tests/TestFileSystemPath.cpp
+++ b/AK/Tests/TestFileSystemPath.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/FileSystemPath.h>
 
 TEST_CASE(construct)
diff --git a/AK/Tests/TestFixedArray.cpp b/AK/Tests/TestFixedArray.cpp
index 92fe01b24c..db6ec3b68e 100644
--- a/AK/Tests/TestFixedArray.cpp
+++ b/AK/Tests/TestFixedArray.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/FixedArray.h>
 
 TEST_CASE(construct)
diff --git a/AK/Tests/TestHashMap.cpp b/AK/Tests/TestHashMap.cpp
index 774e8e5a31..2b480e6d2b 100644
--- a/AK/Tests/TestHashMap.cpp
+++ b/AK/Tests/TestHashMap.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 
 TEST_CASE(construct)
diff --git a/AK/Tests/TestJSON.cpp b/AK/Tests/TestJSON.cpp
index 3f4279ca30..30cef3fd3e 100644
--- a/AK/Tests/TestJSON.cpp
+++ b/AK/Tests/TestJSON.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
diff --git a/AK/Tests/TestNonnullRefPtr.cpp b/AK/Tests/TestNonnullRefPtr.cpp
index 9012206586..a42e5cdcdd 100644
--- a/AK/Tests/TestNonnullRefPtr.cpp
+++ b/AK/Tests/TestNonnullRefPtr.cpp
@@ -1,7 +1,7 @@
 #include <AK/TestSuite.h>
 
 #include <AK/NonnullRefPtr.h>
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 struct Object : public RefCounted<Object> {
     int x;
diff --git a/AK/Tests/TestOptional.cpp b/AK/Tests/TestOptional.cpp
index 5ca2fe4dfc..1807f96256 100644
--- a/AK/Tests/TestOptional.cpp
+++ b/AK/Tests/TestOptional.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Optional.h>
 
 TEST_CASE(basic_optional)
diff --git a/AK/Tests/TestQueue.cpp b/AK/Tests/TestQueue.cpp
index 620f7f9634..066a29bf10 100644
--- a/AK/Tests/TestQueue.cpp
+++ b/AK/Tests/TestQueue.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Queue.h>
 
 TEST_CASE(construct)
diff --git a/AK/Tests/TestRefPtr.cpp b/AK/Tests/TestRefPtr.cpp
index b01df43c19..5283e8d8fe 100644
--- a/AK/Tests/TestRefPtr.cpp
+++ b/AK/Tests/TestRefPtr.cpp
@@ -1,7 +1,7 @@
 #include <AK/TestSuite.h>
 
 #include <AK/NonnullRefPtr.h>
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 struct Object : public RefCounted<Object> {
     int x;
diff --git a/AK/Tests/TestString.cpp b/AK/Tests/TestString.cpp
index db0d1d947a..9a427d302e 100644
--- a/AK/Tests/TestString.cpp
+++ b/AK/Tests/TestString.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 TEST_CASE(construct_empty)
 {
diff --git a/AK/Tests/TestStringView.cpp b/AK/Tests/TestStringView.cpp
index 06c2c56589..87d35263a3 100644
--- a/AK/Tests/TestStringView.cpp
+++ b/AK/Tests/TestStringView.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 TEST_CASE(construct_empty)
 {
diff --git a/AK/Tests/TestVector.cpp b/AK/Tests/TestVector.cpp
index 1ad7aa7c26..4d753dc011 100644
--- a/AK/Tests/TestVector.cpp
+++ b/AK/Tests/TestVector.cpp
@@ -1,6 +1,6 @@
 #include <AK/TestSuite.h>
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
 #include <AK/Vector.h>
diff --git a/AK/Tests/TestWeakPtr.cpp b/AK/Tests/TestWeakPtr.cpp
index 2a59e88fff..1fb1691054 100644
--- a/AK/Tests/TestWeakPtr.cpp
+++ b/AK/Tests/TestWeakPtr.cpp
@@ -1,5 +1,5 @@
 #include <AK/TestSuite.h>
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Weakable.h>
 #include <AK/WeakPtr.h>
 
diff --git a/AK/URL.h b/AK/URL.h
index 2c17a53190..8a37f9af32 100644
--- a/AK/URL.h
+++ b/AK/URL.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/StringView.h>
 
 namespace AK {
diff --git a/Applications/Calculator/Keypad.h b/Applications/Calculator/Keypad.h
index 23ec014a4c..a3cf21aad6 100644
--- a/Applications/Calculator/Keypad.h
+++ b/Applications/Calculator/Keypad.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 // This type implements number typing and
 // displaying mechanics. It does not perform
diff --git a/Applications/IRCClient/IRCChannel.h b/Applications/IRCClient/IRCChannel.h
index d87d3f0613..404322441e 100644
--- a/Applications/IRCClient/IRCChannel.h
+++ b/Applications/IRCClient/IRCChannel.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "IRCLogBuffer.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/CircularQueue.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Applications/IRCClient/IRCClient.h b/Applications/IRCClient/IRCClient.h
index 3c464485d7..64765be375 100644
--- a/Applications/IRCClient/IRCClient.h
+++ b/Applications/IRCClient/IRCClient.h
@@ -2,7 +2,7 @@
 
 #include "IRCLogBuffer.h"
 #include "IRCWindow.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/CircularQueue.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>
diff --git a/Applications/IRCClient/IRCLogBuffer.h b/Applications/IRCClient/IRCLogBuffer.h
index fef853d6b7..6cf7469698 100644
--- a/Applications/IRCClient/IRCLogBuffer.h
+++ b/Applications/IRCClient/IRCLogBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/CircularQueue.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Applications/IRCClient/IRCQuery.h b/Applications/IRCClient/IRCQuery.h
index 22a9931661..5e0896b250 100644
--- a/Applications/IRCClient/IRCQuery.h
+++ b/Applications/IRCClient/IRCQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "IRCLogBuffer.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/CircularQueue.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Applications/SystemMonitor/DevicesModel.h b/Applications/SystemMonitor/DevicesModel.h
index ab1b36729b..0e4e29dac6 100644
--- a/Applications/SystemMonitor/DevicesModel.h
+++ b/Applications/SystemMonitor/DevicesModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibGUI/GModel.h>
 
diff --git a/Applications/SystemMonitor/ProcessModel.h b/Applications/SystemMonitor/ProcessModel.h
index 883da5d5cb..364a722bb8 100644
--- a/Applications/SystemMonitor/ProcessModel.h
+++ b/Applications/SystemMonitor/ProcessModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/Vector.h>
 #include <LibGUI/GModel.h>
diff --git a/Applications/Taskbar/WindowList.h b/Applications/Taskbar/WindowList.h
index 8de6bc9664..a82461f180 100644
--- a/Applications/Taskbar/WindowList.h
+++ b/Applications/Taskbar/WindowList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "WindowIdentifier.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <LibGUI/GButton.h>
 #include <LibDraw/Rect.h>
diff --git a/Applications/Terminal/TerminalWidget.cpp b/Applications/Terminal/TerminalWidget.cpp
index 5d4338fca9..d4a1badcd2 100644
--- a/Applications/Terminal/TerminalWidget.cpp
+++ b/Applications/Terminal/TerminalWidget.cpp
@@ -1,6 +1,6 @@
 #include "TerminalWidget.h"
 #include "XtermColors.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/StdLibExtras.h>
 #include <AK/StringBuilder.h>
 #include <Kernel/KeyCode.h>
diff --git a/Applications/Terminal/TerminalWidget.h b/Applications/Terminal/TerminalWidget.h
index 4307c45d29..f9bb0cd421 100644
--- a/Applications/Terminal/TerminalWidget.h
+++ b/Applications/Terminal/TerminalWidget.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibCore/CConfigFile.h>
 #include <LibCore/CNotifier.h>
 #include <LibCore/CTimer.h>
diff --git a/DevTools/Inspector/RemoteObject.h b/DevTools/Inspector/RemoteObject.h
index 1718683276..50cfd03640 100644
--- a/DevTools/Inspector/RemoteObject.h
+++ b/DevTools/Inspector/RemoteObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/JsonObject.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/Vector.h>
diff --git a/DevTools/VisualBuilder/VBProperty.h b/DevTools/VisualBuilder/VBProperty.h
index 57a8bab87a..4c5605575e 100644
--- a/DevTools/VisualBuilder/VBProperty.h
+++ b/DevTools/VisualBuilder/VBProperty.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <LibGUI/GVariant.h>
 
diff --git a/DevTools/VisualBuilder/VBWidgetRegistry.h b/DevTools/VisualBuilder/VBWidgetRegistry.h
index 6aa7fd26e2..2d30ed7831 100644
--- a/DevTools/VisualBuilder/VBWidgetRegistry.h
+++ b/DevTools/VisualBuilder/VBWidgetRegistry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "VBWidgetType.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/OwnPtr.h>
diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h
index 30a5c7a03c..908bfd3bdb 100644
--- a/Kernel/Devices/BXVGADevice.h
+++ b/Kernel/Devices/BXVGADevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/VM/PhysicalAddress.h>
diff --git a/Kernel/Devices/FileBackedDiskDevice.h b/Kernel/Devices/FileBackedDiskDevice.h
index c0ebf12e0c..e08513fd3e 100644
--- a/Kernel/Devices/FileBackedDiskDevice.h
+++ b/Kernel/Devices/FileBackedDiskDevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/RefPtr.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/DiskDevice.h>
diff --git a/Kernel/Devices/MBVGADevice.h b/Kernel/Devices/MBVGADevice.h
index b465d3ecce..2c46b8296f 100644
--- a/Kernel/Devices/MBVGADevice.h
+++ b/Kernel/Devices/MBVGADevice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/BlockDevice.h>
 #include <Kernel/VM/PhysicalAddress.h>
diff --git a/Kernel/FileSystem/Custody.h b/Kernel/FileSystem/Custody.h
index 23b8667219..8df1c746a7 100644
--- a/Kernel/FileSystem/Custody.h
+++ b/Kernel/FileSystem/Custody.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/RefCounted.h>
diff --git a/Kernel/FileSystem/File.h b/Kernel/FileSystem/File.h
index 57df94cf23..4f838f9335 100644
--- a/Kernel/FileSystem/File.h
+++ b/Kernel/FileSystem/File.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/RefCounted.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Types.h>
diff --git a/Kernel/FileSystem/FileSystem.h b/Kernel/FileSystem/FileSystem.h
index 270cc23152..31f7f51a73 100644
--- a/Kernel/FileSystem/FileSystem.h
+++ b/Kernel/FileSystem/FileSystem.h
@@ -3,7 +3,7 @@
 #include "InodeIdentifier.h"
 #include "InodeMetadata.h"
 #include "UnixTypes.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ByteBuffer.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>
diff --git a/Kernel/FileSystem/Inode.h b/Kernel/FileSystem/Inode.h
index ff61f91f8c..131d83cbd8 100644
--- a/Kernel/FileSystem/Inode.h
+++ b/Kernel/FileSystem/Inode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/RefCounted.h>
diff --git a/Kernel/FileSystem/InodeIdentifier.h b/Kernel/FileSystem/InodeIdentifier.h
index bf95dd7d96..ccfe8d175c 100644
--- a/Kernel/FileSystem/InodeIdentifier.h
+++ b/Kernel/FileSystem/InodeIdentifier.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ByteBuffer.h>
 #include <AK/Types.h>
 
diff --git a/Kernel/FileSystem/SharedMemory.h b/Kernel/FileSystem/SharedMemory.h
index e778d97d7b..d7848b9798 100644
--- a/Kernel/FileSystem/SharedMemory.h
+++ b/Kernel/FileSystem/SharedMemory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
 #include <Kernel/FileSystem/File.h>
diff --git a/Kernel/FileSystem/VirtualFileSystem.h b/Kernel/FileSystem/VirtualFileSystem.h
index f439d675c1..588e1d85f5 100644
--- a/Kernel/FileSystem/VirtualFileSystem.h
+++ b/Kernel/FileSystem/VirtualFileSystem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>
diff --git a/Kernel/KBufferBuilder.h b/Kernel/KBufferBuilder.h
index 88d6affb71..a16c449a86 100644
--- a/Kernel/KBufferBuilder.h
+++ b/Kernel/KBufferBuilder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <Kernel/KBuffer.h>
 #include <stdarg.h>
 
diff --git a/Kernel/KParams.h b/Kernel/KParams.h
index 603aedb5d6..d3fb1cd38f 100644
--- a/Kernel/KParams.h
+++ b/Kernel/KParams.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 
 class KParams {
diff --git a/Kernel/KSyms.h b/Kernel/KSyms.h
index dbbec19708..a1a7fcf645 100644
--- a/Kernel/KSyms.h
+++ b/Kernel/KSyms.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 
 struct KSym {
diff --git a/Kernel/Net/IPv4.h b/Kernel/Net/IPv4.h
index 827435e470..93d844125b 100644
--- a/Kernel/Net/IPv4.h
+++ b/Kernel/Net/IPv4.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Assertions.h>
 #include <AK/IPv4Address.h>
 #include <AK/NetworkOrdered.h>
diff --git a/Kernel/Net/MACAddress.h b/Kernel/Net/MACAddress.h
index c9c68ba728..699de4b534 100644
--- a/Kernel/Net/MACAddress.h
+++ b/Kernel/Net/MACAddress.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Assertions.h>
 #include <AK/Types.h>
 #include <Kernel/StdLib.h>
diff --git a/Kernel/Process.h b/Kernel/Process.h
index e19a0d36fb..e3beb925ab 100644
--- a/Kernel/Process.h
+++ b/Kernel/Process.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/InlineLinkedList.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/Types.h>
diff --git a/Kernel/TTY/VirtualConsole.cpp b/Kernel/TTY/VirtualConsole.cpp
index 9955762fff..f3cd15221c 100644
--- a/Kernel/TTY/VirtualConsole.cpp
+++ b/Kernel/TTY/VirtualConsole.cpp
@@ -2,7 +2,7 @@
 #include "IO.h"
 #include "StdLib.h"
 #include "kmalloc.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Devices/KeyboardDevice.h>
 
diff --git a/Kernel/Thread.h b/Kernel/Thread.h
index 42357e4b53..e367b9f28d 100644
--- a/Kernel/Thread.h
+++ b/Kernel/Thread.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <AK/IntrusiveList.h>
 #include <AK/OwnPtr.h>
diff --git a/Kernel/VM/MemoryManager.h b/Kernel/VM/MemoryManager.h
index 87a9af2e83..04d80c0bbd 100644
--- a/Kernel/VM/MemoryManager.h
+++ b/Kernel/VM/MemoryManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/Bitmap.h>
 #include <AK/ByteBuffer.h>
diff --git a/Kernel/VM/RangeAllocator.h b/Kernel/VM/RangeAllocator.h
index b9e9b22eea..90f043bba9 100644
--- a/Kernel/VM/RangeAllocator.h
+++ b/Kernel/VM/RangeAllocator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <Kernel/VM/VirtualAddress.h>
 
diff --git a/Kernel/VM/Region.h b/Kernel/VM/Region.h
index 308166b892..7d1e02e6b7 100644
--- a/Kernel/VM/Region.h
+++ b/Kernel/VM/Region.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Bitmap.h>
 #include <AK/InlineLinkedList.h>
 #include <Kernel/VM/PageDirectory.h>
diff --git a/Libraries/LibAudio/AWavLoader.h b/Libraries/LibAudio/AWavLoader.h
index 0734774e73..45c13a4573 100644
--- a/Libraries/LibAudio/AWavLoader.h
+++ b/Libraries/LibAudio/AWavLoader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/RefPtr.h>
 #include <AK/StringView.h>
 #include <LibCore/CFile.h>
diff --git a/Libraries/LibC/grp.cpp b/Libraries/LibC/grp.cpp
index 2379d98e35..4de2e9af7a 100644
--- a/Libraries/LibC/grp.cpp
+++ b/Libraries/LibC/grp.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Libraries/LibC/netdb.cpp b/Libraries/LibC/netdb.cpp
index 7843fec4d7..48aea58ff6 100644
--- a/Libraries/LibC/netdb.cpp
+++ b/Libraries/LibC/netdb.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Assertions.h>
 #include <AK/ScopeGuard.h>
 #include <Kernel/Net/IPv4.h>
diff --git a/Libraries/LibC/pwd.cpp b/Libraries/LibC/pwd.cpp
index 3303cf3d91..40d8f3c5a4 100644
--- a/Libraries/LibC/pwd.cpp
+++ b/Libraries/LibC/pwd.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Libraries/LibC/stdlib.cpp b/Libraries/LibC/stdlib.cpp
index 1c99e8e406..56ec4e91a5 100644
--- a/Libraries/LibC/stdlib.cpp
+++ b/Libraries/LibC/stdlib.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Assertions.h>
 #include <AK/HashMap.h>
 #include <AK/StdLibExtras.h>
diff --git a/Libraries/LibC/termcap.cpp b/Libraries/LibC/termcap.cpp
index 98b55a2e54..e03f42c0b7 100644
--- a/Libraries/LibC/termcap.cpp
+++ b/Libraries/LibC/termcap.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <assert.h>
 #include <stdio.h>
diff --git a/Libraries/LibC/unistd.cpp b/Libraries/LibC/unistd.cpp
index f87d52e672..ff48992459 100644
--- a/Libraries/LibC/unistd.cpp
+++ b/Libraries/LibC/unistd.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ScopedValueRollback.h>
 #include <AK/Vector.h>
 #include <Kernel/Syscall.h>
diff --git a/Libraries/LibCore/CArgsParser.h b/Libraries/LibCore/CArgsParser.h
index 6a696054e2..cecfb49b6a 100644
--- a/Libraries/LibCore/CArgsParser.h
+++ b/Libraries/LibCore/CArgsParser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/Vector.h>
 
diff --git a/Libraries/LibCore/CConfigFile.h b/Libraries/LibCore/CConfigFile.h
index 7452d3d1d9..683b3a4718 100644
--- a/Libraries/LibCore/CConfigFile.h
+++ b/Libraries/LibCore/CConfigFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Libraries/LibCore/CDirIterator.h b/Libraries/LibCore/CDirIterator.h
index 08c9040b48..8ae0e0da6a 100644
--- a/Libraries/LibCore/CDirIterator.h
+++ b/Libraries/LibCore/CDirIterator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <dirent.h>
 
 class CDirIterator {
diff --git a/Libraries/LibCore/CEvent.h b/Libraries/LibCore/CEvent.h
index cd5342eb55..18470e841f 100644
--- a/Libraries/LibCore/CEvent.h
+++ b/Libraries/LibCore/CEvent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <AK/Types.h>
 #include <AK/WeakPtr.h>
diff --git a/Libraries/LibCore/CFile.h b/Libraries/LibCore/CFile.h
index 491aa16c94..d83d20ef9d 100644
--- a/Libraries/LibCore/CFile.h
+++ b/Libraries/LibCore/CFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibCore/CIODevice.h>
 
 class CFile final : public CIODevice {
diff --git a/Libraries/LibCore/CHttpRequest.h b/Libraries/LibCore/CHttpRequest.h
index b442093c19..0f9d35f96b 100644
--- a/Libraries/LibCore/CHttpRequest.h
+++ b/Libraries/LibCore/CHttpRequest.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/URL.h>
 
 class CNetworkJob;
diff --git a/Libraries/LibCore/CHttpResponse.h b/Libraries/LibCore/CHttpResponse.h
index 3feaa6bfd2..e5f57c5643 100644
--- a/Libraries/LibCore/CHttpResponse.h
+++ b/Libraries/LibCore/CHttpResponse.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <LibCore/CNetworkResponse.h>
 
diff --git a/Libraries/LibCore/CObject.h b/Libraries/LibCore/CObject.h
index f35403d1ef..4327085d93 100644
--- a/Libraries/LibCore/CObject.h
+++ b/Libraries/LibCore/CObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <AK/IntrusiveList.h>
 #include <AK/StdLibExtras.h>
diff --git a/Libraries/LibCore/CProcessStatisticsReader.h b/Libraries/LibCore/CProcessStatisticsReader.h
index 343ad0ac39..55c513b779 100644
--- a/Libraries/LibCore/CProcessStatisticsReader.h
+++ b/Libraries/LibCore/CProcessStatisticsReader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 
 struct CProcessStatistics {
diff --git a/Libraries/LibCore/CUserInfo.h b/Libraries/LibCore/CUserInfo.h
index 2c172098e6..980670b31f 100644
--- a/Libraries/LibCore/CUserInfo.h
+++ b/Libraries/LibCore/CUserInfo.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 String get_current_user_home_path();
diff --git a/Libraries/LibDraw/Color.h b/Libraries/LibDraw/Color.h
index 710b28dca8..2d46dd20b8 100644
--- a/Libraries/LibDraw/Color.h
+++ b/Libraries/LibDraw/Color.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Optional.h>
 #include <AK/Types.h>
 
diff --git a/Libraries/LibDraw/Emoji.cpp b/Libraries/LibDraw/Emoji.cpp
index 650c688ece..a4f9bf6bb8 100644
--- a/Libraries/LibDraw/Emoji.cpp
+++ b/Libraries/LibDraw/Emoji.cpp
@@ -1,7 +1,7 @@
-#include "Emoji.h"
-#include "GraphicsBitmap.h"
-#include <AK/AKString.h>
 #include <AK/HashMap.h>
+#include <AK/String.h>
+#include <LibDraw/Emoji.h>
+#include <LibDraw/GraphicsBitmap.h>
 
 static HashMap<u32, Emoji> s_emojis;
 
diff --git a/Libraries/LibDraw/Font.h b/Libraries/LibDraw/Font.h
index c22b17c55f..3e3a754e0e 100644
--- a/Libraries/LibDraw/Font.h
+++ b/Libraries/LibDraw/Font.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/MappedFile.h>
 #include <AK/RefPtr.h>
 #include <AK/RefCounted.h>
diff --git a/Libraries/LibDraw/GraphicsBitmap.h b/Libraries/LibDraw/GraphicsBitmap.h
index b126597871..8fd4cf00b3 100644
--- a/Libraries/LibDraw/GraphicsBitmap.h
+++ b/Libraries/LibDraw/GraphicsBitmap.h
@@ -3,7 +3,7 @@
 #include "Color.h"
 #include "Rect.h"
 #include "Size.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/MappedFile.h>
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
diff --git a/Libraries/LibDraw/Painter.h b/Libraries/LibDraw/Painter.h
index 0366b1ca5c..e6eb8a83ed 100644
--- a/Libraries/LibDraw/Painter.h
+++ b/Libraries/LibDraw/Painter.h
@@ -4,7 +4,7 @@
 #include "Point.h"
 #include "Rect.h"
 #include "Size.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibDraw/TextAlignment.h>
 #include <LibDraw/TextElision.h>
 #include <AK/Utf8View.h>
diff --git a/Libraries/LibDraw/Point.h b/Libraries/LibDraw/Point.h
index 19936d2bc6..7da91eddc2 100644
--- a/Libraries/LibDraw/Point.h
+++ b/Libraries/LibDraw/Point.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 #include <LibDraw/Orientation.h>
 
diff --git a/Libraries/LibDraw/Rect.h b/Libraries/LibDraw/Rect.h
index 0b309ea85e..a756bd8e55 100644
--- a/Libraries/LibDraw/Rect.h
+++ b/Libraries/LibDraw/Rect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 #include <LibDraw/Orientation.h>
 #include <LibDraw/Point.h>
diff --git a/Libraries/LibDraw/Size.h b/Libraries/LibDraw/Size.h
index a9209ab448..2b7d59c380 100644
--- a/Libraries/LibDraw/Size.h
+++ b/Libraries/LibDraw/Size.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 #include <LibDraw/Orientation.h>
 
diff --git a/Libraries/LibGUI/GAction.h b/Libraries/LibGUI/GAction.h
index 08be487d39..009fa45a96 100644
--- a/Libraries/LibGUI/GAction.h
+++ b/Libraries/LibGUI/GAction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <AK/HashTable.h>
diff --git a/Libraries/LibGUI/GButton.h b/Libraries/LibGUI/GButton.h
index 5eed1b012a..6238834eeb 100644
--- a/Libraries/LibGUI/GButton.h
+++ b/Libraries/LibGUI/GButton.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <LibGUI/GAbstractButton.h>
 #include <LibDraw/GraphicsBitmap.h>
diff --git a/Libraries/LibGUI/GCheckBox.h b/Libraries/LibGUI/GCheckBox.h
index 5d94535a8e..035ea9fe1b 100644
--- a/Libraries/LibGUI/GCheckBox.h
+++ b/Libraries/LibGUI/GCheckBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <LibGUI/GAbstractButton.h>
 
diff --git a/Libraries/LibGUI/GClipboard.h b/Libraries/LibGUI/GClipboard.h
index 5e18c4fea7..dec491b8dd 100644
--- a/Libraries/LibGUI/GClipboard.h
+++ b/Libraries/LibGUI/GClipboard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 class GClipboard {
 public:
diff --git a/Libraries/LibGUI/GDesktop.h b/Libraries/LibGUI/GDesktop.h
index 01b03debac..73bdca506f 100644
--- a/Libraries/LibGUI/GDesktop.h
+++ b/Libraries/LibGUI/GDesktop.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <LibDraw/Rect.h>
diff --git a/Libraries/LibGUI/GFontDatabase.h b/Libraries/LibGUI/GFontDatabase.h
index d949862c82..ca268d1332 100644
--- a/Libraries/LibGUI/GFontDatabase.h
+++ b/Libraries/LibGUI/GFontDatabase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <AK/HashMap.h>
 
diff --git a/Libraries/LibGUI/GMenuItem.h b/Libraries/LibGUI/GMenuItem.h
index 73fa8bcdad..5b17b74c71 100644
--- a/Libraries/LibGUI/GMenuItem.h
+++ b/Libraries/LibGUI/GMenuItem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/NonnullOwnPtr.h>
 #include <AK/OwnPtr.h>
diff --git a/Libraries/LibGUI/GModel.h b/Libraries/LibGUI/GModel.h
index 5d714c85b4..8824f42a0e 100644
--- a/Libraries/LibGUI/GModel.h
+++ b/Libraries/LibGUI/GModel.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/Function.h>
 #include <AK/HashTable.h>
diff --git a/Libraries/LibGUI/GModelIndex.h b/Libraries/LibGUI/GModelIndex.h
index 6d444f0e24..1e4e567c54 100644
--- a/Libraries/LibGUI/GModelIndex.h
+++ b/Libraries/LibGUI/GModelIndex.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/LogStream.h>
 
 class GModel;
diff --git a/Libraries/LibGUI/GShortcut.h b/Libraries/LibGUI/GShortcut.h
index 77bc77102b..579573a22d 100644
--- a/Libraries/LibGUI/GShortcut.h
+++ b/Libraries/LibGUI/GShortcut.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Traits.h>
 #include <Kernel/KeyCode.h>
 
diff --git a/Libraries/LibGUI/GVariant.h b/Libraries/LibGUI/GVariant.h
index e2cbd35e15..168f5c1fca 100644
--- a/Libraries/LibGUI/GVariant.h
+++ b/Libraries/LibGUI/GVariant.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibGUI/GIcon.h>
 #include <LibDraw/GraphicsBitmap.h>
 
diff --git a/Libraries/LibGUI/GWidget.h b/Libraries/LibGUI/GWidget.h
index 902f0c7329..0016990040 100644
--- a/Libraries/LibGUI/GWidget.h
+++ b/Libraries/LibGUI/GWidget.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Badge.h>
 #include <AK/HashMap.h>
 #include <LibCore/CElapsedTimer.h>
diff --git a/Libraries/LibGUI/GWindow.h b/Libraries/LibGUI/GWindow.h
index 3401ba6a63..e563cb1322 100644
--- a/Libraries/LibGUI/GWindow.h
+++ b/Libraries/LibGUI/GWindow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
diff --git a/Libraries/LibHTML/CSS/Length.h b/Libraries/LibHTML/CSS/Length.h
index a353ffee0e..5289d4d718 100644
--- a/Libraries/LibHTML/CSS/Length.h
+++ b/Libraries/LibHTML/CSS/Length.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 class Length {
 public:
diff --git a/Libraries/LibHTML/CSS/Selector.h b/Libraries/LibHTML/CSS/Selector.h
index b1d9a53ff1..9199a3dc00 100644
--- a/Libraries/LibHTML/CSS/Selector.h
+++ b/Libraries/LibHTML/CSS/Selector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibHTML/CSS/Specificity.h>
 
diff --git a/Libraries/LibHTML/CSS/StyleDeclaration.h b/Libraries/LibHTML/CSS/StyleDeclaration.h
index e5ca7a04f8..ce041108bc 100644
--- a/Libraries/LibHTML/CSS/StyleDeclaration.h
+++ b/Libraries/LibHTML/CSS/StyleDeclaration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibHTML/CSS/StyleValue.h>
 
 class StyleDeclaration : public RefCounted<StyleDeclaration> {
diff --git a/Libraries/LibHTML/CSS/StyleValue.h b/Libraries/LibHTML/CSS/StyleValue.h
index 11ff210a6a..516dc71f08 100644
--- a/Libraries/LibHTML/CSS/StyleValue.h
+++ b/Libraries/LibHTML/CSS/StyleValue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/RefCounted.h>
 #include <AK/RefPtr.h>
 #include <AK/StringView.h>
diff --git a/Libraries/LibHTML/CSS/StyledNode.h b/Libraries/LibHTML/CSS/StyledNode.h
index 035cfd5be4..1681b6c9c7 100644
--- a/Libraries/LibHTML/CSS/StyledNode.h
+++ b/Libraries/LibHTML/CSS/StyledNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/NonnullRefPtr.h>
 #include <AK/Optional.h>
diff --git a/Libraries/LibHTML/DOM/Document.h b/Libraries/LibHTML/DOM/Document.h
index 50f245175d..3add23acd3 100644
--- a/Libraries/LibHTML/DOM/Document.h
+++ b/Libraries/LibHTML/DOM/Document.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/NonnullRefPtrVector.h>
 #include <AK/OwnPtr.h>
 #include <LibHTML/CSS/StyleResolver.h>
diff --git a/Libraries/LibHTML/DOM/Element.h b/Libraries/LibHTML/DOM/Element.h
index 2b91860ff7..beb5618bd8 100644
--- a/Libraries/LibHTML/DOM/Element.h
+++ b/Libraries/LibHTML/DOM/Element.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <LibHTML/DOM/ParentNode.h>
-#include <AK/AKString.h>
+#include <AK/String.h>
 
 class Attribute {
 public:
diff --git a/Libraries/LibHTML/DOM/Text.h b/Libraries/LibHTML/DOM/Text.h
index db1c9e4bac..33b689a4b5 100644
--- a/Libraries/LibHTML/DOM/Text.h
+++ b/Libraries/LibHTML/DOM/Text.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibHTML/DOM/Node.h>
 
 class Text final : public Node {
diff --git a/Libraries/LibIPC/IEndpoint.h b/Libraries/LibIPC/IEndpoint.h
index a70e4ad667..e0098f773d 100644
--- a/Libraries/LibIPC/IEndpoint.h
+++ b/Libraries/LibIPC/IEndpoint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/OwnPtr.h>
 
 namespace AK {
diff --git a/Libraries/LibIPC/IMessage.h b/Libraries/LibIPC/IMessage.h
index c3692de573..6a0a81b1e1 100644
--- a/Libraries/LibIPC/IMessage.h
+++ b/Libraries/LibIPC/IMessage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/ByteBuffer.h>
 
 class IMessage {
diff --git a/Libraries/LibVT/Terminal.h b/Libraries/LibVT/Terminal.h
index 3169c92860..f41a32bfbb 100644
--- a/Libraries/LibVT/Terminal.h
+++ b/Libraries/LibVT/Terminal.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/Vector.h>
 #include <LibVT/Position.h>
diff --git a/Servers/LookupServer/main.cpp b/Servers/LookupServer/main.cpp
index ddf058231d..740657d53d 100644
--- a/Servers/LookupServer/main.cpp
+++ b/Servers/LookupServer/main.cpp
@@ -1,6 +1,6 @@
 #include "DNSPacket.h"
 #include "DNSRecord.h"
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/BufferStream.h>
 #include <AK/ByteBuffer.h>
 #include <AK/HashMap.h>
diff --git a/Servers/WindowServer/WSClipboard.h b/Servers/WindowServer/WSClipboard.h
index 7887fbb3c5..276da2ab1d 100644
--- a/Servers/WindowServer/WSClipboard.h
+++ b/Servers/WindowServer/WSClipboard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <SharedBuffer.h>
 
 class WSClipboard {
diff --git a/Servers/WindowServer/WSEvent.h b/Servers/WindowServer/WSEvent.h
index ab1083b5c6..b96c78beaa 100644
--- a/Servers/WindowServer/WSEvent.h
+++ b/Servers/WindowServer/WSEvent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Types.h>
 #include <Kernel/KeyCode.h>
 #include <LibCore/CEvent.h>
diff --git a/Servers/WindowServer/WSMenu.h b/Servers/WindowServer/WSMenu.h
index f57841f446..fd7c7e0a06 100644
--- a/Servers/WindowServer/WSMenu.h
+++ b/Servers/WindowServer/WSMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/NonnullOwnPtrVector.h>
 #include <AK/WeakPtr.h>
 #include <LibCore/CObject.h>
diff --git a/Servers/WindowServer/WSMenuItem.h b/Servers/WindowServer/WSMenuItem.h
index fe334b3c0d..14711e4927 100644
--- a/Servers/WindowServer/WSMenuItem.h
+++ b/Servers/WindowServer/WSMenuItem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Function.h>
 #include <LibDraw/Rect.h>
 
diff --git a/Servers/WindowServer/WSWindow.h b/Servers/WindowServer/WSWindow.h
index f8033d788f..aa01ae7731 100644
--- a/Servers/WindowServer/WSWindow.h
+++ b/Servers/WindowServer/WSWindow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/InlineLinkedList.h>
 #include <LibCore/CObject.h>
 #include <LibDraw/DisjointRectSet.h>
diff --git a/Shell/GlobalState.h b/Shell/GlobalState.h
index b15702fc58..1ca4a981e3 100644
--- a/Shell/GlobalState.h
+++ b/Shell/GlobalState.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <termios.h>
 
 struct GlobalState {
diff --git a/Shell/LineEditor.h b/Shell/LineEditor.h
index 50a696b83c..5f5a4344d7 100644
--- a/Shell/LineEditor.h
+++ b/Shell/LineEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 
 class LineEditor {
diff --git a/Shell/Parser.h b/Shell/Parser.h
index 5008046a00..68687bc6d7 100644
--- a/Shell/Parser.h
+++ b/Shell/Parser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 
 struct Redirection {
diff --git a/Userland/allocate.cpp b/Userland/allocate.cpp
index fe6d19b3e2..c994850b57 100644
--- a/Userland/allocate.cpp
+++ b/Userland/allocate.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibCore/CElapsedTimer.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Userland/chown.cpp b/Userland/chown.cpp
index 256e82e81f..c925cd46cb 100644
--- a/Userland/chown.cpp
+++ b/Userland/chown.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/Userland/cp.cpp b/Userland/cp.cpp
index 03e3e0411c..2cd48d2240 100644
--- a/Userland/cp.cpp
+++ b/Userland/cp.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
 #include <assert.h>
diff --git a/Userland/crash.cpp b/Userland/crash.cpp
index a7f15e9167..7584c8359e 100644
--- a/Userland/crash.cpp
+++ b/Userland/crash.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
diff --git a/Userland/cut.cpp b/Userland/cut.cpp
index 5db15c72d6..0478b830c3 100644
--- a/Userland/cut.cpp
+++ b/Userland/cut.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/QuickSort.h>
 #include <AK/Vector.h>
 #include <stdio.h>
diff --git a/Userland/df.cpp b/Userland/df.cpp
index 19a80b2328..60aef65120 100644
--- a/Userland/df.cpp
+++ b/Userland/df.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
 #include <AK/Vector.h>
diff --git a/Userland/ifconfig.cpp b/Userland/ifconfig.cpp
index f5c9417266..e53b9715ca 100644
--- a/Userland/ifconfig.cpp
+++ b/Userland/ifconfig.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
 #include <AK/Types.h>
diff --git a/Userland/kill.cpp b/Userland/kill.cpp
index 3a01d4f7eb..172019253f 100644
--- a/Userland/kill.cpp
+++ b/Userland/kill.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Userland/killall.cpp b/Userland/killall.cpp
index fcc4b79cb1..d2fc819b6b 100644
--- a/Userland/killall.cpp
+++ b/Userland/killall.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <LibCore/CProcessStatisticsReader.h>
 #include <signal.h>
 #include <stdio.h>
diff --git a/Userland/ls.cpp b/Userland/ls.cpp
index 30837cc146..ea7701712f 100644
--- a/Userland/ls.cpp
+++ b/Userland/ls.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/QuickSort.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
diff --git a/Userland/lspci.cpp b/Userland/lspci.cpp
index 526e0c262a..d40b9de83b 100644
--- a/Userland/lspci.cpp
+++ b/Userland/lspci.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
 #include <LibCore/CFile.h>
diff --git a/Userland/mv.cpp b/Userland/mv.cpp
index 6edf589de3..859b82dc7b 100644
--- a/Userland/mv.cpp
+++ b/Userland/mv.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/FileSystemPath.h>
 #include <stdio.h>
 #include <sys/stat.h>
diff --git a/Userland/pape.cpp b/Userland/pape.cpp
index 817668244c..43908f99e0 100644
--- a/Userland/pape.cpp
+++ b/Userland/pape.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/FileSystemPath.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
diff --git a/Userland/pidof.cpp b/Userland/pidof.cpp
index 05de8f589d..cd3934049e 100644
--- a/Userland/pidof.cpp
+++ b/Userland/pidof.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/Vector.h>
 #include <LibCore/CArgsParser.h>
diff --git a/Userland/rm.cpp b/Userland/rm.cpp
index 0c02aaa925..d8e691aa8b 100644
--- a/Userland/rm.cpp
+++ b/Userland/rm.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
 #include <LibCore/CArgsParser.h>
diff --git a/Userland/sleep.cpp b/Userland/sleep.cpp
index a91001cc40..cd22261365 100644
--- a/Userland/sleep.cpp
+++ b/Userland/sleep.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/Userland/sort.cpp b/Userland/sort.cpp
index e2bc08ad74..442f08e134 100644
--- a/Userland/sort.cpp
+++ b/Userland/sort.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/QuickSort.h>
 #include <AK/Vector.h>
 #include <stdio.h>
diff --git a/Userland/sysctl.cpp b/Userland/sysctl.cpp
index 86f75119ea..96d0f7a790 100644
--- a/Userland/sysctl.cpp
+++ b/Userland/sysctl.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/StringBuilder.h>
 #include <AK/Vector.h>
 #include <LibCore/CArgsParser.h>
diff --git a/Userland/top.cpp b/Userland/top.cpp
index 48370c385e..9654493a2b 100644
--- a/Userland/top.cpp
+++ b/Userland/top.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/HashMap.h>
 #include <AK/JsonArray.h>
 #include <AK/JsonObject.h>
diff --git a/Userland/tr.cpp b/Userland/tr.cpp
index 36b294318f..1186ad33f7 100644
--- a/Userland/tr.cpp
+++ b/Userland/tr.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/QuickSort.h>
 #include <AK/Vector.h>
 #include <stdio.h>
diff --git a/Userland/wc.cpp b/Userland/wc.cpp
index 90ae30a592..0910f32abf 100644
--- a/Userland/wc.cpp
+++ b/Userland/wc.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibCore/CArgsParser.h>
 
diff --git a/Userland/which.cpp b/Userland/which.cpp
index 7d9c50c357..708c14deb5 100644
--- a/Userland/which.cpp
+++ b/Userland/which.cpp
@@ -1,4 +1,4 @@
-#include <AK/AKString.h>
+#include <AK/String.h>
 #include <AK/Vector.h>
 #include <stdio.h>
 #include <unistd.h>