diff --git a/Widgets/Button.h b/Widgets/Button.h
index ed0327196c..033fb86da1 100644
--- a/Widgets/Button.h
+++ b/Widgets/Button.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Widget.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 
 class Button final : public Widget {
 public:
diff --git a/Widgets/CheckBox.h b/Widgets/CheckBox.h
index eb9f1b4750..638b5fb629 100644
--- a/Widgets/CheckBox.h
+++ b/Widgets/CheckBox.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Widget.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 
 class CheckBox final : public Widget {
 public:
diff --git a/Widgets/Event.h b/Widgets/Event.h
index 07d675bab3..90fa683ba0 100644
--- a/Widgets/Event.h
+++ b/Widgets/Event.h
@@ -2,7 +2,7 @@
 
 #include "Point.h"
 #include "Rect.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 #include <AK/Types.h>
 
 static const char* eventNames[] = {
diff --git a/Widgets/Label.h b/Widgets/Label.h
index 636f7a0f1a..062c14a99a 100644
--- a/Widgets/Label.h
+++ b/Widgets/Label.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Widget.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 
 class Label final : public Widget {
 public:
diff --git a/Widgets/MsgBox.h b/Widgets/MsgBox.h
index fa746ac86b..9db0766b41 100644
--- a/Widgets/MsgBox.h
+++ b/Widgets/MsgBox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AK/String.h>
+#include <AK/AKString.h>
 
 class Window;
 
diff --git a/Widgets/Painter.cpp b/Widgets/Painter.cpp
index e505e9d541..1ff7728a40 100644
--- a/Widgets/Painter.cpp
+++ b/Widgets/Painter.cpp
@@ -4,7 +4,7 @@
 #include "Font.h"
 #include "Window.h"
 #include <AK/Assertions.h>
-#include <AK/StdLib.h>
+#include <AK/StdLibExtras.h>
 #include <SDL.h>
 
 Painter::Painter(Widget& widget)
diff --git a/Widgets/Painter.h b/Widgets/Painter.h
index cbaeda2612..2e104aef2d 100644
--- a/Widgets/Painter.h
+++ b/Widgets/Painter.h
@@ -4,7 +4,7 @@
 #include "Point.h"
 #include "Rect.h"
 #include "Size.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 
 class CBitmap;
 class Font;
diff --git a/Widgets/TextBox.cpp b/Widgets/TextBox.cpp
index 075812cb62..264cdb1fc0 100644
--- a/Widgets/TextBox.cpp
+++ b/Widgets/TextBox.cpp
@@ -2,7 +2,7 @@
 #include "Painter.h"
 #include "Font.h"
 #include "CBitmap.h"
-#include <AK/StdLib.h>
+#include <AK/StdLibExtras.h>
 
 TextBox::TextBox(Widget* parent)
     : Widget(parent)
diff --git a/Widgets/Widget.h b/Widgets/Widget.h
index a0aa4da3be..132baa595c 100644
--- a/Widgets/Widget.h
+++ b/Widgets/Widget.h
@@ -5,7 +5,7 @@
 #include "Rect.h"
 #include "Color.h"
 #include "Font.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 #include <functional>
 
 class Window;
diff --git a/Widgets/Window.h b/Widgets/Window.h
index 2717e5a4e1..6ab83ba425 100644
--- a/Widgets/Window.h
+++ b/Widgets/Window.h
@@ -2,7 +2,7 @@
 
 #include "Object.h"
 #include "Rect.h"
-#include <AK/String.h>
+#include <AK/AKString.h>
 #include <AK/WeakPtr.h>
 
 class Widget;