diff --git a/src/openrct2-ui/UiStringIds.h b/src/openrct2-ui/UiStringIds.h
index 62ff44bbcd..c897f85119 100644
--- a/src/openrct2-ui/UiStringIds.h
+++ b/src/openrct2-ui/UiStringIds.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <openrct2/common.h>
+#include <openrct2/localisation/StringIdType.h>
 
 namespace OpenRCT2
 {
diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h
index 39335fb622..a4ffc54ebf 100644
--- a/src/openrct2/Context.h
+++ b/src/openrct2/Context.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include "common.h"
 #include "core/String.hpp"
 #include "interface/WindowClasses.h"
+#include "localisation/StringIdType.h"
 #include "world/Location.hpp"
 
 #include <memory>
diff --git a/src/openrct2/actions/ResultWithMessage.h b/src/openrct2/actions/ResultWithMessage.h
index 6a66e4980a..e2c23c498c 100644
--- a/src/openrct2/actions/ResultWithMessage.h
+++ b/src/openrct2/actions/ResultWithMessage.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 struct ResultWithMessage
 {
diff --git a/src/openrct2/common.h b/src/openrct2/common.h
index 147254667e..4cb69c700e 100644
--- a/src/openrct2/common.h
+++ b/src/openrct2/common.h
@@ -19,7 +19,6 @@
 #endif
 
 #include "Diagnostic.h"
-#include "localisation/StringIdType.h"
 
 #include <cassert>
 #include <cstddef>
diff --git a/src/openrct2/drawing/NewDrawing.h b/src/openrct2/drawing/NewDrawing.h
index b926babc32..cd71c7b3bf 100644
--- a/src/openrct2/drawing/NewDrawing.h
+++ b/src/openrct2/drawing/NewDrawing.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 struct DrawPixelInfo;
 struct GamePalette;
diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h
index 3de584c26c..e0a45b460e 100644
--- a/src/openrct2/drawing/Text.h
+++ b/src/openrct2/drawing/Text.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../common.h"
 #include "../interface/Colour.h"
+#include "../localisation/StringIdType.h"
 #include "Font.h"
 
 struct ScreenCoordsXY;
diff --git a/src/openrct2/entity/Litter.h b/src/openrct2/entity/Litter.h
index c1ec3c40e0..14ea02594b 100644
--- a/src/openrct2/entity/Litter.h
+++ b/src/openrct2/entity/Litter.h
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "../localisation/StringIdType.h"
 #include "EntityBase.h"
 
 class DataSerialiser;
diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp
index c216b791ab..8f2d60a3ca 100644
--- a/src/openrct2/entity/MoneyEffect.cpp
+++ b/src/openrct2/entity/MoneyEffect.cpp
@@ -6,6 +6,7 @@
  *
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
+
 #include "MoneyEffect.h"
 
 #include "../OpenRCT2.h"
diff --git a/src/openrct2/entity/MoneyEffect.h b/src/openrct2/entity/MoneyEffect.h
index 6cefb3628a..1888d8f1d9 100644
--- a/src/openrct2/entity/MoneyEffect.h
+++ b/src/openrct2/entity/MoneyEffect.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../core/Money.hpp"
+#include "../localisation/StringIdType.h"
 #include "EntityBase.h"
 
 class DataSerialiser;
diff --git a/src/openrct2/entity/Peep.h b/src/openrct2/entity/Peep.h
index 7aaa2ba79d..a188c493aa 100644
--- a/src/openrct2/entity/Peep.h
+++ b/src/openrct2/entity/Peep.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "../Identifiers.h"
-#include "../common.h"
 #include "../entity/EntityBase.h"
+#include "../localisation/StringIdType.h"
 #include "../ride/RideTypes.h"
 #include "../ride/Station.h"
 #include "../util/Util.h"
diff --git a/src/openrct2/localisation/Currency.h b/src/openrct2/localisation/Currency.h
index 2fc85d30c7..d03444c2a2 100644
--- a/src/openrct2/localisation/Currency.h
+++ b/src/openrct2/localisation/Currency.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../common.h"
 #include "../core/String.hpp"
+#include "../localisation/StringIdType.h"
 #include "../util/Util.h"
 #include "CurrencyTypes.h"
 
diff --git a/src/openrct2/localisation/Date.h b/src/openrct2/localisation/Date.h
index 7088b2795e..25bb613dba 100644
--- a/src/openrct2/localisation/Date.h
+++ b/src/openrct2/localisation/Date.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../Date.h"
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 extern const StringId DateFormatStringIDs[];
 extern const StringId DateFormatStringFormatIds[];
diff --git a/src/openrct2/localisation/Formatter.h b/src/openrct2/localisation/Formatter.h
index 075dce1f32..52acd0899a 100644
--- a/src/openrct2/localisation/Formatter.h
+++ b/src/openrct2/localisation/Formatter.h
@@ -10,10 +10,10 @@
 #pragma once
 
 #include "../Identifiers.h"
-#include "../common.h"
 #include "../core/Guard.hpp"
 #include "../core/Money.hpp"
 #include "../core/String.hpp"
+#include "StringIdType.h"
 
 #include <array>
 #include <cstring>
diff --git a/src/openrct2/localisation/Language.h b/src/openrct2/localisation/Language.h
index d9bbff487a..a407117e79 100644
--- a/src/openrct2/localisation/Language.h
+++ b/src/openrct2/localisation/Language.h
@@ -9,9 +9,9 @@
 
 #pragma once
 
-#include "../common.h"
 #include "../drawing/Font.h"
 #include "../interface/FontFamilies.h"
+#include "../localisation/StringIdType.h"
 
 #include <string>
 #include <string_view>
diff --git a/src/openrct2/localisation/LanguagePack.h b/src/openrct2/localisation/LanguagePack.h
index a1fd1e8bd2..b852152788 100644
--- a/src/openrct2/localisation/LanguagePack.h
+++ b/src/openrct2/localisation/LanguagePack.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../common.h"
 #include "../core/String.hpp"
+#include "../localisation/StringIdType.h"
 
 #include <memory>
 #include <string>
diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h
index 4b5a553b26..84c22d3232 100644
--- a/src/openrct2/localisation/Localisation.h
+++ b/src/openrct2/localisation/Localisation.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../management/Marketing.h"
+#include "StringIdType.h"
 
 #include <string>
 
diff --git a/src/openrct2/localisation/LocalisationService.h b/src/openrct2/localisation/LocalisationService.h
index 3b1da874ca..a2090e42d2 100644
--- a/src/openrct2/localisation/LocalisationService.h
+++ b/src/openrct2/localisation/LocalisationService.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 #include <memory>
 #include <stack>
diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h
index 955160a224..984dcaae77 100644
--- a/src/openrct2/localisation/StringIds.h
+++ b/src/openrct2/localisation/StringIds.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 enum : StringId
 {
diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h
index de42debca4..279570b8f0 100644
--- a/src/openrct2/management/NewsItem.h
+++ b/src/openrct2/management/NewsItem.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "../Identifiers.h"
-#include "../common.h"
 #include "../core/String.hpp"
+#include "../localisation/StringIdType.h"
 
 #include <algorithm>
 #include <array>
diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h
index ceb4c9fe13..88719edcdf 100644
--- a/src/openrct2/management/Research.h
+++ b/src/openrct2/management/Research.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "../object/ObjectLimits.h"
 #include "../object/ObjectTypes.h"
 #include "../ride/RideTypes.h"
diff --git a/src/openrct2/network/NetworkAction.h b/src/openrct2/network/NetworkAction.h
index 15a877fdfa..3fce08e4bc 100644
--- a/src/openrct2/network/NetworkAction.h
+++ b/src/openrct2/network/NetworkAction.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../Game.h"
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 #include <array>
 #include <string>
diff --git a/src/openrct2/network/ServerList.h b/src/openrct2/network/ServerList.h
index 32576c3806..c186e435d5 100644
--- a/src/openrct2/network/ServerList.h
+++ b/src/openrct2/network/ServerList.h
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../common.h"
 #include "../core/JsonFwd.hpp"
+#include "../localisation/StringIdType.h"
 
 #include <future>
 #include <optional>
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index f7c3cf1627..0af8d505ee 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -9,7 +9,14 @@
 
 #pragma once
 
-#include <cstdint>
+#include "../Game.h"
+#include "../core/JsonFwd.hpp"
+#include "../localisation/StringIds.h"
+#include "NetworkTypes.h"
+
+#include <string>
+#include <string_view>
+#include <vector>
 
 constexpr uint16_t kNetworkDefaultPort = 11753;
 constexpr uint16_t kNetworkLanBroadcastPort = 11754;
@@ -17,16 +24,6 @@ constexpr const char* kNetworkLanBroadcastMsg = "openrct2.server.query";
 constexpr const char* kMasterServerURL = "https://servers.openrct2.io";
 constexpr uint16_t kMaxServerDescriptionLength = 256;
 
-#include "../Game.h"
-#include "../core/JsonFwd.hpp"
-#include "../localisation/StringIds.h"
-#include "NetworkTypes.h"
-
-#include <memory>
-#include <string>
-#include <string_view>
-#include <vector>
-
 class GameAction;
 struct Peep;
 struct CoordsXYZ;
diff --git a/src/openrct2/object/BannerSceneryEntry.h b/src/openrct2/object/BannerSceneryEntry.h
index 6cdfc661fc..61b38ab474 100644
--- a/src/openrct2/object/BannerSceneryEntry.h
+++ b/src/openrct2/object/BannerSceneryEntry.h
@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/Money.hpp"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum
diff --git a/src/openrct2/object/EntranceEntry.h b/src/openrct2/object/EntranceEntry.h
index 897cc7ff97..d886cfb000 100644
--- a/src/openrct2/object/EntranceEntry.h
+++ b/src/openrct2/object/EntranceEntry.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 struct EntranceEntry
diff --git a/src/openrct2/object/FootpathEntry.h b/src/openrct2/object/FootpathEntry.h
index d46b5df93c..f5fbe7b1e5 100644
--- a/src/openrct2/object/FootpathEntry.h
+++ b/src/openrct2/object/FootpathEntry.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum class RailingEntrySupportType : uint8_t;
diff --git a/src/openrct2/object/LargeSceneryEntry.h b/src/openrct2/object/LargeSceneryEntry.h
index 4089b635fe..d20701b335 100644
--- a/src/openrct2/object/LargeSceneryEntry.h
+++ b/src/openrct2/object/LargeSceneryEntry.h
@@ -11,6 +11,7 @@
 
 #include "../core/Money.hpp"
 #include "../interface/Cursors.h"
+#include "../localisation/StringIdType.h"
 #include "../world/Location.hpp"
 #include "ObjectTypes.h"
 
diff --git a/src/openrct2/object/PathAdditionEntry.h b/src/openrct2/object/PathAdditionEntry.h
index 174262642a..4f8e95ec3f 100644
--- a/src/openrct2/object/PathAdditionEntry.h
+++ b/src/openrct2/object/PathAdditionEntry.h
@@ -11,6 +11,7 @@
 
 #include "../core/Money.hpp"
 #include "../interface/Cursors.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum class PathAdditionDrawType : uint8_t
diff --git a/src/openrct2/object/SceneryGroupEntry.h b/src/openrct2/object/SceneryGroupEntry.h
index e103a499dd..f8d742b34d 100644
--- a/src/openrct2/object/SceneryGroupEntry.h
+++ b/src/openrct2/object/SceneryGroupEntry.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "../world/ScenerySelection.h"
 #include "ObjectTypes.h"
 
diff --git a/src/openrct2/object/SmallSceneryEntry.h b/src/openrct2/object/SmallSceneryEntry.h
index af6d71b3ba..07c9c445ff 100644
--- a/src/openrct2/object/SmallSceneryEntry.h
+++ b/src/openrct2/object/SmallSceneryEntry.h
@@ -11,6 +11,7 @@
 
 #include "../core/Money.hpp"
 #include "../interface/Cursors.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum SMALL_SCENERY_FLAGS : uint32_t
diff --git a/src/openrct2/object/WallSceneryEntry.h b/src/openrct2/object/WallSceneryEntry.h
index fcc27c00e8..61118628fa 100644
--- a/src/openrct2/object/WallSceneryEntry.h
+++ b/src/openrct2/object/WallSceneryEntry.h
@@ -11,6 +11,7 @@
 
 #include "../core/Money.hpp"
 #include "../interface/Cursors.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum WALL_SCENERY_FLAGS
diff --git a/src/openrct2/object/WaterEntry.h b/src/openrct2/object/WaterEntry.h
index 6ab061b344..7c5372b881 100644
--- a/src/openrct2/object/WaterEntry.h
+++ b/src/openrct2/object/WaterEntry.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum
diff --git a/src/openrct2/ride/RideStringIds.h b/src/openrct2/ride/RideStringIds.h
index 9e19970661..dc2a964adf 100644
--- a/src/openrct2/ride/RideStringIds.h
+++ b/src/openrct2/ride/RideStringIds.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 enum : StringId
 {