Move StringIdType.h include out of common.h

src/openrct2-ui/UiStringIds.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <openrct2/common.h>
+#include <openrct2/localisation/StringIdType.h>
 
 namespace OpenRCT2
 {

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>

src/openrct2/actions/ResultWithMessage.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 struct ResultWithMessage
 {

src/openrct2/common.h

@@ -19,7 +19,6 @@
 #endif
 
 #include "Diagnostic.h"
-#include "localisation/StringIdType.h"
 
 #include <cassert>
 #include <cstddef>

src/openrct2/drawing/NewDrawing.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 struct DrawPixelInfo;
 struct GamePalette;

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;

src/openrct2/entity/Litter.h

@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include "../localisation/StringIdType.h"
 #include "EntityBase.h"
 
 class DataSerialiser;

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"

src/openrct2/entity/MoneyEffect.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../core/Money.hpp"
+#include "../localisation/StringIdType.h"
 #include "EntityBase.h"
 
 class DataSerialiser;

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"

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"
 

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[];

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>

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>

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>

src/openrct2/localisation/Localisation.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../management/Marketing.h"
+#include "StringIdType.h"
 
 #include <string>
 

src/openrct2/localisation/LocalisationService.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 #include <memory>
 #include <stack>

src/openrct2/localisation/StringIds.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 enum : StringId
 {

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>

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"

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>

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>

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;

src/openrct2/object/BannerSceneryEntry.h

@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/Money.hpp"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum

src/openrct2/object/EntranceEntry.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 struct EntranceEntry

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;

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"
 

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

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"
 

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

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

src/openrct2/object/WaterEntry.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../common.h"
+#include "../localisation/StringIdType.h"
 #include "ObjectTypes.h"
 
 enum

src/openrct2/ride/RideStringIds.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../common.h"
+#include "../localisation/StringIdType.h"
 
 enum : StringId
 {