26 files changed, 2 insertions, 102 deletions

diff --git a/src/Bindings/LuaChunkStay.h b/src/Bindings/LuaChunkStay.h
index f82647141..765a0b8b7 100644
--- a/src/Bindings/LuaChunkStay.h
+++ b/src/Bindings/LuaChunkStay.h
@@ -17,7 +17,6 @@
 
 
 // fwd:
-class cPluginLua;
 class cChunkMap;
 
 
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 9e354392b..d91ab8c83 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -45,7 +45,6 @@ extern "C"
 class cLuaServerHandle;
 class cLuaTCPLink;
 class cLuaUDPEndpoint;
-class cPluginLua;
 class cDeadlockDetect;
 
 
diff --git a/src/Bindings/PluginLua.h b/src/Bindings/PluginLua.h
index af336f0a0..ff5e8d726 100644
--- a/src/Bindings/PluginLua.h
+++ b/src/Bindings/PluginLua.h
@@ -19,12 +19,6 @@
 
 
 
-// fwd: "UI/Window.h"
-class cWindow;
-
-
-
-
 
 // tolua_begin
 class cPluginLua :
diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h
index 62fd3bb7d..d471df6f1 100644
--- a/src/Blocks/WorldInterface.h
+++ b/src/Blocks/WorldInterface.h
@@ -9,7 +9,6 @@ class cItems;
 typedef cItemCallback<cBlockEntity> cBlockEntityCallback;
 
 
-class cMonster;
 class cPlayer;
 
 
diff --git a/src/Chunk.h b/src/Chunk.h
index b5dcd7b91..d1cfb3196 100644
--- a/src/Chunk.h
+++ b/src/Chunk.h
@@ -15,18 +15,10 @@
 
 
 
-namespace Json
-{
-	class Value;
-};
-
-
-
 
 
 class cWorld;
 class cClientHandle;
-class cServer;
 class cPlayer;
 class cChunkMap;
 class cBeaconEntity;
@@ -42,9 +34,6 @@ class cNoteEntity;
 class cMobHeadEntity;
 class cFlowerPotEntity;
 class cBlockArea;
-class cPawn;
-class cPickup;
-class cChunkDataSerializer;
 class cBlockArea;
 class cFluidSimulatorData;
 class cMobCensus;
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 79c929402..63f5a6c60 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -13,7 +13,6 @@
 
 
 class cWorld;
-class cWorldInterface;
 class cItem;
 class cChunkStay;
 class cChunk;
@@ -30,9 +29,6 @@ class cNoteEntity;
 class cCommandBlockEntity;
 class cMobHeadEntity;
 class cFlowerPotEntity;
-class cPawn;
-class cPickup;
-class cChunkDataSerializer;
 class cBlockArea;
 class cMobCensus;
 class cMobSpawner;
diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index cc7f9f6f0..e36336562 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -29,9 +29,7 @@
 
 // fwd:
 class cChunkDataSerializer;
-class cInventory;
 class cMonster;
-class cPawn;
 class cExpOrb;
 class cPainting;
 class cPickup;
@@ -39,8 +37,6 @@ class cPlayer;
 class cProtocol;
 class cWindow;
 class cFallingBlock;
-class cItemHandler;
-class cWorld;
 class cCompositeChat;
 class cStatManager;
 class cClientHandle;
diff --git a/src/Entities/FallingBlock.h b/src/Entities/FallingBlock.h
index 8bdf46ca0..6a7297e9c 100644
--- a/src/Entities/FallingBlock.h
+++ b/src/Entities/FallingBlock.h
@@ -6,12 +6,6 @@
 
 
 
-class cPlayer;
-class cItem;
-
-
-
-
 
 // tolua_begin
 
diff --git a/src/HTTP/HTTPServer.h b/src/HTTP/HTTPServer.h
index 1de0a6ce9..c8e7063fd 100644
--- a/src/HTTP/HTTPServer.h
+++ b/src/HTTP/HTTPServer.h
@@ -20,8 +20,6 @@
 
 
 // fwd:
-class cHTTPMessage;
-class cHTTPRequestParser;
 class cHTTPIncomingRequest;
 class cHTTPServerConnection;
 
diff --git a/src/Inventory.h b/src/Inventory.h
index 2507cceed..b91b16c8b 100644
--- a/src/Inventory.h
+++ b/src/Inventory.h
@@ -12,7 +12,6 @@ namespace Json
 	class Value;
 };
 
-class cClientHandle;
 class cPlayer;
 
 
diff --git a/src/Map.h b/src/Map.h
index b1976133e..56573b8b0 100644
--- a/src/Map.h
+++ b/src/Map.h
@@ -22,7 +22,6 @@
 class cClientHandle;
 class cWorld;
 class cPlayer;
-class cItemFrame;
 class cMap;
 
 
diff --git a/src/MobFamilyCollecter.h b/src/MobFamilyCollecter.h
index c4324bd68..c8ca211e8 100644
--- a/src/MobFamilyCollecter.h
+++ b/src/MobFamilyCollecter.h
@@ -9,12 +9,6 @@
 
 
 
-// fwd:
-class cChunk;
-
-
-
-
 
 /** This class is used to collect the list of mobs for each family
 */
diff --git a/src/Mobs/Monster.h b/src/Mobs/Monster.h
index 6dac2c1fb..121bf3406 100644
--- a/src/Mobs/Monster.h
+++ b/src/Mobs/Monster.h
@@ -11,7 +11,7 @@
 
 
 class cClientHandle;
-class cWorld;
+
 
 
 // tolua_begin
diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h
index c97bf44a8..660a4a854 100644
--- a/src/Protocol/Authenticator.h
+++ b/src/Protocol/Authenticator.h
@@ -18,8 +18,7 @@ class cSettingsRepositoryInterface;
 
 
 
-// fwd: "cRoot.h"
-class cRoot;
+
 
 namespace Json
 {
diff --git a/src/Protocol/Protocol.h b/src/Protocol/Protocol.h
index d20c37a29..a1e09dbd1 100644
--- a/src/Protocol/Protocol.h
+++ b/src/Protocol/Protocol.h
@@ -26,8 +26,6 @@ class cExpOrb;
 class cPlayer;
 class cEntity;
 class cWindow;
-class cInventory;
-class cPawn;
 class cPickup;
 class cPainting;
 class cWorld;
diff --git a/src/Protocol/Protocol_1_8.h b/src/Protocol/Protocol_1_8.h
index 564443a38..0adf7a93c 100644
--- a/src/Protocol/Protocol_1_8.h
+++ b/src/Protocol/Protocol_1_8.h
@@ -36,16 +36,6 @@ Declares the 1.8 protocol classes:
 
 
 
-// fwd:
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 class cProtocol_1_8_0 :
 	public cProtocol
 {
diff --git a/src/Protocol/Protocol_1_9.h b/src/Protocol/Protocol_1_9.h
index 2c83168c2..fcb261575 100644
--- a/src/Protocol/Protocol_1_9.h
+++ b/src/Protocol/Protocol_1_9.h
@@ -42,16 +42,6 @@ Declares the 1.9 protocol classes:
 
 
 
-// fwd:
-namespace Json
-{
-	class Value;
-}
-
-
-
-
-
 class cProtocol_1_9_0 :
 	public cProtocol
 {
diff --git a/src/Root.h b/src/Root.h
index 3595848d9..efae5ba58 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -14,7 +14,6 @@
 
 
 // fwd:
-class cThread;
 class cMonsterConfig;
 class cBrewingRecipes;
 class cCraftingRecipes;
diff --git a/src/Server.h b/src/Server.h
index 88f91120c..2ac530c1e 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -33,7 +33,6 @@
 
 
 // fwd:
-class cPlayer;
 class cClientHandle;
 typedef std::shared_ptr<cClientHandle> cClientHandlePtr;
 typedef std::list<cClientHandlePtr> cClientHandlePtrs;
diff --git a/src/Simulator/FloodyFluidSimulator.h b/src/Simulator/FloodyFluidSimulator.h
index 7d6d81655..d193b0f90 100644
--- a/src/Simulator/FloodyFluidSimulator.h
+++ b/src/Simulator/FloodyFluidSimulator.h
@@ -16,13 +16,6 @@
 
 
 
-// fwd:
-class cBlockArea;
-
-
-
-
-
 class cFloodyFluidSimulator :
 	public cDelayedFluidSimulator
 {
diff --git a/src/Simulator/FluidSimulator.h b/src/Simulator/FluidSimulator.h
index 4d5590e54..86bcfb116 100644
--- a/src/Simulator/FluidSimulator.h
+++ b/src/Simulator/FluidSimulator.h
@@ -4,7 +4,6 @@
 #include "Simulator.h"
 
 
-class cChunk;
 class cWorld;
 
 
diff --git a/src/Simulator/VanillaFluidSimulator.h b/src/Simulator/VanillaFluidSimulator.h
index 3f8c45128..1e47c3ddf 100644
--- a/src/Simulator/VanillaFluidSimulator.h
+++ b/src/Simulator/VanillaFluidSimulator.h
@@ -13,13 +13,6 @@
 
 
 
-// fwd:
-class cBlockArea;
-
-
-
-
-
 class cVanillaFluidSimulator :
 	public cFloodyFluidSimulator
 {
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index b24a279e1..a57ad1a9c 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -24,14 +24,6 @@
 
 
 
-// fwd:
-class cEvent;
-class cWebPlugin;
-
-
-
-
-
 // tolua_begin
 struct HTTPFormData
 {
diff --git a/src/World.h b/src/World.h
index 3acb4676d..e011f4ac3 100644
--- a/src/World.h
+++ b/src/World.h
@@ -43,8 +43,6 @@ typedef std::shared_ptr<cClientHandle> cClientHandlePtr;
 typedef std::list<cClientHandlePtr> cClientHandlePtrs;
 typedef std::list<cClientHandle *> cClientHandles;
 class cEntity;
-class cBlockEntity;
-class cWorldGenerator;  // The generator that actually generates the chunks for a single world
 class cChunkGenerator;  // The thread responsible for generating chunks
 class cBeaconEntity;
 class cBrewingstandEntity;
diff --git a/src/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h
index 087d17277..a55e519a7 100644
--- a/src/WorldStorage/NBTChunkSerializer.h
+++ b/src/WorldStorage/NBTChunkSerializer.h
@@ -39,9 +39,6 @@ class cFlowerPotEntity;
 class cFallingBlock;
 class cMinecart;
 class cMinecartWithChest;
-class cMinecartWithFurnace;
-class cMinecartWithTNT;
-class cMinecartWithHopper;
 class cMonster;
 class cPickup;
 class cItemGrid;
@@ -51,7 +48,6 @@ class cExpOrb;
 class cHangingEntity;
 class cItemFrame;
 class cPainting;
-class cEntityEffect;
 
 
 
diff --git a/src/WorldStorage/WSSAnvil.h b/src/WorldStorage/WSSAnvil.h
index 4d37aa244..37ccdda4c 100755
--- a/src/WorldStorage/WSSAnvil.h
+++ b/src/WorldStorage/WSSAnvil.h
@@ -21,8 +21,6 @@ class cItemGrid;
 
 class cProjectileEntity;
 class cHangingEntity;
-class cWolf;
-class cOcelot;