diff --git a/src/openrct2/network/NetworkBase.h b/src/openrct2/network/NetworkBase.h
index 113e9f0056..2156216580 100644
--- a/src/openrct2/network/NetworkBase.h
+++ b/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
 
diff --git a/src/openrct2/network/NetworkGroup.cpp b/src/openrct2/network/NetworkGroup.cpp
index 4f5b4e7419..38e24d6647 100644
--- a/src/openrct2/network/NetworkGroup.cpp
+++ b/src/openrct2/network/NetworkGroup.cpp
@@ -11,6 +11,7 @@
 
 #    include "NetworkGroup.h"
 
+#    include "../openrct2/core/Json.hpp"
 #    include "NetworkAction.h"
 #    include "NetworkTypes.h"
 
diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h
index bc84e7dc02..1384b1e85e 100644
--- a/src/openrct2/network/NetworkGroup.h
+++ b/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;
diff --git a/src/openrct2/network/NetworkUser.cpp b/src/openrct2/network/NetworkUser.cpp
index a8c176d371..b1275b3810 100644
--- a/src/openrct2/network/NetworkUser.cpp
+++ b/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"
diff --git a/src/openrct2/network/NetworkUser.h b/src/openrct2/network/NetworkUser.h
index cd4e331267..0368bed2c9 100644
--- a/src/openrct2/network/NetworkUser.h
+++ b/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:
diff --git a/src/openrct2/network/ServerList.h b/src/openrct2/network/ServerList.h
index d4c1109557..7c7339ae8b 100644
--- a/src/openrct2/network/ServerList.h
+++ b/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
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index fbfa0dc24f..84a4a8937c 100644
--- a/src/openrct2/network/network.h
+++ b/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;
diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp
index d756b2f568..1f38f470c1 100644
--- a/src/openrct2/object/BannerObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp
index 974917bbb1..9bbb92f3f0 100644
--- a/src/openrct2/object/EntranceObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/FootpathItemObject.cpp b/src/openrct2/object/FootpathItemObject.cpp
index e3352db258..bc486f0634 100644
--- a/src/openrct2/object/FootpathItemObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp
index b755b97a71..eea338f3f6 100644
--- a/src/openrct2/object/ImageTable.cpp
+++ b/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"
diff --git a/src/openrct2/object/ImageTable.h b/src/openrct2/object/ImageTable.h
index 7499a305ef..aa1cecda55 100644
--- a/src/openrct2/object/ImageTable.h
+++ b/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
 {
diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp
index 3ab667c39d..5aaf856d55 100644
--- a/src/openrct2/object/LargeSceneryObject.cpp
+++ b/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)
 {
diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h
index 767929f681..57140967ef 100644
--- a/src/openrct2/object/Object.h
+++ b/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();
 
diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index 9955f0616e..2944d9aff0 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h
index c2217259bd..5a41a67187 100644
--- a/src/openrct2/object/RideObject.h
+++ b/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
diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp
index 5936bb0296..341e77c2d6 100644
--- a/src/openrct2/object/SceneryGroupObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp
index 9cef4276f1..06f20c08e1 100644
--- a/src/openrct2/object/SmallSceneryObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/StationObject.cpp b/src/openrct2/object/StationObject.cpp
index 2b8c37c938..e64f040a8e 100644
--- a/src/openrct2/object/StationObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp
index 1994cd9f1f..0293208678 100644
--- a/src/openrct2/object/StringTable.cpp
+++ b/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"
diff --git a/src/openrct2/object/StringTable.h b/src/openrct2/object/StringTable.h
index 9f75b3a0ed..bf8b442327 100644
--- a/src/openrct2/object/StringTable.h
+++ b/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
 {
diff --git a/src/openrct2/object/TerrainEdgeObject.cpp b/src/openrct2/object/TerrainEdgeObject.cpp
index 77ca225822..3e26972f03 100644
--- a/src/openrct2/object/TerrainEdgeObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp
index cfba7585c9..2c67cf9963 100644
--- a/src/openrct2/object/TerrainSurfaceObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp
index 7fbe8453d6..989bdf6dc1 100644
--- a/src/openrct2/object/WallObject.cpp
+++ b/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"
diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp
index 69df434eb9..1a475c3101 100644
--- a/src/openrct2/object/WaterObject.cpp
+++ b/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"