diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
index 36243bc92..02aa15be4 100644
--- a/src/Bindings/DeprecatedBindings.cpp
+++ b/src/Bindings/DeprecatedBindings.cpp
@@ -5,11 +5,6 @@
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 
-#include "Plugin.h"
-#include "PluginLua.h"
-#include "PluginManager.h"
-#include "LuaWindow.h"
-#include "LuaChunkStay.h"
 
 #include "../BlockInfo.h"
 
diff --git a/src/Bindings/LuaChunkStay.cpp b/src/Bindings/LuaChunkStay.cpp
index 154bcb200..a3d3a8090 100644
--- a/src/Bindings/LuaChunkStay.cpp
+++ b/src/Bindings/LuaChunkStay.cpp
@@ -6,7 +6,6 @@
 #include "Globals.h"
 #include "LuaChunkStay.h"
 #include "PluginLua.h"
-#include "../World.h"
 
 
 
diff --git a/src/Bindings/LuaChunkStay.h b/src/Bindings/LuaChunkStay.h
index 49ab9a0ad..d76b67de9 100644
--- a/src/Bindings/LuaChunkStay.h
+++ b/src/Bindings/LuaChunkStay.h
@@ -18,6 +18,7 @@
 
 // fwd:
 class cPluginLua;
+class cChunkMap;
 
 
 
diff --git a/src/Bindings/LuaState.h b/src/Bindings/LuaState.h
index 44f187701..094a200e0 100644
--- a/src/Bindings/LuaState.h
+++ b/src/Bindings/LuaState.h
@@ -56,7 +56,6 @@ struct HTTPRequest;
 class cWebAdmin;
 struct HTTPTemplateRequest;
 class cTNTEntity;
-class cCreeper;
 class cHopperEntity;
 class cBlockEntity;
 class cBoundingBox;
diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp
index 1a2582ab0..c4d03b86b 100644
--- a/src/Bindings/LuaWindow.cpp
+++ b/src/Bindings/LuaWindow.cpp
@@ -6,7 +6,6 @@
 #include "LuaWindow.h"
 #include "../UI/SlotArea.h"
 #include "PluginLua.h"
-#include "../Entities/Player.h"
 #include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
 
 
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index b7ea65759..d8134f159 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -5,7 +5,6 @@
 #undef TOLUA_TEMPLATE_BIND
 #include "tolua++/include/tolua++.h"
 #include "polarssl/md5.h"
-#include "Plugin.h"
 #include "PluginLua.h"
 #include "PluginManager.h"
 #include "LuaWindow.h"
@@ -27,7 +26,6 @@
 #include "../BlockEntities/MobHeadEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
 #include "../LineBlockTracer.h"
-#include "../Protocol/Authenticator.h"
 #include "../WorldStorage/SchematicFileSerializer.h"
 #include "../CompositeChat.h"
 
diff --git a/src/Bindings/Plugin.h b/src/Bindings/Plugin.h
index c9a53346d..9c10a1d56 100644
--- a/src/Bindings/Plugin.h
+++ b/src/Bindings/Plugin.h
@@ -1,23 +1,27 @@
 
 #pragma once
 
-#include "PluginManager.h"
-
-
+//#include "PluginManager.h"
+
+#include "Defines.h"
+
+class cCommandOutputCallback;
+class cItems;
+class cHopperEntity;
 
 
 
+class cBlockEntityWithItems;
 class cClientHandle;
-class cPlayer;
 class cPickup;
-class cItem;
+class cPlayer;
+class cProjectileEntity;
 class cEntity;
+class cMonster;
 class cWorld;
 class cChunkDesc;
 struct TakeDamageInfo;
 
-// fwd: cPlayer.h
-class cPlayer;
 
 // fwd: CraftingRecipes.h
 class cCraftingGrid;
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp
index 2c2d05547..2629eb641 100644
--- a/src/Bindings/PluginLua.cpp
+++ b/src/Bindings/PluginLua.cpp
@@ -12,10 +12,12 @@
 #endif
 #include "PluginLua.h"
 #include "../CommandOutput.h"
+#include "PluginManager.h"
+#include "../Item.h"
 
 extern "C"
 {
-	#include "lua/src/lualib.h"
+	#include "lua/src/lauxlib.h"
 }
 
 #undef TOLUA_TEMPLATE_BIND
diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp
index f62e6ae02..e0faa838a 100644
--- a/src/Bindings/PluginManager.cpp
+++ b/src/Bindings/PluginManager.cpp
@@ -4,12 +4,10 @@
 #include "PluginManager.h"
 #include "Plugin.h"
 #include "PluginLua.h"
-#include "../WebAdmin.h"
 #include "../Item.h"
 #include "../Root.h"
 #include "../Server.h"
 #include "../CommandOutput.h"
-#include "../ChatColor.h"
 
 #include "inifile/iniFile.h"
 #include "../Entities/Player.h"
diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h
index cef6619d7..fff3bc323 100644
--- a/src/Bindings/PluginManager.h
+++ b/src/Bindings/PluginManager.h
@@ -1,9 +1,8 @@
 
 #pragma once
 
-#include "../Item.h"
-
 
+#include "Defines.h"
 
 
 
@@ -36,7 +35,6 @@ class cPickup;
 
 // fwd: Pawn.h
 struct TakeDamageInfo;
-class cPawn;
 
 // fwd: CommandOutput.h
 class cCommandOutputCallback;
@@ -49,6 +47,8 @@ class cBlockEntityWithItems;
 
 
 
+class cItems;
+
 
 
 // tolua_begin