31 files changed, 54 insertions, 38 deletions

diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj
index 7355ab64b..4a7898e4a 100644
--- a/VC2013/CryptoPP.vcxproj
+++ b/VC2013/CryptoPP.vcxproj
@@ -814,6 +814,7 @@
     <ClInclude Include="..\lib\cryptopp\des.h" />
     <ClInclude Include="..\lib\cryptopp\dh.h" />
     <ClInclude Include="..\lib\cryptopp\dh2.h" />
+    <ClInclude Include="..\lib\cryptopp\dll.h" />
     <ClInclude Include="..\lib\cryptopp\dmac.h" />
     <ClInclude Include="..\lib\cryptopp\dsa.h" />
     <ClInclude Include="..\lib\cryptopp\eax.h" />
@@ -824,6 +825,7 @@
     <ClInclude Include="..\lib\cryptopp\emsa2.h" />
     <ClInclude Include="..\lib\cryptopp\eprecomp.h" />
     <ClInclude Include="..\lib\cryptopp\esign.h" />
+    <ClInclude Include="..\lib\cryptopp\factory.h" />
     <ClInclude Include="..\lib\cryptopp\files.h" />
     <ClInclude Include="..\lib\cryptopp\filters.h" />
     <ClInclude Include="..\lib\cryptopp\fips140.h" />
@@ -866,6 +868,7 @@
     <ClInclude Include="..\lib\cryptopp\queue.h" />
     <ClInclude Include="..\lib\cryptopp\rabin.h" />
     <ClInclude Include="..\lib\cryptopp\randpool.h" />
+    <ClInclude Include="..\lib\cryptopp\resource.h" />
     <ClInclude Include="..\lib\cryptopp\rijndael.h" />
     <ClInclude Include="..\lib\cryptopp\rng.h" />
     <ClInclude Include="..\lib\cryptopp\rsa.h" />
@@ -888,6 +891,7 @@
     <ClInclude Include="..\lib\cryptopp\trdlocal.h" />
     <ClInclude Include="..\lib\cryptopp\trunhash.h" />
     <ClInclude Include="..\lib\cryptopp\ttmac.h" />
+    <ClInclude Include="..\lib\cryptopp\validate.h" />
     <ClInclude Include="..\lib\cryptopp\vmac.h" />
     <ClInclude Include="..\lib\cryptopp\wait.h" />
     <ClInclude Include="..\lib\cryptopp\wake.h" />
diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters
index f066c5ef4..e8bea416f 100644
--- a/VC2013/CryptoPP.vcxproj.filters
+++ b/VC2013/CryptoPP.vcxproj.filters
@@ -580,6 +580,18 @@
     <ClInclude Include="..\lib\cryptopp\words.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\cryptopp\dll.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\cryptopp\factory.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\cryptopp\resource.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\lib\cryptopp\validate.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\lib\cryptopp\Doxyfile">
diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj
index d4395b2d2..24f58f28c 100644
--- a/VC2013/Lua.vcxproj
+++ b/VC2013/Lua.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug profiled|Win32">
@@ -138,7 +138,7 @@
     <ClCompile Include="..\lib\lua\src\ldebug.c" />
     <ClCompile Include="..\lib\lua\src\ldo.c" />
     <ClCompile Include="..\lib\lua\src\ldump.c" />
-    <ClCompile Include="..\lib\luaO\src\lfunc.c" />
+    <ClCompile Include="..\lib\lua\src\lfunc.c" />
     <ClCompile Include="..\lib\lua\src\lgc.c" />
     <ClCompile Include="..\lib\lua\src\linit.c" />
     <ClCompile Include="..\lib\lua\src\liolib.c" />
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index ba2ca72d7..c9fe5c67c 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug profiled|Win32">
@@ -85,7 +85,7 @@
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/lib/luaexpat/lxplib.c b/lib/luaexpat/lxplib.c
index 053c59a34..a81a434e9 100644
--- a/lib/luaexpat/lxplib.c
+++ b/lib/luaexpat/lxplib.c
@@ -9,10 +9,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../lib/expat/expat.h"
+#include "lib/expat/expat.h"
 
-#include "../lib/lua/src/lua.h"
-#include "../lib/lua/src/lauxlib.h"
+#include "lib/lua/src/lua.h"
+#include "lib/lua/src/lauxlib.h"
 
 
 #include "lxplib.h"
diff --git a/lib/sqlite/lsqlite3.c b/lib/sqlite/lsqlite3.c
index 8098311ac..f896daf23 100644
--- a/lib/sqlite/lsqlite3.c
+++ b/lib/sqlite/lsqlite3.c
@@ -44,8 +44,8 @@ extern "C" {
 #include <assert.h>
 
 #define LUA_LIB
-#include "../lib/lua/src/lua.h"
-#include "../lib/lua/src/lauxlib.h"
+#include "lib/lua/src/lua.h"
+#include "lib/lua/src/lauxlib.h"
 
 #if LUA_VERSION_NUM > 501
 //
diff --git a/lib/tolua++/include/tolua++.h b/lib/tolua++/include/tolua++.h
index ed5344926..a60dde635 100644
--- a/lib/tolua++/include/tolua++.h
+++ b/lib/tolua++/include/tolua++.h
@@ -43,8 +43,8 @@ extern "C" {
 
 typedef int lua_Object;
 
-#include "lua.h"
-#include "lauxlib.h"
+#include "../../lua/src/lua.h
+#include "../../lua/src/lauxlib.h"
 
 struct tolua_Error
 {
diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 3149166fd..0bde5c9f2 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 "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index a05dd5956..d49e4f53b 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 "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index 1b5c03826..8e90ee70d 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "JukeboxEntity.h"
 #include "../World.h"
-#include "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 6bb570133..493316bce 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -3,7 +3,7 @@
 
 #include "NoteEntity.h"
 #include "../World.h"
-#include "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp
index 9cbac5679..39fcb6efc 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 "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"
 #include "SignEntity.h"
 #include "../Entities/Player.h"
 
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index c05778bb1..4dff50918 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "BioGen.h"
-#include "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index a7107e325..cb993bb05 100644
--- a/src/Generating/ChunkGenerator.cpp
+++ b/src/Generating/ChunkGenerator.cpp
@@ -3,7 +3,7 @@
 
 #include "ChunkGenerator.h"
 #include "../World.h"
-#include "../lib/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 9b93fcf3b..7e1ade147 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 "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 40914605a..496ada52d 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -7,7 +7,7 @@
 
 #include "ComposableGenerator.h"
 #include "../World.h"
-#include "../lib/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 ae5cd02e8..6fbe7c1d4 100644
--- a/src/Generating/DistortedHeightmap.cpp
+++ b/src/Generating/DistortedHeightmap.cpp
@@ -7,7 +7,7 @@
 
 #include "DistortedHeightmap.h"
 #include "../OSSupport/File.h"
-#include "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp
index 750a30f91..121ed4488 100644
--- a/src/Generating/EndGen.cpp
+++ b/src/Generating/EndGen.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "EndGen.h"
-#include "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 9e656d269..9cc1fbbaa 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 "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index 36ef55e89..9760ca4ca 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 "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"
 
diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h
index 65cdcb3a5..ed7a03519 100644
--- a/src/HTTPServer/HTTPServer.h
+++ b/src/HTTPServer/HTTPServer.h
@@ -11,7 +11,7 @@
 
 #include "../OSSupport/ListenThread.h"
 #include "../OSSupport/SocketThreads.h"
-#include "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 
 
 
diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h
index df86717f6..dcc171a2a 100644
--- a/src/OSSupport/GZipFile.h
+++ b/src/OSSupport/GZipFile.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../lib/zlib/zlib.h"
+#include "lib/zlib/zlib.h"
 
 
 
diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index c83a87ca9..d406b8b51 100644
--- a/src/Protocol/ChunkDataSerializer.cpp
+++ b/src/Protocol/ChunkDataSerializer.cpp
@@ -7,7 +7,7 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "../lib/zlib/zlib.h"
+#include "lib/zlib/zlib.h"
 
 
 
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index bfa8eb412..8f7891e4b 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -5,12 +5,12 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
+#include "lib/cryptopp/randpool.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
 #include "../World.h"
 #include "../ClientHandle.h"
-#include "../lib/cryptopp/randpool.h"
 #include "../Item.h"
 #include "../Entities/Player.h"
 #include "../Mobs/Monster.h"
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index 58e98c208..2023d7960 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -10,8 +10,8 @@
 #pragma once
 
 #include "Protocol125.h"
-#include "../lib/cryptopp/modes.h"
-#include "../lib/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 9fb2a8133..ea406d7a2 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 "../lib/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 b55bbf80b..449727854 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 "../lib/cryptopp/modes.h"
-#include "../lib/cryptopp/aes.h"
+#include "lib/cryptopp/modes.h"
+#include "lib/cryptopp/aes.h"
 
 
 
diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h
index 9d3ad4131..4f555693d 100644
--- a/src/Simulator/Simulator.h
+++ b/src/Simulator/Simulator.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include "../Vector3i.h"
-#include "../lib/inifile/iniFile.h"
+#include "lib/inifile/iniFile.h"
 
 
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index ee7511486..48163e222 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 "../lib/zlib/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 812c60411..dafa4d1b5 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 "../lib/zlib/zlib.h"
-#include "../lib/jsoncpp/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 384ade081..b2c6dfb4b 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -16,7 +16,7 @@
 
 #include "../ChunkDef.h"
 #include "../OSSupport/IsThread.h"
-#include "../lib/jsoncpp/include/json/json.h"
+#include "lib/jsoncpp/include/json/json.h"