20 files changed, 11 insertions, 11 deletions
diff --git a/plugins/BasicHistory/BasicHistory.vcxproj b/plugins/BasicHistory/BasicHistory.vcxproj
index 1af424ac7f..77b2323d41 100644
--- a/plugins/BasicHistory/BasicHistory.vcxproj
+++ b/plugins/BasicHistory/BasicHistory.vcxproj
@@ -216,16 +216,16 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\TxtExport.cpp" />
-    <ClCompile Include="zip\ioapi.c">
+    <ClCompile Include="src\zip\ioapi.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="zip\iowin32.c">
+    <ClCompile Include="src\zip\iowin32.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="zip\unzip.c">
+    <ClCompile Include="src\zip\unzip.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="zip\zip.c">
+    <ClCompile Include="src\zip\zip.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
diff --git a/plugins/BasicHistory/BasicHistory.vcxproj.filters b/plugins/BasicHistory/BasicHistory.vcxproj.filters
index 8ddafb6abd..97d4f09a88 100644
--- a/plugins/BasicHistory/BasicHistory.vcxproj.filters
+++ b/plugins/BasicHistory/BasicHistory.vcxproj.filters
@@ -143,19 +143,19 @@
     <ClCompile Include="src\Scheduler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="zip\zip.c">
+    <ClCompile Include="src\zip\zip.c">
       <Filter>Source Files\zip</Filter>
     </ClCompile>
-    <ClCompile Include="zip\iowin32.c">
+    <ClCompile Include="src\zip\iowin32.c">
       <Filter>Source Files\zip</Filter>
     </ClCompile>
-    <ClCompile Include="zip\ioapi.c">
+    <ClCompile Include="src\zip\ioapi.c">
       <Filter>Source Files\zip</Filter>
     </ClCompile>
     <ClCompile Include="src\BinaryExport.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="zip\unzip.c">
+    <ClCompile Include="src\zip\unzip.c">
       <Filter>Source Files\zip</Filter>
     </ClCompile>
     <ClCompile Include="src\ExportManager.cpp">
diff --git a/plugins/BasicHistory/src/Scheduler.cpp b/plugins/BasicHistory/src/Scheduler.cpp
index 143ee0bce5..3b2ba18ab9 100644
--- a/plugins/BasicHistory/src/Scheduler.cpp
+++ b/plugins/BasicHistory/src/Scheduler.cpp
@@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "Options.h"
 #include "ExportManager.h"
 #include "HistoryWindow.h"
-#include "..\zip\zip.h"
-#include "..\zip\unzip.h"
-#include "..\zip\iowin32.h"
+#include "zip\zip.h"
+#include "zip\unzip.h"
+#include "zip\iowin32.h"
 
 // Sorry for plain C implementation
 #define MODULE				"BasicHistory"
diff --git a/plugins/BasicHistory/zip/MiniZip64_Changes.txt b/plugins/BasicHistory/src/zip/MiniZip64_Changes.txt
index 13a1bd91a9..13a1bd91a9 100644
--- a/plugins/BasicHistory/zip/MiniZip64_Changes.txt
+++ b/plugins/BasicHistory/src/zip/MiniZip64_Changes.txt
diff --git a/plugins/BasicHistory/zip/MiniZip64_info.txt b/plugins/BasicHistory/src/zip/MiniZip64_info.txt
index 57d7152420..57d7152420 100644
--- a/plugins/BasicHistory/zip/MiniZip64_info.txt
+++ b/plugins/BasicHistory/src/zip/MiniZip64_info.txt
diff --git a/plugins/BasicHistory/zip/crypt.h b/plugins/BasicHistory/src/zip/crypt.h
index a01d08d932..a01d08d932 100644
--- a/plugins/BasicHistory/zip/crypt.h
+++ b/plugins/BasicHistory/src/zip/crypt.h
diff --git a/plugins/BasicHistory/zip/ioapi.c b/plugins/BasicHistory/src/zip/ioapi.c
index 49958f61ff..49958f61ff 100644
--- a/plugins/BasicHistory/zip/ioapi.c
+++ b/plugins/BasicHistory/src/zip/ioapi.c
diff --git a/plugins/BasicHistory/zip/ioapi.h b/plugins/BasicHistory/src/zip/ioapi.h
index 8309c4cf8f..8309c4cf8f 100644
--- a/plugins/BasicHistory/zip/ioapi.h
+++ b/plugins/BasicHistory/src/zip/ioapi.h
diff --git a/plugins/BasicHistory/zip/iowin32.c b/plugins/BasicHistory/src/zip/iowin32.c
index e697b7154d..e697b7154d 100644
--- a/plugins/BasicHistory/zip/iowin32.c
+++ b/plugins/BasicHistory/src/zip/iowin32.c
diff --git a/plugins/BasicHistory/zip/iowin32.h b/plugins/BasicHistory/src/zip/iowin32.h
index 0ca0969a7d..0ca0969a7d 100644
--- a/plugins/BasicHistory/zip/iowin32.h
+++ b/plugins/BasicHistory/src/zip/iowin32.h
diff --git a/plugins/BasicHistory/zip/miniunz.c b/plugins/BasicHistory/src/zip/miniunz.c
index 9ed009fbd9..9ed009fbd9 100644
--- a/plugins/BasicHistory/zip/miniunz.c
+++ b/plugins/BasicHistory/src/zip/miniunz.c
diff --git a/plugins/BasicHistory/zip/minizip.c b/plugins/BasicHistory/src/zip/minizip.c
index 7a4fa5a643..7a4fa5a643 100644
--- a/plugins/BasicHistory/zip/minizip.c
+++ b/plugins/BasicHistory/src/zip/minizip.c
diff --git a/plugins/BasicHistory/zip/mztools.c b/plugins/BasicHistory/src/zip/mztools.c
index f9092e65ae..f9092e65ae 100644
--- a/plugins/BasicHistory/zip/mztools.c
+++ b/plugins/BasicHistory/src/zip/mztools.c
diff --git a/plugins/BasicHistory/zip/mztools.h b/plugins/BasicHistory/src/zip/mztools.h
index 88b34592bf..88b34592bf 100644
--- a/plugins/BasicHistory/zip/mztools.h
+++ b/plugins/BasicHistory/src/zip/mztools.h
diff --git a/plugins/BasicHistory/zip/unzip.c b/plugins/BasicHistory/src/zip/unzip.c
index a23a6bb034..a23a6bb034 100644
--- a/plugins/BasicHistory/zip/unzip.c
+++ b/plugins/BasicHistory/src/zip/unzip.c
diff --git a/plugins/BasicHistory/zip/unzip.h b/plugins/BasicHistory/src/zip/unzip.h
index 3183968b77..3183968b77 100644
--- a/plugins/BasicHistory/zip/unzip.h
+++ b/plugins/BasicHistory/src/zip/unzip.h
diff --git a/plugins/BasicHistory/zip/zconf.h b/plugins/BasicHistory/src/zip/zconf.h
index 02ce56c431..02ce56c431 100644
--- a/plugins/BasicHistory/zip/zconf.h
+++ b/plugins/BasicHistory/src/zip/zconf.h
diff --git a/plugins/BasicHistory/zip/zip.c b/plugins/BasicHistory/src/zip/zip.c
index 3c34fc8bd4..3c34fc8bd4 100644
--- a/plugins/BasicHistory/zip/zip.c
+++ b/plugins/BasicHistory/src/zip/zip.c
diff --git a/plugins/BasicHistory/zip/zip.h b/plugins/BasicHistory/src/zip/zip.h
index 8aaebb6234..8aaebb6234 100644
--- a/plugins/BasicHistory/zip/zip.h
+++ b/plugins/BasicHistory/src/zip/zip.h
diff --git a/plugins/BasicHistory/zip/zlib.h b/plugins/BasicHistory/src/zip/zlib.h
index bfbba83e8e..bfbba83e8e 100644
--- a/plugins/BasicHistory/zip/zlib.h
+++ b/plugins/BasicHistory/src/zip/zlib.h