diff --git a/Kernel/Devices/HID/PS2KeyboardDevice.h b/Kernel/Devices/HID/PS2KeyboardDevice.h
index 0fc1c6b440..348fac563a 100644
--- a/Kernel/Devices/HID/PS2KeyboardDevice.h
+++ b/Kernel/Devices/HID/PS2KeyboardDevice.h
@@ -14,7 +14,6 @@
 #include <Kernel/Devices/HID/KeyboardDevice.h>
 #include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Random.h>
-#include <LibKeyboard/CharacterMap.h>
 
 namespace Kernel {
 
diff --git a/Userland/Libraries/LibELF/AuxiliaryVector.h b/Userland/Libraries/LibELF/AuxiliaryVector.h
index 832395855e..4ce365b463 100644
--- a/Userland/Libraries/LibELF/AuxiliaryVector.h
+++ b/Userland/Libraries/LibELF/AuxiliaryVector.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <AK/String.h>
+#include <AK/StringView.h>
 #include <AK/Types.h>
 #include <sys/auxv.h>
 
diff --git a/Userland/Libraries/LibELF/Relocation.h b/Userland/Libraries/LibELF/Relocation.h
index 5a6962ebe5..02bd52b788 100644
--- a/Userland/Libraries/LibELF/Relocation.h
+++ b/Userland/Libraries/LibELF/Relocation.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <AK/Concepts.h>
-#include <AK/String.h>
 #include <Kernel/VirtualAddress.h>
 
 namespace ELF {
diff --git a/Userland/Libraries/LibELF/Validation.cpp b/Userland/Libraries/LibELF/Validation.cpp
index fa7130d6fc..24645f2336 100644
--- a/Userland/Libraries/LibELF/Validation.cpp
+++ b/Userland/Libraries/LibELF/Validation.cpp
@@ -7,7 +7,6 @@
 
 #include <AK/Assertions.h>
 #include <AK/Checked.h>
-#include <AK/String.h>
 #include <LibC/elf.h>
 #include <LibELF/Validation.h>
 #include <limits.h>
diff --git a/Userland/Libraries/LibELF/Validation.h b/Userland/Libraries/LibELF/Validation.h
index 665cf90101..3311f1b29f 100644
--- a/Userland/Libraries/LibELF/Validation.h
+++ b/Userland/Libraries/LibELF/Validation.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <AK/String.h>
+#include <AK/StringBuilder.h>
 #include <LibC/elf.h>
 #include <limits.h>
 
diff --git a/Userland/Libraries/LibVT/Line.h b/Userland/Libraries/LibVT/Line.h
index 5035b7f20f..0768fb6168 100644
--- a/Userland/Libraries/LibVT/Line.h
+++ b/Userland/Libraries/LibVT/Line.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
+#include <AK/AnyOf.h>
 #include <AK/Noncopyable.h>
-#include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibVT/Attribute.h>
 #include <LibVT/Position.h>