26 files changed, 30 insertions, 30 deletions

diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp
index 0bde5c9f2..918a1df2d 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 "jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp
index d49e4f53b..0123709bc 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 "jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index 8e90ee70d..b01d01391 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 "jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 493316bce..0bae15777 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 "jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp
index 39fcb6efc..2e1fc1f8c 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 "jsoncpp/include/json/json.h"
 #include "SignEntity.h"
 #include "../Entities/Player.h"
 
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 5937ee2e4..c58b6b2fa 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -20,8 +20,8 @@
 	#include <cstdlib> // abs
 #endif
 
-#include "lib/zlib/zlib.h"
-#include "lib/jsoncpp/include/json/json.h"
+#include "zlib/zlib.h"
+#include "jsoncpp/include/json/json.h"
 
 
 
diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 4dff50918..1cd7c70e7 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 "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp
index 82ca55388..f28504441 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 "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 7e1ade147..03a65a457 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 "inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index c7875b5a5..01070963c 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 "inifile/iniFile.h"
 #include "../Root.h"
 
 // Individual composed algorithms:
diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp
index 6fbe7c1d4..95ea812fa 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 "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp
index 121ed4488..1fa0fa121 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 "inifile/iniFile.h"
 #include "../LinearUpscale.h"
 
 
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 9cc1fbbaa..8aab3fe15 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 "inifile/iniFile.h"
 
 
 
diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp
index 9760ca4ca..0c68957c0 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 "inifile/iniFile.h"
 #include "../LinearInterpolation.h"
 #include "../LinearUpscale.h"
 
diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h
index dcc171a2a..dfb4e8c31 100644
--- a/src/OSSupport/GZipFile.h
+++ b/src/OSSupport/GZipFile.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "lib/zlib/zlib.h"
+#include "zlib/zlib.h"
 
 
 
diff --git a/src/PluginLua.cpp b/src/PluginLua.cpp
index 0afd3844a..4ddf191ac 100644
--- a/src/PluginLua.cpp
+++ b/src/PluginLua.cpp
@@ -11,7 +11,7 @@
 
 extern "C"
 {
-	#include"lib/lua/src/lualib.h"
+	#include "lua/src/lualib.h"
 }
 
 #include "tolua++.h"
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index 1856ce6af..bb6f2a24b 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -10,7 +10,7 @@
 #include "Server.h"
 #include "CommandOutput.h"
 
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "tolua++.h"
 #include "Entities/Player.h"
 
diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp
index d406b8b51..78318a5ee 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 "zlib/zlib.h"
 
 
 
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 8f7891e4b..d8f450588 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "lib/cryptopp/randpool.h"
+#include "cryptopp/randpool.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index ea406d7a2..28122034c 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 "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 6b897fd57..9c1eaa99a 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 "cryptopp/modes.h"
+#include "cryptopp/aes.h"
 
 
 
diff --git a/src/Server.cpp b/src/Server.cpp
index 183a0648f..5951dc5b5 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -23,7 +23,7 @@
 
 #include "MersenneTwister.h"
 
-#include "lib/inifile/iniFile.h"
+#include "inifile/iniFile.h"
 #include "Vector3f.h"
 
 #include <fstream>
@@ -31,7 +31,7 @@
 #include <iostream>
 
 extern "C" {
-	#include "lib/zlib/zlib.h"
+	#include "zlib/zlib.h"
 }
 
 
diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h
index 4f555693d..5cd0e8657 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 "inifile/iniFile.h"
 
 
 
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 48163e222..79be4dfa2 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 "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 dafa4d1b5..ced84836f 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 "zlib/zlib.h"
+#include "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 b2c6dfb4b..720c04759 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 "jsoncpp/include/json/json.h"