5 files changed, 30 insertions, 30 deletions

diff --git a/Tools/AnvilStats/AnvilStats.vcproj b/Tools/AnvilStats/AnvilStats.vcproj
index 038f32b97..c7a2e9390 100644
--- a/Tools/AnvilStats/AnvilStats.vcproj
+++ b/Tools/AnvilStats/AnvilStats.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\zlib-1.2.7&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\lib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\zlib-1.2.7&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -196,7 +196,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\zlib-1.2.7&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\lib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -374,27 +374,27 @@
 			Name="shared"
 			>
 			<File
-				RelativePath="..\..\source\OSSupport\CriticalSection.cpp"
+				RelativePath="..\..\src\OSSupport\CriticalSection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\CriticalSection.h"
+				RelativePath="..\..\src\OSSupport\CriticalSection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\Endianness.h"
+				RelativePath="..\..\src\Endianness.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\Event.cpp"
+				RelativePath="..\..\src\OSSupport\Event.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\Event.h"
+				RelativePath="..\..\src\OSSupport\Event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\WorldStorage\FastNBT.cpp"
+				RelativePath="..\..\src\WorldStorage\FastNBT.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -422,39 +422,39 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\source\WorldStorage\FastNBT.h"
+				RelativePath="..\..\src\WorldStorage\FastNBT.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\File.cpp"
+				RelativePath="..\..\src\OSSupport\File.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\File.h"
+				RelativePath="..\..\src\OSSupport\File.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\GZipFile.cpp"
+				RelativePath="..\..\src\OSSupport\GZipFile.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\GZipFile.h"
+				RelativePath="..\..\src\OSSupport\GZipFile.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\IsThread.cpp"
+				RelativePath="..\..\src\OSSupport\IsThread.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\OSSupport\IsThread.h"
+				RelativePath="..\..\src\OSSupport\IsThread.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\StringUtils.cpp"
+				RelativePath="..\..\src\StringUtils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\source\StringUtils.h"
+				RelativePath="..\..\src\StringUtils.h"
 				>
 			</File>
 		</Filter>
diff --git a/Tools/AnvilStats/ChunkExtract.cpp b/Tools/AnvilStats/ChunkExtract.cpp
index 71e804e73..96287ebef 100644
--- a/Tools/AnvilStats/ChunkExtract.cpp
+++ b/Tools/AnvilStats/ChunkExtract.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "ChunkExtract.h"
-#include "../../source/OSSupport/GZipFile.h"
+#include "../../src/OSSupport/GZipFile.h"
 
 
 
diff --git a/Tools/AnvilStats/Globals.h b/Tools/AnvilStats/Globals.h
index 48e1f8492..c673ecb01 100644
--- a/Tools/AnvilStats/Globals.h
+++ b/Tools/AnvilStats/Globals.h
@@ -163,12 +163,12 @@ typedef unsigned short     UInt16;
 
 
 // Common headers (part 1, without macros):
-#include "../../source/StringUtils.h"
-#include "../../source/OSSupport/CriticalSection.h"
-#include "../../source/OSSupport/Semaphore.h"
-#include "../../source/OSSupport/Event.h"
-#include "../../source/OSSupport/IsThread.h"
-#include "../../source/OSSupport/File.h"
+#include "../../src/StringUtils.h"
+#include "../../src/OSSupport/CriticalSection.h"
+#include "../../src/OSSupport/Semaphore.h"
+#include "../../src/OSSupport/Event.h"
+#include "../../src/OSSupport/IsThread.h"
+#include "../../src/OSSupport/File.h"
 
 
 
@@ -221,8 +221,8 @@ public:
 
 
 // Common headers (part 2, with macros):
-#include "../../source/ChunkDef.h"
-#include "../../source/BlockID.h"
+#include "../../src/ChunkDef.h"
+#include "../../src/BlockID.h"
 
 
 
diff --git a/Tools/AnvilStats/Processor.cpp b/Tools/AnvilStats/Processor.cpp
index 4ecd685ad..a16f78c18 100644
--- a/Tools/AnvilStats/Processor.cpp
+++ b/Tools/AnvilStats/Processor.cpp
@@ -6,8 +6,8 @@
 #include "Globals.h"
 #include "Processor.h"
 #include "Callback.h"
-#include "../../source/WorldStorage/FastNBT.h"
-#include "zlib.h"
+#include "../../src/WorldStorage/FastNBT.h"
+#include "zlib/zlib.h"
 #include "Utils.h"
 
 
diff --git a/Tools/AnvilStats/Statistics.cpp b/Tools/AnvilStats/Statistics.cpp
index b5b3cb176..f7519fd37 100644
--- a/Tools/AnvilStats/Statistics.cpp
+++ b/Tools/AnvilStats/Statistics.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "Statistics.h"
-#include "../../source/WorldStorage/FastNBT.h"
+#include "../../src/WorldStorage/FastNBT.h"