48 files changed, 58 insertions, 59 deletions

diff --git a/src/Authenticator.cpp b/src/Authenticator.cpp
index 9a6dcf51b..3371c2a1a 100644
--- a/src/Authenticator.cpp
+++ b/src/Authenticator.cpp
@@ -6,7 +6,7 @@
 #include "Root.h"
 #include "Server.h"
 
-#include "../iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
 
 #include <sstream>
 
diff --git a/src/Bindings.cpp b/src/Bindings.cpp
index ad3ad8423..cbb50a321 100644
--- a/src/Bindings.cpp
+++ b/src/Bindings.cpp
@@ -16,7 +16,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 #include "tolua_base.h"
 #include "ChunkDef.h"
-#include "../iniFile/iniFile.h"
+#include "lib/iniFile/iniFile.h"
 #include "OSSupport/File.h"
 #include "BlockID.h"
 #include "StringUtils.h"
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index ca2626bc9..3149166fd 100644
--- a/src/BlockEntities/ChestEntity.cpp
+++ b/src/BlockEntities/ChestEntity.cpp
@@ -5,7 +5,7 @@
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../UI/Window.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index ec5ebe8b9..a05dd5956 100644
--- a/src/BlockEntities/FurnaceEntity.cpp
+++ b/src/BlockEntities/FurnaceEntity.cpp
@@ -6,7 +6,7 @@
 #include "../Entities/Player.h"
 #include "../Root.h"
 #include "../Chunk.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index aca376dd3..1b5c03826 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "JukeboxEntity.h"
 #include "../World.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 1b0620299..6bb570133 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "NoteEntity.h"
 #include "../World.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp
index 81f6f6d77..9cbac5679 100644
--- a/src/BlockEntities/SignEntity.cpp
+++ b/src/BlockEntities/SignEntity.cpp
@@ -4,7 +4,7 @@
 // Implements the cSignEntity class representing a single sign in the world
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 #include "SignEntity.h"
 #include "../Entities/Player.h"
 
diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index a4a1ab2d8..003f49848 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "BlockID.h"
-#include "../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "Item.h"
 #include "Mobs/Monster.h"
 
diff --git a/src/Chunk.cpp b/src/Chunk.cpp
index 7e71e9ea7..ec60a19bf 100644
--- a/src/Chunk.cpp
+++ b/src/Chunk.cpp
@@ -10,7 +10,7 @@
 #include "World.h"
 #include "ClientHandle.h"
 #include "Server.h"
-#include "zlib.h"
+#include "../lib/zlib/zlib.h"
 #include "Defines.h"
 #include "BlockEntities/ChestEntity.h"
 #include "BlockEntities/DispenserEntity.h"
@@ -34,7 +34,7 @@
 #include "MobSpawner.h"
 
 
-#include <json/json.h>
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 9d55917e5..5937ee2e4 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -20,8 +20,8 @@
 	#include <cstdlib> // abs
 #endif
 
-#include "zlib.h"
-#include <json/json.h>
+#include "lib/zlib/zlib.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index f37a23f22..f4ddd979c 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -24,8 +24,8 @@
 #include "../Vector3d.h"
 #include "../Vector3f.h"
 
-#include "../../iniFile/iniFile.h"
-#include <json/json.h>
+#include "lib/iniFile/iniFile.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x))
 
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 926120afc..c05778bb1 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "BioGen.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 33c956eba..a7107e325 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -3,7 +3,7 @@
 
 #include "ChunkGenerator.h"
 #include "../World.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
 #include "../Root.h"
 #include "../PluginManager.h"
 #include "ChunkDesc.h"
diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp
index cc2a203af..9b93fcf3b 100644
--- a/src/Generating/CompoGen.cpp
+++ b/src/Generating/CompoGen.cpp
@@ -12,7 +12,7 @@
 #include "../BlockID.h"
 #include "../Item.h"
 #include "../LinearUpscale.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 2637b64e7..40914605a 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -7,7 +7,7 @@
 
 #include "ComposableGenerator.h"
 #include "../World.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
 #include "../Root.h"
 
 // Individual composed algorithms:
diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index 7e46c251e..ae5cd02e8 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -7,7 +7,7 @@
 
 #include "DistortedHeightmap.h"
 #include "../OSSupport/File.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp
index 90a8071fa..750a30f91 100644
--- a/src/Generating/EndGen.cpp
+++ b/src/Generating/EndGen.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "EndGen.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 5dee181b7..9e656d269 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "HeiGen.h"
 #include "../LinearUpscale.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index 03626a800..36ef55e89 100644
--- a/src/Generating/Noise3DGenerator.cpp
+++ b/src/Generating/Noise3DGenerator.cpp
@@ -6,7 +6,7 @@
 #include "Globals.h"
 #include "Noise3DGenerator.h"
 #include "../OSSupport/File.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"
 
diff --git a/src/GroupManager.cpp b/src/GroupManager.cpp
index d7332fd0a..55065b38e 100644
--- a/src/GroupManager.cpp
+++ b/src/GroupManager.cpp
@@ -2,7 +2,7 @@
 
 #include "GroupManager.h"
 #include "Group.h"
-#include "../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "ChatColor.h"
 #include "Root.h"
 
diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h
index fea2a9029..65cdcb3a5 100644
--- a/src/HTTPServer/HTTPServer.h
+++ b/src/HTTPServer/HTTPServer.h
@@ -11,7 +11,7 @@
 
 #include "../OSSupport/ListenThread.h"
 #include "../OSSupport/SocketThreads.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 
 
 
diff --git a/src/Inventory.cpp b/src/Inventory.cpp
index 90b998358..3939598d7 100644
--- a/src/Inventory.cpp
+++ b/src/Inventory.cpp
@@ -9,7 +9,7 @@
 #include "Root.h"
 #include "World.h"
 
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 #include "Items/ItemHandler.h"
 
diff --git a/src/Item.cpp b/src/Item.cpp
index 25664e4df..219edb128 100644
--- a/src/Item.cpp
+++ b/src/Item.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Item.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 #include "Items/ItemHandler.h"
 
 
diff --git a/src/LuaState.cpp b/src/LuaState.cpp
index 644f4972c..3a0008d4f 100644
--- a/src/LuaState.cpp
+++ b/src/LuaState.cpp
@@ -8,7 +8,7 @@
 
 extern "C"
 {
-	#include "lualib.h"
+	#include"lib/lua/src/lualib.h"
 }
 
 #include "tolua++.h"
diff --git a/src/LuaState.h b/src/LuaState.h
index aa71ee226..9a486bfd1 100644
--- a/src/LuaState.h
+++ b/src/LuaState.h
@@ -26,7 +26,7 @@ automatic resource management.
 
 extern "C"
 {
-	#include "lauxlib.h"
+	#include "../lib/lua/src/lauxlib.h"
 }
 
 
diff --git a/src/LuaWindow.cpp b/src/LuaWindow.cpp
index 9011d668c..f49ba2109 100644
--- a/src/LuaWindow.cpp
+++ b/src/LuaWindow.cpp
@@ -8,7 +8,7 @@
 #include "UI/SlotArea.h"
 #include "PluginLua.h"
 #include "Entities/Player.h"
-#include "lauxlib.h"  // Needed for LUA_REFNIL
+#include "lib/lua/src/lauxlib.h" // Needed for LUA_REFNIL
 
 
 
diff --git a/src/ManualBindings.cpp b/src/ManualBindings.cpp
index 02b3347f6..7ea382b76 100644
--- a/src/ManualBindings.cpp
+++ b/src/ManualBindings.cpp
@@ -17,7 +17,7 @@
 #include "BlockEntities/DropperEntity.h"
 #include "BlockEntities/FurnaceEntity.h"
 #include "BlockEntities/HopperEntity.h"
-#include "md5/md5.h"
+#include "lib/md5/md5.h"
 #include "LuaWindow.h"
 #include "LineBlockTracer.h"
 
diff --git a/src/MonsterConfig.cpp b/src/MonsterConfig.cpp
index a5a1ebd49..b72324124 100644
--- a/src/MonsterConfig.cpp
+++ b/src/MonsterConfig.cpp
@@ -3,8 +3,7 @@
 
 #include "MonsterConfig.h"
 #include "Mobs/Monster.h"
-#include "../iniFile/iniFile.h"
-//#include <cstdio>
+#include "../lib/inifile/iniFile.h"
 
 
 
diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h
index e5aa68afa..df86717f6 100644
--- a/src/OSSupport/GZipFile.h
+++ b/src/OSSupport/GZipFile.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "zlib.h"
+#include "../lib/zlib/zlib.h"
 
 
 
diff --git a/src/PluginLua.cpp b/src/PluginLua.cpp
index 23d079b05..0afd3844a 100644
--- a/src/PluginLua.cpp
+++ b/src/PluginLua.cpp
@@ -11,7 +11,7 @@
 
 extern "C"
 {
-	#include "lualib.h"
+	#include"lib/lua/src/lualib.h"
 }
 
 #include "tolua++.h"
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index e08ebe503..f9d8d7d02 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -10,7 +10,7 @@
 #include "Server.h"
 #include "CommandOutput.h"
 
-#include "../iniFile/iniFile.h"
+#include "lib/iniFile/iniFile.h"
 #include "tolua++.h"
 #include "Entities/Player.h"
 
diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index 2a9230fee..c83a87ca9 100644
--- a/src/Protocol/ChunkDataSerializer.cpp
+++ b/src/Protocol/ChunkDataSerializer.cpp
@@ -7,7 +7,7 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "zlib.h"
+#include "../lib/zlib/zlib.h"
 
 
 
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 22eac4312..bfa8eb412 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -4,14 +4,14 @@
 // Implements the cProtocol132 class representing the release 1.3.2 protocol (#39)
 
 #include "Globals.h"
+#include "ChunkDataSerializer.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
 #include "../World.h"
 #include "../ClientHandle.h"
-#include "../../CryptoPP/randpool.h"
+#include "../lib/cryptopp/randpool.h"
 #include "../Item.h"
-#include "ChunkDataSerializer.h"
 #include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
 #include "../UI/Window.h"
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index dc4d8aeef..58e98c208 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "Protocol125.h"
-#include "../../CryptoPP/modes.h"
-#include "../../CryptoPP/aes.h"
+#include "../lib/cryptopp/modes.h"
+#include "../lib/cryptopp/aes.h"
 
 
 
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index d2582458b..9fb2a8133 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Root.h"
 #include "../Server.h"
 #include "../ClientHandle.h"
-#include "../../CryptoPP/randpool.h"
+#include "../lib/cryptopp/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
 #include "../Entities/Player.h"
diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h
index e3f2ad922..b55bbf80b 100644
--- a/src/Protocol/Protocol17x.h
+++ b/src/Protocol/Protocol17x.h
@@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes:
 
 #include "Protocol.h"
 #include "../ByteBuffer.h"
-#include "../../CryptoPP/modes.h"
-#include "../../CryptoPP/aes.h"
+#include "../lib/cryptopp/modes.h"
+#include "../lib/cryptopp/aes.h"
 
 
 
diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp
index 3f86a7ca2..f90e9f191 100644
--- a/src/RCONServer.cpp
+++ b/src/RCONServer.cpp
@@ -4,7 +4,7 @@
 // Implements the cRCONServer class representing the RCON server
 
 #include "Globals.h"
-#include "../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 #include "RCONServer.h"
 #include "Server.h"
 #include "Root.h"
diff --git a/src/Root.cpp b/src/Root.cpp
index 5bb04abfb..282227525 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -19,7 +19,7 @@
 #include "DeadlockDetect.h"
 #include "OSSupport/Timer.h"
 
-#include "../iniFile/iniFile.h"
+#include "lib/iniFile/iniFile.h"
 
 #ifdef _WIN32
 	#include <psapi.h>
diff --git a/src/Server.cpp b/src/Server.cpp
index fe8076631..5f0e007d7 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -23,7 +23,7 @@
 
 #include "MersenneTwister.h"
 
-#include "../iniFile/iniFile.h"
+#include "lib/iniFile/iniFile.h"
 #include "Vector3f.h"
 
 #include <fstream>
@@ -31,7 +31,7 @@
 #include <iostream>
 
 extern "C" {
-	#include "zlib.h"
+	#include "lib/zlib/zlib.h"
 }
 
 
diff --git a/src/Server.h b/src/Server.h
index 1b4848318..93a978654 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -11,8 +11,8 @@
 
 #include "OSSupport/SocketThreads.h"
 #include "OSSupport/ListenThread.h"
-#include "CryptoPP/rsa.h"
-#include "CryptoPP/randpool.h"
+#include "../lib/cryptopp/rsa.h"
+#include "../lib/cryptopp/randpool.h"
 #include "RCONServer.h"
 
 
diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h
index e1d88f1c5..9d3ad4131 100644
--- a/src/Simulator/Simulator.h
+++ b/src/Simulator/Simulator.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "../Vector3i.h"
-#include "../../iniFile/iniFile.h"
+#include "../lib/inifile/iniFile.h"
 
 
 
diff --git a/src/StringCompression.h b/src/StringCompression.h
index 8afdf59e0..1257d7d6b 100644
--- a/src/StringCompression.h
+++ b/src/StringCompression.h
@@ -3,7 +3,7 @@
 
 // Interfaces to the wrapping functions for compression and decompression using AString as their data
 
-#include "zlib.h"  // Needed for the Z_XXX return values
+#include "../lib/zlib/zlib.h"  // Needed for the Z_XXX return values
 
 
 
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index dc6ea850e..0bceb9f82 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -7,7 +7,7 @@
 
 #include "OSSupport/Socket.h"
 #include "LuaState.h"
-#include "../iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
 #include "HTTPServer/HTTPServer.h"
 #include "HTTPServer/HTTPFormParser.h"
 
diff --git a/src/World.cpp b/src/World.cpp
index 531952e37..96111ab57 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -8,7 +8,7 @@
 #include "Server.h"
 #include "Item.h"
 #include "Root.h"
-#include "../iniFile/iniFile.h"
+#include "../lib/iniFile/iniFile.h"
 #include "ChunkMap.h"
 #include "OSSupport/Timer.h"
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index b2e104a78..ee7511486 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -7,7 +7,7 @@
 #include "WSSAnvil.h"
 #include "NBTChunkSerializer.h"
 #include "../World.h"
-#include "zlib.h"
+#include "../lib/zlib/zlib.h"
 #include "../BlockID.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DispenserEntity.h"
diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp
index 694f3ed1d..812c60411 100644
--- a/src/WorldStorage/WSSCompact.cpp
+++ b/src/WorldStorage/WSSCompact.cpp
@@ -6,8 +6,8 @@
 #include "Globals.h"
 #include "WSSCompact.h"
 #include "../World.h"
-#include "zlib.h"
-#include <json/json.h>
+#include "../lib/zlib/zlib.h"
+#include "../lib/jsoncpp/include/json/json.h"
 #include "../StringCompression.h"
 #include "../BlockEntities/ChestEntity.h"
 #include "../BlockEntities/DispenserEntity.h"
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index bf8dbd3d5..384ade081 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -16,7 +16,7 @@
 
 #include "../ChunkDef.h"
 #include "../OSSupport/IsThread.h"
-#include <json/json.h>
+#include "../lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/tolua++.h b/src/tolua++.h
index ed5344926..dff1e91be 100644
--- a/src/tolua++.h
+++ b/src/tolua++.h
@@ -43,8 +43,8 @@ extern "C" {
 
 typedef int lua_Object;
 
-#include "lua.h"
-#include "lauxlib.h"
+#include "../lib/lua/src/lua.h"
+#include "../lib/lua/src/lauxlib.h"
 
 struct tolua_Error
 {