23 files changed, 2 insertions, 31 deletions

diff --git a/src/Bindings/ManualBindings_Network.cpp b/src/Bindings/ManualBindings_Network.cpp
index da2e8d2d7..ff8f173a1 100644
--- a/src/Bindings/ManualBindings_Network.cpp
+++ b/src/Bindings/ManualBindings_Network.cpp
@@ -5,7 +5,6 @@
 // Also implements the cUrlClient bindings
 
 #include "Globals.h"
-#include "LuaTCPLink.h"
 #include "ManualBindings.h"
 #include "tolua++/include/tolua++.h"
 #include "LuaState.h"
diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp
index ea1bbe533..74c4d867f 100644
--- a/src/BlockArea.cpp
+++ b/src/BlockArea.cpp
@@ -12,7 +12,6 @@
 #include "BlockArea.h"
 #include "OSSupport/GZipFile.h"
 #include "Blocks/BlockHandler.h"
-#include "Cuboid.h"
 #include "ChunkData.h"
 #include "BlockEntities/BlockEntity.h"
 
diff --git a/src/BlockEntities/BrewingstandEntity.cpp b/src/BlockEntities/BrewingstandEntity.cpp
index 28c6e2f43..2c0f28c30 100644
--- a/src/BlockEntities/BrewingstandEntity.cpp
+++ b/src/BlockEntities/BrewingstandEntity.cpp
@@ -5,7 +5,6 @@
 #include "../Bindings/PluginManager.h"
 #include "../UI/BrewingstandWindow.h"
 #include "../Entities/Player.h"
-#include "../Root.h"
 #include "../Chunk.h"
 
 
diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp
index 951d0af09..762086ce4 100644
--- a/src/Blocks/BlockBed.cpp
+++ b/src/Blocks/BlockBed.cpp
@@ -9,7 +9,6 @@
 #include "Entities/Player.h"
 #include "../BoundingBox.h"
 #include "../Mobs/Monster.h"
-#include "../Entities/Entity.h"
 #include "../BlockEntities/BedEntity.h"
 
 
diff --git a/src/Blocks/BlockDoor.cpp b/src/Blocks/BlockDoor.cpp
index 19e72de9d..54a06d5d4 100644
--- a/src/Blocks/BlockDoor.cpp
+++ b/src/Blocks/BlockDoor.cpp
@@ -2,7 +2,6 @@
 #include "Globals.h"
 #include "BlockDoor.h"
 #include "../EffectID.h"
-#include "../Entities/Player.h"
 
 
 
diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp
index 3e32fd3ef..5a594a2a4 100644
--- a/src/BoundingBox.cpp
+++ b/src/BoundingBox.cpp
@@ -4,7 +4,6 @@
 
 #include "Globals.h"
 #include "BoundingBox.h"
-#include "Defines.h"
 
 
 
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 9c662f863..b1a7d6ec5 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -6,7 +6,6 @@
 #include "Root.h"
 #include "Entities/Player.h"
 #include "Item.h"
-#include "Entities/Pickup.h"
 #include "Chunk.h"
 #include "Generating/Trees.h"  // used in cChunkMap::ReplaceTreeBlocks() for tree block discrimination
 #include "BlockArea.h"
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 2bf397f76..b015b745f 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -9,7 +9,6 @@
 #include "Entities/Player.h"
 #include "Entities/Minecart.h"
 #include "Inventory.h"
-#include "EffectID.h"
 #include "BlockEntities/BeaconEntity.h"
 #include "BlockEntities/ChestEntity.h"
 #include "BlockEntities/CommandBlockEntity.h"
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 6dc5b9903..52cc8f45b 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -11,7 +11,6 @@
 #include "../Server.h"
 #include "../UI/InventoryWindow.h"
 #include "../UI/WindowOwner.h"
-#include "../World.h"
 #include "../Bindings/PluginManager.h"
 #include "../BlockEntities/BlockEntity.h"
 #include "../BlockEntities/EnderChestEntity.h"
diff --git a/src/Generating/ChunkDesc.cpp b/src/Generating/ChunkDesc.cpp
index 630a3913c..22a0113e5 100644
--- a/src/Generating/ChunkDesc.cpp
+++ b/src/Generating/ChunkDesc.cpp
@@ -5,8 +5,6 @@
 
 #include "Globals.h"
 #include "ChunkDesc.h"
-#include "../BlockArea.h"
-#include "../Cuboid.h"
 #include "../Noise/Noise.h"
 #include "../BlockEntities/BlockEntity.h"
 
diff --git a/src/Generating/CompoGenBiomal.cpp b/src/Generating/CompoGenBiomal.cpp
index c8e56da7d..f2835dfe1 100644
--- a/src/Generating/CompoGenBiomal.cpp
+++ b/src/Generating/CompoGenBiomal.cpp
@@ -7,7 +7,6 @@
 
 #include "CompoGenBiomal.h"
 
-#include "ComposableGenerator.h"
 #include "../IniFile.h"
 #include "../Noise/Noise.h"
 #include "../LinearUpscale.h"
diff --git a/src/HTTP/HTTPFormParser.cpp b/src/HTTP/HTTPFormParser.cpp
index 6ad5d2592..d5b58d2f4 100644
--- a/src/HTTP/HTTPFormParser.cpp
+++ b/src/HTTP/HTTPFormParser.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 #include "HTTPFormParser.h"
 #include "HTTPMessage.h"
-#include "MultipartParser.h"
 #include "NameValueParser.h"
 
 
diff --git a/src/HTTP/HTTPServerConnection.cpp b/src/HTTP/HTTPServerConnection.cpp
index 9edec2886..d949fcf4d 100644
--- a/src/HTTP/HTTPServerConnection.cpp
+++ b/src/HTTP/HTTPServerConnection.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 #include "HTTPServerConnection.h"
 #include "HTTPMessage.h"
-#include "HTTPMessageParser.h"
 #include "HTTPServer.h"
 
 
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index ca6a588a5..6f64fb25b 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -1,7 +1,6 @@
 
 #include "Globals.h"
 #include "ItemHandler.h"
-#include "../Item.h"
 #include "../World.h"
 #include "../Entities/Player.h"
 #include "../FastRandom.h"
diff --git a/src/LightingThread.cpp b/src/LightingThread.cpp
index 054dd9896..df1a802a5 100644
--- a/src/LightingThread.cpp
+++ b/src/LightingThread.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 #include "LightingThread.h"
 #include "ChunkMap.h"
-#include "ChunkStay.h"
 #include "World.h"
 
 
diff --git a/src/MobFamilyCollecter.cpp b/src/MobFamilyCollecter.cpp
index c24ee48f5..7b12e3faf 100644
--- a/src/MobFamilyCollecter.cpp
+++ b/src/MobFamilyCollecter.cpp
@@ -2,7 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "MobFamilyCollecter.h"
-#include "Mobs/Monster.h"
+
+
 
 
 
diff --git a/src/NetherPortalScanner.cpp b/src/NetherPortalScanner.cpp
index cebf09ceb..e78af73d9 100644
--- a/src/NetherPortalScanner.cpp
+++ b/src/NetherPortalScanner.cpp
@@ -2,7 +2,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "NetherPortalScanner.h"
-#include "Vector3.h"
 #include "Entities/Entity.h"
 #include "World.h"
 
diff --git a/src/PolarSSL++/RsaPrivateKey.cpp b/src/PolarSSL++/RsaPrivateKey.cpp
index 50620ecd4..5705b01f2 100644
--- a/src/PolarSSL++/RsaPrivateKey.cpp
+++ b/src/PolarSSL++/RsaPrivateKey.cpp
@@ -4,8 +4,6 @@
 #include "Globals.h"
 #include "RsaPrivateKey.h"
 #include <polarssl/pk.h>
-#include "CtrDrbgContext.h"
-
 
 
 
diff --git a/src/ProbabDistrib.cpp b/src/ProbabDistrib.cpp
index 7e38d5c12..fbc025eae 100644
--- a/src/ProbabDistrib.cpp
+++ b/src/ProbabDistrib.cpp
@@ -5,8 +5,6 @@
 
 #include "Globals.h"
 #include "ProbabDistrib.h"
-#include "FastRandom.h"
-
 
 
 
diff --git a/src/UI/BeaconWindow.cpp b/src/UI/BeaconWindow.cpp
index c32ace063..93c357600 100644
--- a/src/UI/BeaconWindow.cpp
+++ b/src/UI/BeaconWindow.cpp
@@ -7,7 +7,6 @@
 #include "BeaconWindow.h"
 #include "SlotArea.h"
 #include "../BlockEntities/BeaconEntity.h"
-#include "../Entities/Player.h"
 #include "../ClientHandle.h"
 
 
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 3729e8dc3..94fd958d5 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -15,7 +15,6 @@
 #include "../Entities/Minecart.h"
 #include "../Items/ItemHandler.h"
 #include "AnvilWindow.h"
-#include "Window.h"
 #include "../CraftingRecipes.h"
 #include "../Root.h"
 #include "../FastRandom.h"
diff --git a/src/World.cpp b/src/World.cpp
index fded38169..6a1ff986e 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1,15 +1,12 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "BlockID.h"
 #include "World.h"
 #include "ChunkDef.h"
 #include "ClientHandle.h"
 #include "Server.h"
-#include "Item.h"
 #include "Root.h"
 #include "IniFile.h"
-#include "ChunkMap.h"
 #include "Generating/ChunkDesc.h"
 #include "SetChunkData.h"
 #include "DeadlockDetect.h"
@@ -19,7 +16,6 @@
 #include "WorldStorage/ScoreboardSerializer.h"
 
 // Entities (except mobs):
-#include "Entities/Boat.h"
 #include "Entities/ExpOrb.h"
 #include "Entities/FallingBlock.h"
 #include "Entities/Minecart.h"
@@ -31,7 +27,6 @@
 #include "BlockEntities/BeaconEntity.h"
 
 // Simulators:
-#include "Simulator/SimulatorManager.h"
 #include "Simulator/FloodyFluidSimulator.h"
 #include "Simulator/FluidSimulator.h"
 #include "Simulator/FireSimulator.h"
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 70f268f64..416903f66 100755
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 #include "WSSAnvil.h"
 #include "NBTChunkSerializer.h"
-#include "FastNBT.h"
 #include "EnchantmentSerializer.h"
 #include "zlib/zlib.h"
 #include "json/json.h"
@@ -34,7 +33,6 @@
 #include "../BlockEntities/MobSpawnerEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
 
-#include "../Mobs/Monster.h"
 #include "../Mobs/IncludeAllMonsters.h"
 
 #include "../Entities/Boat.h"