diff --git a/src/openrct2-ui/interface/InGameConsole.h b/src/openrct2-ui/interface/InGameConsole.h
index 2078386ff3..237358c97e 100644
--- a/src/openrct2-ui/interface/InGameConsole.h
+++ b/src/openrct2-ui/interface/InGameConsole.h
@@ -10,10 +10,11 @@
 #pragma once
 
 #include <deque>
-#include <openrct2/core/String.hpp>
+#include <openrct2/core/StringTypes.h>
 #include <openrct2/interface/InteractiveConsole.h>
 #include <openrct2/localisation/FormatCodes.h>
 #include <openrct2/world/Location.hpp>
+#include <vector>
 
 namespace OpenRCT2::Ui
 {
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index a9f1c6499c..f3db9950bc 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -14,6 +14,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/Game.h>
 #include <openrct2/GameState.h>
+#include <openrct2/core/String.hpp>
 #include <openrct2/drawing/Drawing.h>
 #include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/entity/Guest.h>
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index 2b60de2192..91b67b5794 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -32,6 +32,7 @@
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Guard.hpp>
+#include <openrct2/core/String.hpp>
 #include <openrct2/localisation/Formatter.h>
 #include <openrct2/management/Research.h>
 #include <openrct2/network/network.h>
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index c294c9ad66..f33e30de8c 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -33,6 +33,7 @@
 #include <openrct2/actions/PauseToggleAction.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/core/String.hpp>
 #include <openrct2/entity/Staff.h>
 #include <openrct2/interface/Chat.h>
 #include <openrct2/interface/InteractiveConsole.h>
diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h
index bf65c6aa00..2087fee0f4 100644
--- a/src/openrct2/Context.h
+++ b/src/openrct2/Context.h
@@ -9,13 +9,12 @@
 
 #pragma once
 
-#include "core/String.hpp"
+#include "core/StringTypes.h"
 #include "interface/WindowClasses.h"
 #include "localisation/StringIdType.h"
 #include "world/Location.hpp"
 
 #include <memory>
-#include <string>
 
 struct IObjectManager;
 struct IObjectRepository;
diff --git a/src/openrct2/FileClassifier.h b/src/openrct2/FileClassifier.h
index f8edde8584..a2c751ac05 100644
--- a/src/openrct2/FileClassifier.h
+++ b/src/openrct2/FileClassifier.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "core/String.hpp"
+#include "core/StringTypes.h"
 
 enum class FileExtension
 {
diff --git a/src/openrct2/Game.h b/src/openrct2/Game.h
index fb6ac71fa0..60f88c6de6 100644
--- a/src/openrct2/Game.h
+++ b/src/openrct2/Game.h
@@ -9,10 +9,9 @@
 
 #pragma once
 
-#include "core/String.hpp"
+#include "core/StringTypes.h"
 
 #include <memory>
-#include <string>
 
 class Intent;
 struct ParkLoadResult;
diff --git a/src/openrct2/OpenRCT2.h b/src/openrct2/OpenRCT2.h
index be3e94aae1..9d72ea7e78 100644
--- a/src/openrct2/OpenRCT2.h
+++ b/src/openrct2/OpenRCT2.h
@@ -9,9 +9,7 @@
 
 #pragma once
 
-#include "core/String.hpp"
-
-#include <string>
+#include "core/StringTypes.h"
 
 enum class PromptMode : uint8_t;
 
diff --git a/src/openrct2/ParkImporter.h b/src/openrct2/ParkImporter.h
index db247ee44c..ca9b00e977 100644
--- a/src/openrct2/ParkImporter.h
+++ b/src/openrct2/ParkImporter.h
@@ -9,12 +9,11 @@
 
 #pragma once
 
-#include "core/String.hpp"
+#include "core/StringTypes.h"
 #include "object/Object.h"
 #include "object/ObjectList.h"
 
 #include <memory>
-#include <string>
 #include <vector>
 
 struct IObjectManager;
diff --git a/src/openrct2/PlatformEnvironment.h b/src/openrct2/PlatformEnvironment.h
index e9f6d5c118..96a84c80b8 100644
--- a/src/openrct2/PlatformEnvironment.h
+++ b/src/openrct2/PlatformEnvironment.h
@@ -10,10 +10,9 @@
 #pragma once
 
 #include "Diagnostic.h"
-#include "core/String.hpp"
+#include "core/StringTypes.h"
 
 #include <memory>
-#include <string>
 
 namespace OpenRCT2
 {
diff --git a/src/openrct2/config/Config.h b/src/openrct2/config/Config.h
index 873422e9bf..5cc3059321 100644
--- a/src/openrct2/config/Config.h
+++ b/src/openrct2/config/Config.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../localisation/CurrencyTypes.h"
 #include "ConfigTypes.h"
 
diff --git a/src/openrct2/config/IniReader.hpp b/src/openrct2/config/IniReader.hpp
index 38e8dccf82..757e5f5c34 100644
--- a/src/openrct2/config/IniReader.hpp
+++ b/src/openrct2/config/IniReader.hpp
@@ -9,8 +9,6 @@
 
 #pragma once
 
-#include "../core/String.hpp"
-
 #include <memory>
 #include <string>
 
diff --git a/src/openrct2/config/IniWriter.hpp b/src/openrct2/config/IniWriter.hpp
index 0de0d8aa0b..321eae8458 100644
--- a/src/openrct2/config/IniWriter.hpp
+++ b/src/openrct2/config/IniWriter.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <memory>
 #include <string>
diff --git a/src/openrct2/core/CodepointView.hpp b/src/openrct2/core/CodepointView.hpp
index dc2ec04d26..ffdf10626b 100644
--- a/src/openrct2/core/CodepointView.hpp
+++ b/src/openrct2/core/CodepointView.hpp
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "String.hpp"
 #include "UTF8.h"
 
 namespace OpenRCT2
diff --git a/src/openrct2/core/Console.hpp b/src/openrct2/core/Console.hpp
index b61264b221..3e2f9e45bb 100644
--- a/src/openrct2/core/Console.hpp
+++ b/src/openrct2/core/Console.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <cstdarg>
 
diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h
index fca34b73a8..5ce8ff20ec 100644
--- a/src/openrct2/core/DataSerialiserTraits.h
+++ b/src/openrct2/core/DataSerialiserTraits.h
@@ -10,8 +10,6 @@
 #pragma once
 
 #include "../Cheats.h"
-#include "../core/MemoryStream.h"
-#include "../core/String.hpp"
 #include "../entity/Guest.h"
 #include "../network/NetworkTypes.h"
 #include "../network/network.h"
@@ -23,6 +21,7 @@
 #include "DataSerialiserTag.h"
 #include "Endianness.h"
 #include "MemoryStream.h"
+#include "StringTypes.h"
 
 #include <cstdio>
 #include <iomanip>
diff --git a/src/openrct2/core/File.h b/src/openrct2/core/File.h
index 62fe4a3d75..673c28499c 100644
--- a/src/openrct2/core/File.h
+++ b/src/openrct2/core/File.h
@@ -9,10 +9,8 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
-#include <string>
-#include <string_view>
 #include <vector>
 
 namespace OpenRCT2::File
diff --git a/src/openrct2/core/FileScanner.h b/src/openrct2/core/FileScanner.h
index 4f51d942a7..4f2432a210 100644
--- a/src/openrct2/core/FileScanner.h
+++ b/src/openrct2/core/FileScanner.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <memory>
 #include <string>
diff --git a/src/openrct2/core/FileWatcher.h b/src/openrct2/core/FileWatcher.h
index d74e0c5ee3..a5539d3fcf 100644
--- a/src/openrct2/core/FileWatcher.h
+++ b/src/openrct2/core/FileWatcher.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "String.hpp"
+#include "StringTypes.h"
 
 #include <functional>
 #include <string>
diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp
index 513ec82f2c..f17037c4e8 100644
--- a/src/openrct2/core/Guard.cpp
+++ b/src/openrct2/core/Guard.cpp
@@ -16,13 +16,13 @@
 #include "Console.hpp"
 #include "Diagnostics.hpp"
 #include "Guard.hpp"
+#include "String.hpp"
 #include "StringBuilder.h"
 
 #include <cassert>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
-#include <string>
 
 namespace OpenRCT2::Guard
 {
diff --git a/src/openrct2/core/Json.hpp b/src/openrct2/core/Json.hpp
index ae53d6cf81..0c05da97f4 100644
--- a/src/openrct2/core/Json.hpp
+++ b/src/openrct2/core/Json.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <nlohmann/json.hpp>
 #include <string>
diff --git a/src/openrct2/core/Path.hpp b/src/openrct2/core/Path.hpp
index 76d0a771cd..942ca6ae47 100644
--- a/src/openrct2/core/Path.hpp
+++ b/src/openrct2/core/Path.hpp
@@ -9,9 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
-
-#include <string>
+#include "../core/StringTypes.h"
 
 namespace OpenRCT2::Path
 {
diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp
index 9bb260121c..7de19f9bb1 100644
--- a/src/openrct2/core/String.hpp
+++ b/src/openrct2/core/String.hpp
@@ -9,35 +9,14 @@
 
 #pragma once
 
+#include "StringTypes.h"
+
 #include <cstdarg>
 #include <cstddef>
-#include <cstdint>
 #include <optional>
-#include <string>
 #include <string_view>
 #include <vector>
 
-using utf8 = char;
-using utf8string = utf8*;
-using const_utf8string = const utf8*;
-using u8string = std::basic_string<utf8>;
-using u8string_view = std::basic_string_view<utf8>;
-
-using codepoint_t = uint32_t;
-
-namespace OpenRCT2
-{
-    enum CodePage : int32_t
-    {
-        CP_932 = 932,   // ANSI/OEM Japanese; Japanese (Shift-JIS)
-        CP_936 = 936,   // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
-        CP_949 = 949,   // ANSI/OEM Korean (Unified Hangul Code)
-        CP_950 = 950,   // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
-        CP_1252 = 1252, // ANSI Latin 1; Western European (Windows)
-        UTF8 = 65001,   // Unicode (UTF-8)
-    };
-}
-
 namespace OpenRCT2::String
 {
     constexpr const utf8* Empty = "";
diff --git a/src/openrct2/core/StringBuilder.h b/src/openrct2/core/StringBuilder.h
index 2df78f2cb7..e30c429d63 100644
--- a/src/openrct2/core/StringBuilder.h
+++ b/src/openrct2/core/StringBuilder.h
@@ -9,9 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
-
-#include <string>
+#include "../core/StringTypes.h"
 
 /**
  * Class for constructing strings efficiently. A buffer is automatically allocated and reallocated when characters or strings
diff --git a/src/openrct2/core/StringReader.h b/src/openrct2/core/StringReader.h
index b9ede8e4a2..d91596914b 100644
--- a/src/openrct2/core/StringReader.h
+++ b/src/openrct2/core/StringReader.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 struct IStringReader
 {
diff --git a/src/openrct2/core/StringTypes.h b/src/openrct2/core/StringTypes.h
new file mode 100644
index 0000000000..0c4d33982c
--- /dev/null
+++ b/src/openrct2/core/StringTypes.h
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2024 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+using utf8 = char;
+using utf8string = utf8*;
+using const_utf8string = const utf8*;
+using u8string = std::basic_string<utf8>;
+using u8string_view = std::basic_string_view<utf8>;
+
+using codepoint_t = uint32_t;
+
+namespace OpenRCT2
+{
+    enum CodePage : int32_t
+    {
+        CP_932 = 932,   // ANSI/OEM Japanese; Japanese (Shift-JIS)
+        CP_936 = 936,   // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
+        CP_949 = 949,   // ANSI/OEM Korean (Unified Hangul Code)
+        CP_950 = 950,   // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
+        CP_1252 = 1252, // ANSI Latin 1; Western European (Windows)
+        UTF8 = 65001,   // Unicode (UTF-8)
+    };
+}
diff --git a/src/openrct2/core/UTF8.h b/src/openrct2/core/UTF8.h
index 6d38fb6821..d93cc0bac3 100644
--- a/src/openrct2/core/UTF8.h
+++ b/src/openrct2/core/UTF8.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "String.hpp"
+#include "StringTypes.h"
 
 uint32_t UTF8GetNext(const utf8* char_ptr, const utf8** nextchar_ptr);
 bool UTF8IsCodepointStart(const utf8* text);
diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h
index 76ed010741..0fcbdf39d5 100644
--- a/src/openrct2/drawing/Drawing.h
+++ b/src/openrct2/drawing/Drawing.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../core/CallingConventions.h"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../interface/Colour.h"
 #include "../interface/ZoomLevel.h"
 #include "../world/Location.hpp"
diff --git a/src/openrct2/drawing/Font.h b/src/openrct2/drawing/Font.h
index ee53a76623..caec2dc716 100644
--- a/src/openrct2/drawing/Font.h
+++ b/src/openrct2/drawing/Font.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../drawing/ImageId.hpp"
 
 #include <array>
diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp
index a3393ffbb6..18ffc5b881 100644
--- a/src/openrct2/entity/EntityRegistry.cpp
+++ b/src/openrct2/entity/EntityRegistry.cpp
@@ -18,6 +18,7 @@
 #include "../core/DataSerialiser.h"
 #include "../core/Guard.hpp"
 #include "../core/MemoryStream.h"
+#include "../core/String.hpp"
 #include "../entity/Peep.h"
 #include "../entity/Staff.h"
 #include "../interface/Viewport.h"
diff --git a/src/openrct2/interface/Chat.h b/src/openrct2/interface/Chat.h
index e341fb2dc6..0d6025a21d 100644
--- a/src/openrct2/interface/Chat.h
+++ b/src/openrct2/interface/Chat.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "Colour.h"
 
 #include <string_view>
diff --git a/src/openrct2/interface/Colour.h b/src/openrct2/interface/Colour.h
index 180dc09c63..0e8e8dfa08 100644
--- a/src/openrct2/interface/Colour.h
+++ b/src/openrct2/interface/Colour.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <cstdint>
 #include <string_view>
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index 2be5b8a854..7e8bbab311 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -226,6 +226,7 @@
     <ClInclude Include="core\String.hpp" />
     <ClInclude Include="core\StringBuilder.h" />
     <ClInclude Include="core\StringReader.h" />
+    <ClInclude Include="core\StringTypes.h" />
     <ClInclude Include="core\Timer.hpp" />
     <ClInclude Include="core\UTF8.h" />
     <ClInclude Include="core\UnicodeChar.h" />
diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h
index 8fbe76928a..4d7498b642 100644
--- a/src/openrct2/localisation/Currency.h
+++ b/src/openrct2/localisation/Currency.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../localisation/StringIdType.h"
 #include "../util/Util.h"
 #include "CurrencyTypes.h"
diff --git a/src/openrct2/localisation/Formatter.h b/src/openrct2/localisation/Formatter.h
index 94bd30e993..f9ca912bb0 100644
--- a/src/openrct2/localisation/Formatter.h
+++ b/src/openrct2/localisation/Formatter.h
@@ -12,7 +12,7 @@
 #include "../Identifiers.h"
 #include "../core/Guard.hpp"
 #include "../core/Money.hpp"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "StringIdType.h"
 
 #include <array>
diff --git a/src/openrct2/localisation/Formatting.cpp b/src/openrct2/localisation/Formatting.cpp
index 4276ffb11a..7509f55524 100644
--- a/src/openrct2/localisation/Formatting.cpp
+++ b/src/openrct2/localisation/Formatting.cpp
@@ -11,6 +11,7 @@
 
 #include "../Diagnostic.h"
 #include "../config/Config.h"
+#include "../core/String.hpp"
 #include "../peep/RealNames.h"
 #include "../util/Util.h"
 #include "Currency.h"
diff --git a/src/openrct2/localisation/LanguagePack.h b/src/openrct2/localisation/LanguagePack.h
index 67393899f4..c692320f9a 100644
--- a/src/openrct2/localisation/LanguagePack.h
+++ b/src/openrct2/localisation/LanguagePack.h
@@ -9,12 +9,10 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../localisation/StringIdType.h"
 
 #include <memory>
-#include <string>
-#include <string_view>
 
 struct ILanguagePack
 {
diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h
index 725514cabf..5896346876 100644
--- a/src/openrct2/management/NewsItem.h
+++ b/src/openrct2/management/NewsItem.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../Identifiers.h"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../localisation/StringIdType.h"
 
 #include <algorithm>
diff --git a/src/openrct2/network/NetworkKey.cpp b/src/openrct2/network/NetworkKey.cpp
index 94f0d30602..6f0f715675 100644
--- a/src/openrct2/network/NetworkKey.cpp
+++ b/src/openrct2/network/NetworkKey.cpp
@@ -14,6 +14,7 @@
 #    include "../Diagnostic.h"
 #    include "../core/Crypt.h"
 #    include "../core/IStream.hpp"
+#    include "../core/String.hpp"
 
 #    include <vector>
 
diff --git a/src/openrct2/network/NetworkUser.cpp b/src/openrct2/network/NetworkUser.cpp
index c55a8e734b..e769f94f52 100644
--- a/src/openrct2/network/NetworkUser.cpp
+++ b/src/openrct2/network/NetworkUser.cpp
@@ -18,6 +18,7 @@
 #    include "../core/Guard.hpp"
 #    include "../core/Json.hpp"
 #    include "../core/Path.hpp"
+#    include "../core/String.hpp"
 
 #    include <unordered_set>
 
diff --git a/src/openrct2/network/NetworkUser.h b/src/openrct2/network/NetworkUser.h
index fdcf76813a..248fc88221 100644
--- a/src/openrct2/network/NetworkUser.h
+++ b/src/openrct2/network/NetworkUser.h
@@ -10,11 +10,10 @@
 #pragma once
 
 #include "../core/JsonFwd.hpp"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <memory>
 #include <optional>
-#include <string>
 #include <unordered_map>
 
 class NetworkUser final
diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h
index d500bd752b..367fd4701e 100644
--- a/src/openrct2/object/Object.h
+++ b/src/openrct2/object/Object.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../core/JsonFwd.hpp"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../drawing/ImageIndexType.h"
 #include "../util/Util.h"
 #include "ImageTable.h"
diff --git a/src/openrct2/object/ObjectFactory.h b/src/openrct2/object/ObjectFactory.h
index f0343f9928..ab7ea54de8 100644
--- a/src/openrct2/object/ObjectFactory.h
+++ b/src/openrct2/object/ObjectFactory.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <memory>
 #include <string_view>
diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp
index b70794096f..48e08b97f3 100644
--- a/src/openrct2/park/ParkFile.cpp
+++ b/src/openrct2/park/ParkFile.cpp
@@ -23,6 +23,7 @@
 #include "../core/File.h"
 #include "../core/OrcaStream.hpp"
 #include "../core/Path.hpp"
+#include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../entity/Balloon.h"
 #include "../entity/Duck.h"
diff --git a/src/openrct2/platform/Platform.Common.cpp b/src/openrct2/platform/Platform.Common.cpp
index 8c14c5d8fe..02e7f389da 100644
--- a/src/openrct2/platform/Platform.Common.cpp
+++ b/src/openrct2/platform/Platform.Common.cpp
@@ -29,6 +29,7 @@
 #include "../Game.h"
 #include "../core/File.h"
 #include "../core/Path.hpp"
+#include "../core/String.hpp"
 #include "../localisation/Currency.h"
 #include "Platform.h"
 
diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp
index 5ca8d697ee..40db7f6f0c 100644
--- a/src/openrct2/platform/Platform.Posix.cpp
+++ b/src/openrct2/platform/Platform.Posix.cpp
@@ -15,6 +15,7 @@
 #    include "../Diagnostic.h"
 #    include "../core/Memory.hpp"
 #    include "../core/Path.hpp"
+#    include "../core/String.hpp"
 #    include "../util/Util.h"
 
 #    include <cerrno>
diff --git a/src/openrct2/platform/Platform.h b/src/openrct2/platform/Platform.h
index c263c8cb72..c2923349d0 100644
--- a/src/openrct2/platform/Platform.h
+++ b/src/openrct2/platform/Platform.h
@@ -11,10 +11,9 @@
 
 #include "../config/ConfigTypes.h"
 #include "../core/DateTime.h"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <ctime>
-#include <string>
 
 #ifdef _WIN32
 #    define PATH_SEPARATOR u8"\\"
diff --git a/src/openrct2/rct1/Csg.h b/src/openrct2/rct1/Csg.h
index 5f43c47900..fc731f01c9 100644
--- a/src/openrct2/rct1/Csg.h
+++ b/src/openrct2/rct1/Csg.h
@@ -9,9 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
-
-#include <string>
+#include "../core/StringTypes.h"
 
 struct Gx;
 
diff --git a/src/openrct2/rct12/ScenarioPatcher.cpp b/src/openrct2/rct12/ScenarioPatcher.cpp
index a4af6d7441..2099249a6f 100644
--- a/src/openrct2/rct12/ScenarioPatcher.cpp
+++ b/src/openrct2/rct12/ScenarioPatcher.cpp
@@ -16,6 +16,7 @@
 #include "../core/Guard.hpp"
 #include "../core/Json.hpp"
 #include "../core/Path.hpp"
+#include "../core/String.hpp"
 #include "../entity/EntityList.h"
 #include "../entity/Guest.h"
 #include "../entity/Peep.h"
diff --git a/src/openrct2/rct12/ScenarioPatcher.h b/src/openrct2/rct12/ScenarioPatcher.h
index 49fd2271d2..b45c6525ce 100644
--- a/src/openrct2/rct12/ScenarioPatcher.h
+++ b/src/openrct2/rct12/ScenarioPatcher.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 namespace OpenRCT2::RCT12
 {
diff --git a/src/openrct2/ride/TrackDesignRepository.h b/src/openrct2/ride/TrackDesignRepository.h
index ad4fcea532..41a83ce1cd 100644
--- a/src/openrct2/ride/TrackDesignRepository.h
+++ b/src/openrct2/ride/TrackDesignRepository.h
@@ -9,11 +9,10 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "RideTypes.h"
 
 #include <memory>
-#include <string>
 #include <vector>
 
 struct TrackDesignFileRef
diff --git a/src/openrct2/scenario/ScenarioRepository.h b/src/openrct2/scenario/ScenarioRepository.h
index 14e3c14b25..617248a291 100644
--- a/src/openrct2/scenario/ScenarioRepository.h
+++ b/src/openrct2/scenario/ScenarioRepository.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "../core/DateTime.h"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "../scenario/Scenario.h"
 
 #include <memory>
diff --git a/src/openrct2/scenario/ScenarioSources.h b/src/openrct2/scenario/ScenarioSources.h
index 402d96500f..fe3196e96e 100644
--- a/src/openrct2/scenario/ScenarioSources.h
+++ b/src/openrct2/scenario/ScenarioSources.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 struct SourceDescriptor
 {
diff --git a/src/openrct2/scenes/title/Command/FollowEntity.h b/src/openrct2/scenes/title/Command/FollowEntity.h
index ff8e36b547..93d75e6791 100644
--- a/src/openrct2/scenes/title/Command/FollowEntity.h
+++ b/src/openrct2/scenes/title/Command/FollowEntity.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../../../Identifiers.h"
-#include "../../../core/String.hpp"
+#include "../../../core/StringTypes.h"
 #include "../../../localisation/Formatting.h"
 
 #include <cstdint>
diff --git a/src/openrct2/scenes/title/Command/LoadScenario.h b/src/openrct2/scenes/title/Command/LoadScenario.h
index 0500e30816..a75b08f98a 100644
--- a/src/openrct2/scenes/title/Command/LoadScenario.h
+++ b/src/openrct2/scenes/title/Command/LoadScenario.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../../../core/String.hpp"
+#include "../../../core/StringTypes.h"
 
 #include <cstdint>
 
diff --git a/src/openrct2/scenes/title/TitleSequenceManager.h b/src/openrct2/scenes/title/TitleSequenceManager.h
index 35ed2b273b..a0e5a86e03 100644
--- a/src/openrct2/scenes/title/TitleSequenceManager.h
+++ b/src/openrct2/scenes/title/TitleSequenceManager.h
@@ -9,10 +9,9 @@
 
 #pragma once
 
-#include "../../core/String.hpp"
+#include "../../core/StringTypes.h"
 
 #include <limits>
-#include <string>
 
 namespace OpenRCT2::TitleSequenceManager
 {
diff --git a/src/openrct2/scripting/bindings/world/ScClimate.hpp b/src/openrct2/scripting/bindings/world/ScClimate.hpp
index 7940aa4626..677e658464 100644
--- a/src/openrct2/scripting/bindings/world/ScClimate.hpp
+++ b/src/openrct2/scripting/bindings/world/ScClimate.hpp
@@ -13,7 +13,7 @@
 
 #    include "../../../Context.h"
 #    include "../../../GameState.h"
-#    include "../../../core/String.hpp"
+#    include "../../../core/StringTypes.h"
 #    include "../../../world/Climate.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"
diff --git a/src/openrct2/scripting/bindings/world/ScScenario.hpp b/src/openrct2/scripting/bindings/world/ScScenario.hpp
index 330367a447..c321f100f1 100644
--- a/src/openrct2/scripting/bindings/world/ScScenario.hpp
+++ b/src/openrct2/scripting/bindings/world/ScScenario.hpp
@@ -13,7 +13,7 @@
 
 #    include "../../../Context.h"
 #    include "../../../GameState.h"
-#    include "../../../core/String.hpp"
+#    include "../../../core/StringTypes.h"
 #    include "../../../scenario/Scenario.h"
 #    include "../../../world/Park.h"
 #    include "../../Duktape.hpp"
diff --git a/src/openrct2/util/Util.h b/src/openrct2/util/Util.h
index 024989b204..ec4074c63a 100644
--- a/src/openrct2/util/Util.h
+++ b/src/openrct2/util/Util.h
@@ -11,7 +11,7 @@
 
 #include "../core/CallingConventions.h"
 #include "../core/Money.hpp"
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 
 #include <cstdio>
 #include <ctime>
diff --git a/src/openrct2/world/MapGen.h b/src/openrct2/world/MapGen.h
index fe57ff121e..158990c85a 100644
--- a/src/openrct2/world/MapGen.h
+++ b/src/openrct2/world/MapGen.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../core/String.hpp"
+#include "../core/StringTypes.h"
 #include "Location.hpp"
 
 struct MapGenSettings
diff --git a/test/tests/CryptTests.cpp b/test/tests/CryptTests.cpp
index 9a212d3dbd..ad5f352981 100644
--- a/test/tests/CryptTests.cpp
+++ b/test/tests/CryptTests.cpp
@@ -14,6 +14,7 @@
 #include <openrct2/core/Crypt.h>
 #include <openrct2/core/File.h>
 #include <openrct2/core/Path.hpp>
+#include <openrct2/core/String.hpp>
 #include <openrct2/network/NetworkKey.h>
 #include <string>
 
diff --git a/test/tests/ScenarioPatcherTests.cpp b/test/tests/ScenarioPatcherTests.cpp
index 82ccbb3c3c..5d6c6f3112 100644
--- a/test/tests/ScenarioPatcherTests.cpp
+++ b/test/tests/ScenarioPatcherTests.cpp
@@ -15,6 +15,7 @@
 #include <openrct2/PlatformEnvironment.h>
 #include <openrct2/core/FileSystem.hpp>
 #include <openrct2/core/Guard.hpp>
+#include <openrct2/core/String.hpp>
 #include <openrct2/rct12/ScenarioPatcher.h>
 
 /* Test that all JSONs are with the expected formatting, otherwise the fetcher will abort