Replace includes of Json.hpp in header files with json_fwd.hpp

src/openrct2/network/NetworkBase.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../actions/GameAction.h"
-#include "../core/Json.hpp"
 #include "NetworkConnection.h"
 #include "NetworkGroup.h"
 #include "NetworkPlayer.h"
@@ -10,6 +9,7 @@
 #include "NetworkUser.h"
 
 #include <fstream>
+#include <nlohmann/json_fwd.hpp>
 
 #ifndef DISABLE_NETWORK
 

src/openrct2/network/NetworkGroup.cpp

@@ -11,6 +11,7 @@
 
 #    include "NetworkGroup.h"
 
+#    include "../openrct2/core/Json.hpp"
 #    include "NetworkAction.h"
 #    include "NetworkTypes.h"
 

src/openrct2/network/NetworkGroup.h

@@ -10,10 +10,10 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "NetworkPacket.h"
 
 #include <array>
+#include <nlohmann/json_fwd.hpp>
 #include <string>
 
 enum class NetworkPermission : uint32_t;

src/openrct2/network/NetworkUser.cpp

@@ -13,6 +13,7 @@
 
 #    include "../core/Console.hpp"
 #    include "../core/Guard.hpp"
+#    include "../core/Json.hpp"
 #    include "../core/Path.hpp"
 #    include "../core/String.hpp"
 #    include "../platform/Platform2.h"

src/openrct2/network/NetworkUser.h

@@ -10,12 +10,14 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "../core/Nullable.hpp"
 
 #include <map>
+#include <nlohmann/json_fwd.hpp>
 #include <string>
 
+using json_t = nlohmann::json;
+
 class NetworkUser final
 {
 public:

src/openrct2/network/ServerList.h

@@ -10,14 +10,16 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 
 #include <future>
+#include <nlohmann/json_fwd.hpp>
 #include <optional>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
+using json_t = nlohmann::json;
+
 struct INetworkEndpoint;
 
 struct ServerListEntry

src/openrct2/network/network.h

@@ -15,14 +15,16 @@
 #define MAX_SERVER_DESCRIPTION_LENGTH 256
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "../localisation/StringIds.h"
 #include "NetworkTypes.h"
 
 #include <memory>
+#include <nlohmann/json_fwd.hpp>
 #include <string>
 #include <vector>
 
+using json_t = nlohmann::json;
+
 struct GameAction;
 struct Peep;
 struct CoordsXYZ;

src/openrct2/object/BannerObject.cpp

@@ -10,6 +10,7 @@
 #include "BannerObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Language.h"
 #include "../object/Object.h"

src/openrct2/object/EntranceObject.cpp

@@ -10,6 +10,7 @@
 #include "EntranceObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Localisation.h"

src/openrct2/object/FootpathItemObject.cpp

@@ -10,6 +10,7 @@
 #include "FootpathItemObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../drawing/Drawing.h"
 #include "../interface/Cursors.h"
 #include "../localisation/Localisation.h"

src/openrct2/object/ImageTable.cpp

@@ -15,6 +15,7 @@
 #include "../core/File.h"
 #include "../core/FileScanner.h"
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/Path.hpp"
 #include "../core/String.hpp"
 #include "../drawing/ImageImporter.h"

src/openrct2/object/ImageTable.h

@@ -10,12 +10,14 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "../drawing/Drawing.h"
 
 #include <memory>
+#include <nlohmann/json_fwd.hpp>
 #include <vector>
 
+using json_t = nlohmann::json;
+
 struct IReadObjectContext;
 namespace OpenRCT2
 {

src/openrct2/object/LargeSceneryObject.cpp

@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <iterator>
+#include <nlohmann/json_fwd.hpp>
 
 void LargeSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream)
 {

src/openrct2/object/Object.h

@@ -10,15 +10,16 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "ImageTable.h"
 #include "StringTable.h"
 
 #include <algorithm>
+#include <nlohmann/json_fwd.hpp>
 #include <optional>
 #include <string_view>
 #include <vector>
 
+using json_t = nlohmann::json;
 using ObjectEntryIndex = uint16_t;
 constexpr const ObjectEntryIndex OBJECT_ENTRY_INDEX_NULL = std::numeric_limits<ObjectEntryIndex>::max();
 

src/openrct2/object/RideObject.cpp

@@ -14,6 +14,7 @@
 #include "../OpenRCT2.h"
 #include "../audio/audio.h"
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"

src/openrct2/object/RideObject.h

@@ -10,10 +10,10 @@
 #pragma once
 
 #include "../core/IStream.hpp"
-#include "../core/Json.hpp"
 #include "../ride/Ride.h"
 #include "Object.h"
 
+#include <nlohmann/json_fwd.hpp>
 #include <vector>
 
 class RideObject final : public Object

src/openrct2/object/SceneryGroupObject.cpp

@@ -13,6 +13,7 @@
 
 #include "../Context.h"
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"

src/openrct2/object/SmallSceneryObject.cpp

@@ -12,6 +12,7 @@
 #include "SmallSceneryObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"

src/openrct2/object/StationObject.cpp

@@ -10,6 +10,7 @@
 #include "StationObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Localisation.h"

src/openrct2/object/StringTable.cpp

@@ -10,6 +10,7 @@
 #include "StringTable.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../localisation/Language.h"
 #include "../localisation/LanguagePack.h"

src/openrct2/object/StringTable.h

@@ -10,12 +10,14 @@
 #pragma once
 
 #include "../common.h"
-#include "../core/Json.hpp"
 #include "../localisation/Language.h"
 
+#include <nlohmann/json_fwd.hpp>
 #include <string>
 #include <vector>
 
+using json_t = nlohmann::json;
+
 struct IReadObjectContext;
 namespace OpenRCT2
 {

src/openrct2/object/TerrainEdgeObject.cpp

@@ -10,6 +10,7 @@
 #include "TerrainEdgeObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Localisation.h"

src/openrct2/object/TerrainSurfaceObject.cpp

@@ -12,6 +12,7 @@
 #include "TerrainSurfaceObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../localisation/Localisation.h"

src/openrct2/object/WallObject.cpp

@@ -10,6 +10,7 @@
 #include "WallObject.h"
 
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../interface/Cursors.h"

src/openrct2/object/WaterObject.cpp

@@ -13,6 +13,7 @@
 
 #include "../OpenRCT2.h"
 #include "../core/IStream.hpp"
+#include "../core/Json.hpp"
 #include "../localisation/Language.h"
 #include "../localisation/StringIds.h"
 #include "../world/Location.hpp"