30 files changed, 57 insertions, 57 deletions
diff --git a/plugins/Zlib/zlib.rc b/plugins/Zlib/res/zlib.rc
index 5a6a964e7b..78853d3024 100644
--- a/plugins/Zlib/zlib.rc
+++ b/plugins/Zlib/res/zlib.rc
@@ -1,5 +1,5 @@
 #include <winver.h>
-#include "zlib.h"
+#include "..\src\zlib.h"
 
 #ifdef GCC_WINDRES
 VS_VERSION_INFO		VERSIONINFO
diff --git a/plugins/Zlib/adler32.c b/plugins/Zlib/src/adler32.c
index a868f073d8..a868f073d8 100644
--- a/plugins/Zlib/adler32.c
+++ b/plugins/Zlib/src/adler32.c
diff --git a/plugins/Zlib/compress.c b/plugins/Zlib/src/compress.c
index ea4dfbe9d7..ea4dfbe9d7 100644
--- a/plugins/Zlib/compress.c
+++ b/plugins/Zlib/src/compress.c
diff --git a/plugins/Zlib/crc32.c b/plugins/Zlib/src/crc32.c
index 979a7190a3..979a7190a3 100644
--- a/plugins/Zlib/crc32.c
+++ b/plugins/Zlib/src/crc32.c
diff --git a/plugins/Zlib/crc32.h b/plugins/Zlib/src/crc32.h
index 9e0c778102..9e0c778102 100644
--- a/plugins/Zlib/crc32.h
+++ b/plugins/Zlib/src/crc32.h
diff --git a/plugins/Zlib/deflate.c b/plugins/Zlib/src/deflate.c
index 9e4c2cbc8a..9e4c2cbc8a 100644
--- a/plugins/Zlib/deflate.c
+++ b/plugins/Zlib/src/deflate.c
diff --git a/plugins/Zlib/deflate.h b/plugins/Zlib/src/deflate.h
index fbac44d908..fbac44d908 100644
--- a/plugins/Zlib/deflate.h
+++ b/plugins/Zlib/src/deflate.h
diff --git a/plugins/Zlib/gzclose.c b/plugins/Zlib/src/gzclose.c
index caeb99a317..caeb99a317 100644
--- a/plugins/Zlib/gzclose.c
+++ b/plugins/Zlib/src/gzclose.c
diff --git a/plugins/Zlib/gzguts.h b/plugins/Zlib/src/gzguts.h
index ee3f281aa5..ee3f281aa5 100644
--- a/plugins/Zlib/gzguts.h
+++ b/plugins/Zlib/src/gzguts.h
diff --git a/plugins/Zlib/gzlib.c b/plugins/Zlib/src/gzlib.c
index fbd5faea85..fbd5faea85 100644
--- a/plugins/Zlib/gzlib.c
+++ b/plugins/Zlib/src/gzlib.c
diff --git a/plugins/Zlib/gzread.c b/plugins/Zlib/src/gzread.c
index c0a179437b..c0a179437b 100644
--- a/plugins/Zlib/gzread.c
+++ b/plugins/Zlib/src/gzread.c
diff --git a/plugins/Zlib/gzwrite.c b/plugins/Zlib/src/gzwrite.c
index 50c9311c4e..50c9311c4e 100644
--- a/plugins/Zlib/gzwrite.c
+++ b/plugins/Zlib/src/gzwrite.c
diff --git a/plugins/Zlib/infback.c b/plugins/Zlib/src/infback.c
index 981aff17c2..981aff17c2 100644
--- a/plugins/Zlib/infback.c
+++ b/plugins/Zlib/src/infback.c
diff --git a/plugins/Zlib/inffast.c b/plugins/Zlib/src/inffast.c
index 2f1d60b43b..2f1d60b43b 100644
--- a/plugins/Zlib/inffast.c
+++ b/plugins/Zlib/src/inffast.c
diff --git a/plugins/Zlib/inffast.h b/plugins/Zlib/src/inffast.h
index e5c1aa4ca8..e5c1aa4ca8 100644
--- a/plugins/Zlib/inffast.h
+++ b/plugins/Zlib/src/inffast.h
diff --git a/plugins/Zlib/inffixed.h b/plugins/Zlib/src/inffixed.h
index d628327769..d628327769 100644
--- a/plugins/Zlib/inffixed.h
+++ b/plugins/Zlib/src/inffixed.h
diff --git a/plugins/Zlib/inflate.c b/plugins/Zlib/src/inflate.c
index 47418a1e1e..47418a1e1e 100644
--- a/plugins/Zlib/inflate.c
+++ b/plugins/Zlib/src/inflate.c
diff --git a/plugins/Zlib/inflate.h b/plugins/Zlib/src/inflate.h
index 95f4986d40..95f4986d40 100644
--- a/plugins/Zlib/inflate.h
+++ b/plugins/Zlib/src/inflate.h
diff --git a/plugins/Zlib/inftrees.c b/plugins/Zlib/src/inftrees.c
index abcd7c45ed..abcd7c45ed 100644
--- a/plugins/Zlib/inftrees.c
+++ b/plugins/Zlib/src/inftrees.c
diff --git a/plugins/Zlib/inftrees.h b/plugins/Zlib/src/inftrees.h
index baa53a0b1a..baa53a0b1a 100644
--- a/plugins/Zlib/inftrees.h
+++ b/plugins/Zlib/src/inftrees.h
diff --git a/plugins/Zlib/trees.c b/plugins/Zlib/src/trees.c
index 8c32b214b1..8c32b214b1 100644
--- a/plugins/Zlib/trees.c
+++ b/plugins/Zlib/src/trees.c
diff --git a/plugins/Zlib/trees.h b/plugins/Zlib/src/trees.h
index d35639d82a..d35639d82a 100644
--- a/plugins/Zlib/trees.h
+++ b/plugins/Zlib/src/trees.h
diff --git a/plugins/Zlib/uncompr.c b/plugins/Zlib/src/uncompr.c
index ad98be3a5d..ad98be3a5d 100644
--- a/plugins/Zlib/uncompr.c
+++ b/plugins/Zlib/src/uncompr.c
diff --git a/plugins/Zlib/zconf.h b/plugins/Zlib/src/zconf.h
index 8a46a58b30..8a46a58b30 100644
--- a/plugins/Zlib/zconf.h
+++ b/plugins/Zlib/src/zconf.h
diff --git a/plugins/Zlib/zlib.def b/plugins/Zlib/src/zlib.def
index 04896150e4..04896150e4 100644
--- a/plugins/Zlib/zlib.def
+++ b/plugins/Zlib/src/zlib.def
diff --git a/plugins/Zlib/zlib.h b/plugins/Zlib/src/zlib.h
index 3edf3acdb5..3edf3acdb5 100644
--- a/plugins/Zlib/zlib.h
+++ b/plugins/Zlib/src/zlib.h
diff --git a/plugins/Zlib/zutil.c b/plugins/Zlib/src/zutil.c
index 65e0d3b72b..65e0d3b72b 100644
--- a/plugins/Zlib/zutil.c
+++ b/plugins/Zlib/src/zutil.c
diff --git a/plugins/Zlib/zutil.h b/plugins/Zlib/src/zutil.h
index 67771583ac..67771583ac 100644
--- a/plugins/Zlib/zutil.h
+++ b/plugins/Zlib/src/zutil.h
diff --git a/plugins/Zlib/zlib_10.vcxproj b/plugins/Zlib/zlib_10.vcxproj
index 8af900a025..5828e300b4 100644
--- a/plugins/Zlib/zlib_10.vcxproj
+++ b/plugins/Zlib/zlib_10.vcxproj
@@ -85,7 +85,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <ModuleDefinitionFile>zlib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>src\zlib.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
@@ -109,7 +109,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <ModuleDefinitionFile>zlib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>src\zlib.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
@@ -135,7 +135,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <ModuleDefinitionFile>zlib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>src\zlib.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -164,7 +164,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <ModuleDefinitionFile>zlib.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>src\zlib.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -176,38 +176,38 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="adler32.c" />
-    <ClCompile Include="compress.c" />
-    <ClCompile Include="crc32.c" />
-    <ClCompile Include="deflate.c" />
-    <ClCompile Include="gzclose.c" />
-    <ClCompile Include="gzlib.c" />
-    <ClCompile Include="gzread.c" />
-    <ClCompile Include="gzwrite.c" />
-    <ClCompile Include="infback.c" />
-    <ClCompile Include="inffast.c" />
-    <ClCompile Include="inflate.c" />
-    <ClCompile Include="inftrees.c" />
-    <ClCompile Include="trees.c" />
-    <ClCompile Include="uncompr.c" />
-    <ClCompile Include="zutil.c" />
+    <ClCompile Include="src\adler32.c" />
+    <ClCompile Include="src\compress.c" />
+    <ClCompile Include="src\crc32.c" />
+    <ClCompile Include="src\deflate.c" />
+    <ClCompile Include="src\gzclose.c" />
+    <ClCompile Include="src\gzlib.c" />
+    <ClCompile Include="src\gzread.c" />
+    <ClCompile Include="src\gzwrite.c" />
+    <ClCompile Include="src\infback.c" />
+    <ClCompile Include="src\inffast.c" />
+    <ClCompile Include="src\inflate.c" />
+    <ClCompile Include="src\inftrees.c" />
+    <ClCompile Include="src\trees.c" />
+    <ClCompile Include="src\uncompr.c" />
+    <ClCompile Include="src\zutil.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="crc32.h" />
-    <ClInclude Include="deflate.h" />
-    <ClInclude Include="inffast.h" />
-    <ClInclude Include="inflate.h" />
-    <ClInclude Include="inftrees.h" />
-    <ClInclude Include="trees.h" />
-    <ClInclude Include="zconf.h" />
-    <ClInclude Include="zlib.h" />
-    <ClInclude Include="zutil.h" />
+    <ClInclude Include="src\crc32.h" />
+    <ClInclude Include="src\deflate.h" />
+    <ClInclude Include="src\inffast.h" />
+    <ClInclude Include="src\inflate.h" />
+    <ClInclude Include="src\inftrees.h" />
+    <ClInclude Include="src\trees.h" />
+    <ClInclude Include="src\zconf.h" />
+    <ClInclude Include="src\zlib.h" />
+    <ClInclude Include="src\zutil.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="zlib.def" />
+    <None Include="src\zlib.def" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="zlib.rc" />
+    <ResourceCompile Include="res\zlib.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Zlib/zlib_10.vcxproj.filters b/plugins/Zlib/zlib_10.vcxproj.filters
index 7867032020..5d70c590f6 100644
--- a/plugins/Zlib/zlib_10.vcxproj.filters
+++ b/plugins/Zlib/zlib_10.vcxproj.filters
@@ -10,88 +10,88 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="adler32.c">
+    <ClCompile Include="src\adler32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="compress.c">
+    <ClCompile Include="src\compress.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="crc32.c">
+    <ClCompile Include="src\crc32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="deflate.c">
+    <ClCompile Include="src\deflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="infback.c">
+    <ClCompile Include="src\infback.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="inffast.c">
+    <ClCompile Include="src\inffast.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="inflate.c">
+    <ClCompile Include="src\inflate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="inftrees.c">
+    <ClCompile Include="src\inftrees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="trees.c">
+    <ClCompile Include="src\trees.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="uncompr.c">
+    <ClCompile Include="src\uncompr.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="zutil.c">
+    <ClCompile Include="src\zutil.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gzclose.c">
+    <ClCompile Include="src\gzclose.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gzread.c">
+    <ClCompile Include="src\gzread.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gzwrite.c">
+    <ClCompile Include="src\gzwrite.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="gzlib.c">
+    <ClCompile Include="src\gzlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="crc32.h">
+    <ClInclude Include="src\crc32.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="deflate.h">
+    <ClInclude Include="src\deflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="inffast.h">
+    <ClInclude Include="src\inffast.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="inflate.h">
+    <ClInclude Include="src\inflate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="inftrees.h">
+    <ClInclude Include="src\inftrees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="trees.h">
+    <ClInclude Include="src\trees.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="zconf.h">
+    <ClInclude Include="src\zconf.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="zlib.h">
+    <ClInclude Include="src\zlib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="zutil.h">
+    <ClInclude Include="src\zutil.h">
       <Filter>Source Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="zlib.def">
+    <None Include="src\zlib.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="zlib.rc">
+    <ResourceCompile Include="res\zlib.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>