From 9b4e087882e167d6816c468743fef50a050a1ca4 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Mon, 5 Jun 2017 16:23:24 +0200
Subject: [PATCH] Windows: create dedicated project for zip library and link
 other binaries against it instead of recompiling zlib and libzip for each
 project separately.

---
 src/Common/Zip.vcxproj                        | 289 +++++++++++++
 src/Common/Zip.vcxproj.filters                | 408 ++++++++++++++++++
 src/Common/Zip.vcxproj.user                   |   3 +
 src/ExpandVolume/ExpandVolume.vcxproj         | 166 +------
 src/ExpandVolume/ExpandVolume.vcxproj.filters | 390 -----------------
 src/Format/Format.vcxproj                     | 166 +------
 src/Format/Format.vcxproj.filters             | 390 -----------------
 src/Mount/Mount.vcxproj                       | 167 +------
 src/Mount/Mount.vcxproj.filters               | 393 -----------------
 src/Setup/Setup.vcxproj                       | 152 +------
 src/Setup/Setup.vcxproj.filters               | 400 +----------------
 src/VeraCrypt.sln                             |  70 +++
 12 files changed, 786 insertions(+), 2208 deletions(-)
 create mode 100644 src/Common/Zip.vcxproj
 create mode 100644 src/Common/Zip.vcxproj.filters
 create mode 100644 src/Common/Zip.vcxproj.user

diff --git a/src/Common/Zip.vcxproj b/src/Common/Zip.vcxproj
new file mode 100644
index 00000000..3ed43587
--- /dev/null
+++ b/src/Common/Zip.vcxproj
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="libzip\mkstemp.c" />
+    <ClCompile Include="libzip\zip_add.c" />
+    <ClCompile Include="libzip\zip_add_dir.c" />
+    <ClCompile Include="libzip\zip_add_entry.c" />
+    <ClCompile Include="libzip\zip_buffer.c" />
+    <ClCompile Include="libzip\zip_close.c" />
+    <ClCompile Include="libzip\zip_delete.c" />
+    <ClCompile Include="libzip\zip_dirent.c" />
+    <ClCompile Include="libzip\zip_dir_add.c" />
+    <ClCompile Include="libzip\zip_discard.c" />
+    <ClCompile Include="libzip\zip_entry.c" />
+    <ClCompile Include="libzip\zip_error.c" />
+    <ClCompile Include="libzip\zip_error_clear.c" />
+    <ClCompile Include="libzip\zip_error_get.c" />
+    <ClCompile Include="libzip\zip_error_get_sys_type.c" />
+    <ClCompile Include="libzip\zip_error_strerror.c" />
+    <ClCompile Include="libzip\zip_error_to_str.c" />
+    <ClCompile Include="libzip\zip_err_str.c" />
+    <ClCompile Include="libzip\zip_extra_field.c" />
+    <ClCompile Include="libzip\zip_extra_field_api.c" />
+    <ClCompile Include="libzip\zip_fclose.c" />
+    <ClCompile Include="libzip\zip_fdopen.c" />
+    <ClCompile Include="libzip\zip_filerange_crc.c" />
+    <ClCompile Include="libzip\zip_file_add.c" />
+    <ClCompile Include="libzip\zip_file_error_clear.c" />
+    <ClCompile Include="libzip\zip_file_error_get.c" />
+    <ClCompile Include="libzip\zip_file_get_comment.c" />
+    <ClCompile Include="libzip\zip_file_get_external_attributes.c" />
+    <ClCompile Include="libzip\zip_file_get_offset.c" />
+    <ClCompile Include="libzip\zip_file_rename.c" />
+    <ClCompile Include="libzip\zip_file_replace.c" />
+    <ClCompile Include="libzip\zip_file_set_comment.c" />
+    <ClCompile Include="libzip\zip_file_set_external_attributes.c" />
+    <ClCompile Include="libzip\zip_file_set_mtime.c" />
+    <ClCompile Include="libzip\zip_file_strerror.c" />
+    <ClCompile Include="libzip\zip_fopen.c" />
+    <ClCompile Include="libzip\zip_fopen_encrypted.c" />
+    <ClCompile Include="libzip\zip_fopen_index.c" />
+    <ClCompile Include="libzip\zip_fopen_index_encrypted.c" />
+    <ClCompile Include="libzip\zip_fread.c" />
+    <ClCompile Include="libzip\zip_get_archive_comment.c" />
+    <ClCompile Include="libzip\zip_get_archive_flag.c" />
+    <ClCompile Include="libzip\zip_get_compression_implementation.c" />
+    <ClCompile Include="libzip\zip_get_encryption_implementation.c" />
+    <ClCompile Include="libzip\zip_get_file_comment.c" />
+    <ClCompile Include="libzip\zip_get_name.c" />
+    <ClCompile Include="libzip\zip_get_num_entries.c" />
+    <ClCompile Include="libzip\zip_get_num_files.c" />
+    <ClCompile Include="libzip\zip_hash.c" />
+    <ClCompile Include="libzip\zip_io_util.c" />
+    <ClCompile Include="libzip\zip_memdup.c" />
+    <ClCompile Include="libzip\zip_name_locate.c" />
+    <ClCompile Include="libzip\zip_new.c" />
+    <ClCompile Include="libzip\zip_open.c" />
+    <ClCompile Include="libzip\zip_rename.c" />
+    <ClCompile Include="libzip\zip_replace.c" />
+    <ClCompile Include="libzip\zip_set_archive_comment.c" />
+    <ClCompile Include="libzip\zip_set_archive_flag.c" />
+    <ClCompile Include="libzip\zip_set_default_password.c" />
+    <ClCompile Include="libzip\zip_set_file_comment.c" />
+    <ClCompile Include="libzip\zip_set_file_compression.c" />
+    <ClCompile Include="libzip\zip_set_name.c" />
+    <ClCompile Include="libzip\zip_source_begin_write.c" />
+    <ClCompile Include="libzip\zip_source_buffer.c" />
+    <ClCompile Include="libzip\zip_source_call.c" />
+    <ClCompile Include="libzip\zip_source_close.c" />
+    <ClCompile Include="libzip\zip_source_commit_write.c" />
+    <ClCompile Include="libzip\zip_source_crc.c" />
+    <ClCompile Include="libzip\zip_source_deflate.c" />
+    <ClCompile Include="libzip\zip_source_error.c" />
+    <ClCompile Include="libzip\zip_source_filep.c" />
+    <ClCompile Include="libzip\zip_source_free.c" />
+    <ClCompile Include="libzip\zip_source_function.c" />
+    <ClCompile Include="libzip\zip_source_is_deleted.c" />
+    <ClCompile Include="libzip\zip_source_layered.c" />
+    <ClCompile Include="libzip\zip_source_open.c" />
+    <ClCompile Include="libzip\zip_source_pkware.c" />
+    <ClCompile Include="libzip\zip_source_read.c" />
+    <ClCompile Include="libzip\zip_source_remove.c" />
+    <ClCompile Include="libzip\zip_source_rollback_write.c" />
+    <ClCompile Include="libzip\zip_source_seek.c" />
+    <ClCompile Include="libzip\zip_source_seek_write.c" />
+    <ClCompile Include="libzip\zip_source_stat.c" />
+    <ClCompile Include="libzip\zip_source_supports.c" />
+    <ClCompile Include="libzip\zip_source_tell.c" />
+    <ClCompile Include="libzip\zip_source_tell_write.c" />
+    <ClCompile Include="libzip\zip_source_win32a.c" />
+    <ClCompile Include="libzip\zip_source_win32handle.c" />
+    <ClCompile Include="libzip\zip_source_win32utf8.c" />
+    <ClCompile Include="libzip\zip_source_win32w.c" />
+    <ClCompile Include="libzip\zip_source_window.c" />
+    <ClCompile Include="libzip\zip_source_write.c" />
+    <ClCompile Include="libzip\zip_source_zip.c" />
+    <ClCompile Include="libzip\zip_source_zip_new.c" />
+    <ClCompile Include="libzip\zip_stat.c" />
+    <ClCompile Include="libzip\zip_stat_index.c" />
+    <ClCompile Include="libzip\zip_stat_init.c" />
+    <ClCompile Include="libzip\zip_strerror.c" />
+    <ClCompile Include="libzip\zip_string.c" />
+    <ClCompile Include="libzip\zip_unchange.c" />
+    <ClCompile Include="libzip\zip_unchange_all.c" />
+    <ClCompile Include="libzip\zip_unchange_archive.c" />
+    <ClCompile Include="libzip\zip_unchange_data.c" />
+    <ClCompile Include="libzip\zip_utf-8.c" />
+    <ClCompile Include="zlib\adler32.c" />
+    <ClCompile Include="zlib\compress.c" />
+    <ClCompile Include="zlib\crc32.c" />
+    <ClCompile Include="zlib\deflate.c" />
+    <ClCompile Include="zlib\inffast.c" />
+    <ClCompile Include="zlib\inflate.c" />
+    <ClCompile Include="zlib\inftrees.c" />
+    <ClCompile Include="zlib\trees.c" />
+    <ClCompile Include="zlib\uncompr.c" />
+    <ClCompile Include="zlib\zutil.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libzip\compat.h" />
+    <ClInclude Include="libzip\config.h" />
+    <ClInclude Include="libzip\zconf.h" />
+    <ClInclude Include="libzip\zip.h" />
+    <ClInclude Include="libzip\zipconf.h" />
+    <ClInclude Include="libzip\zipint.h" />
+    <ClInclude Include="libzip\zipwin32.h" />
+    <ClInclude Include="zlib\crc32.h" />
+    <ClInclude Include="zlib\deflate.h" />
+    <ClInclude Include="zlib\inffast.h" />
+    <ClInclude Include="zlib\inffixed.h" />
+    <ClInclude Include="zlib\inflate.h" />
+    <ClInclude Include="zlib\inftrees.h" />
+    <ClInclude Include="zlib\trees.h" />
+    <ClInclude Include="zlib\zconf.h" />
+    <ClInclude Include="zlib\zlib.h" />
+    <ClInclude Include="zlib\zutil.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Zip</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>zlib:libzip</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>_CRT_NONSTDC_NO_WARNINGS;_LIB;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>zlib;libzip</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Common/Zip.vcxproj.filters b/src/Common/Zip.vcxproj.filters
new file mode 100644
index 00000000..8cc8b9bd
--- /dev/null
+++ b/src/Common/Zip.vcxproj.filters
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="libzip">
+      <UniqueIdentifier>{a369717d-cddc-4112-b4fa-2dfa4e70c1bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="zlib">
+      <UniqueIdentifier>{077a3d56-4c09-48a8-b3ca-cb326f2e6c52}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="libzip\mkstemp.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_add.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_add_dir.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_add_entry.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_buffer.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_close.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_delete.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_dirent.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_dir_add.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_discard.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_entry.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_clear.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_get.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_get_sys_type.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_strerror.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_error_to_str.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_err_str.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_extra_field.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_extra_field_api.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fclose.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fdopen.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_filerange_crc.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_add.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_error_clear.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_error_get.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_get_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_get_external_attributes.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_get_offset.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_rename.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_replace.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_set_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_set_external_attributes.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_set_mtime.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_file_strerror.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fopen.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fopen_encrypted.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fopen_index.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fopen_index_encrypted.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_fread.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_archive_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_archive_flag.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_compression_implementation.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_encryption_implementation.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_file_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_name.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_num_entries.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_get_num_files.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_hash.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_io_util.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_memdup.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_name_locate.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_new.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_open.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_rename.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_replace.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_archive_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_archive_flag.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_default_password.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_file_comment.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_file_compression.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_set_name.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_begin_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_buffer.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_call.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_close.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_commit_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_crc.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_deflate.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_error.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_filep.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_free.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_function.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_is_deleted.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_layered.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_open.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_pkware.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_read.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_remove.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_rollback_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_seek.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_seek_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_stat.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_supports.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_tell.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_tell_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_win32a.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_win32handle.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_win32utf8.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_win32w.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_window.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_write.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_zip.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_source_zip_new.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_stat.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_stat_index.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_stat_init.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_strerror.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_string.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_unchange.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_unchange_all.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_unchange_archive.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_unchange_data.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="libzip\zip_utf-8.c">
+      <Filter>libzip</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\adler32.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\crc32.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\deflate.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\inffast.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\inflate.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\inftrees.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\trees.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\zutil.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\compress.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="zlib\uncompr.c">
+      <Filter>zlib</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="libzip\compat.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\config.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\zconf.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\zip.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\zipconf.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\zipint.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="libzip\zipwin32.h">
+      <Filter>libzip</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\crc32.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\deflate.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\inffast.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\inffixed.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\inflate.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\inftrees.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\trees.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\zconf.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\zlib.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+    <ClInclude Include="zlib\zutil.h">
+      <Filter>zlib</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Common/Zip.vcxproj.user b/src/Common/Zip.vcxproj.user
new file mode 100644
index 00000000..ace9a86a
--- /dev/null
+++ b/src/Common/Zip.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/src/ExpandVolume/ExpandVolume.vcxproj b/src/ExpandVolume/ExpandVolume.vcxproj
index bcbfb310..97ff5f92 100644
--- a/src/ExpandVolume/ExpandVolume.vcxproj
+++ b/src/ExpandVolume/ExpandVolume.vcxproj
@@ -119,7 +119,7 @@
       <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -173,7 +173,7 @@ copy Debug\VeraCryptExpander.exe "..\Debug\Setup Files" &gt;NUL:
       <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -218,7 +218,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -264,7 +264,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4311;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptExpander.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -309,148 +309,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" &gt;NUL:
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c" />
-    <ClCompile Include="..\Common\libzip\zip_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
-    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fread.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
-    <ClCompile Include="..\Common\libzip\zip_hash.c" />
-    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
-    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
-    <ClCompile Include="..\Common\libzip\zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
-    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_string.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
-    <ClCompile Include="..\Common\zlib\adler32.c" />
-    <ClCompile Include="..\Common\zlib\crc32.c" />
-    <ClCompile Include="..\Common\zlib\deflate.c" />
-    <ClCompile Include="..\Common\zlib\inffast.c" />
-    <ClCompile Include="..\Common\zlib\inflate.c" />
-    <ClCompile Include="..\Common\zlib\inftrees.c" />
-    <ClCompile Include="..\Common\zlib\trees.c" />
-    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="DlgExpandVolume.cpp" />
     <ClCompile Include="ExpandVolume.c" />
     <ClCompile Include="InitDataArea.c" />
@@ -510,12 +368,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" &gt;NUL:
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Common\libzip\compat.h" />
-    <ClInclude Include="..\Common\libzip\config.h" />
-    <ClInclude Include="..\Common\libzip\zconf.h" />
-    <ClInclude Include="..\Common\libzip\zip.h" />
-    <ClInclude Include="..\Common\libzip\zipint.h" />
-    <ClInclude Include="..\Common\libzip\zipwin32.h" />
     <ClInclude Include="..\Common\Wipe.h" />
     <ClInclude Include="..\Common\Apidrvr.h" />
     <ClInclude Include="..\Common\BaseCom.h" />
@@ -529,16 +381,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" &gt;NUL:
     <ClInclude Include="..\Common\Dlgcode.h" />
     <ClInclude Include="..\Common\EncryptionThreadPool.h" />
     <ClInclude Include="..\Common\Exception.h" />
-    <ClInclude Include="..\Common\zlib\crc32.h" />
-    <ClInclude Include="..\Common\zlib\deflate.h" />
-    <ClInclude Include="..\Common\zlib\inffast.h" />
-    <ClInclude Include="..\Common\zlib\inffixed.h" />
-    <ClInclude Include="..\Common\zlib\inflate.h" />
-    <ClInclude Include="..\Common\zlib\inftrees.h" />
-    <ClInclude Include="..\Common\zlib\trees.h" />
-    <ClInclude Include="..\Common\zlib\zconf.h" />
-    <ClInclude Include="..\Common\zlib\zlib.h" />
-    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="ExpandVolume.h" />
     <ClInclude Include="..\Common\GfMul.h" />
     <ClInclude Include="Hotkeys.h" />
diff --git a/src/ExpandVolume/ExpandVolume.vcxproj.filters b/src/ExpandVolume/ExpandVolume.vcxproj.filters
index 2e39a44a..c84fd9d8 100644
--- a/src/ExpandVolume/ExpandVolume.vcxproj.filters
+++ b/src/ExpandVolume/ExpandVolume.vcxproj.filters
@@ -22,12 +22,6 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{ece6c790-f488-400d-b92d-64f73ce9f990}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Common\zlib">
-      <UniqueIdentifier>{044f5a5d-232b-4c85-b9ff-5b755d249450}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common\libzip">
-      <UniqueIdentifier>{3431cd6c-72ca-4156-8311-37e469f29da9}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DlgExpandVolume.cpp">
@@ -126,342 +120,6 @@
     <ClCompile Include="..\Mount\Mount.c">
       <Filter>Source Files\Mount</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\zlib\adler32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\crc32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\deflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inffast.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inftrees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\trees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\zutil.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_err_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fclose.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fread.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_hash.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_io_util.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_memdup.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_call.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_function.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_read.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_window.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_string.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Common\Wipe.h">
@@ -566,54 +224,6 @@
     <ClInclude Include="..\Common\Xts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\zlib\crc32.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\deflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffast.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffixed.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inftrees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\trees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zconf.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zlib.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zutil.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\compat.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\config.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zip.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipint.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipwin32.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="..\Mount\MainCom.idl">
diff --git a/src/Format/Format.vcxproj b/src/Format/Format.vcxproj
index a13d7fa6..f069ef11 100644
--- a/src/Format/Format.vcxproj
+++ b/src/Format/Format.vcxproj
@@ -106,7 +106,7 @@
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -146,7 +146,7 @@ copy Debug\VeraCryptFormat.exe "..\Debug\Setup Files\VeraCrypt Format.exe" &gt;N
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -186,7 +186,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -228,7 +228,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptFormat.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -249,148 +249,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c" />
-    <ClCompile Include="..\Common\libzip\zip_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
-    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fread.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
-    <ClCompile Include="..\Common\libzip\zip_hash.c" />
-    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
-    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
-    <ClCompile Include="..\Common\libzip\zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
-    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_string.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
-    <ClCompile Include="..\Common\zlib\adler32.c" />
-    <ClCompile Include="..\Common\zlib\crc32.c" />
-    <ClCompile Include="..\Common\zlib\deflate.c" />
-    <ClCompile Include="..\Common\zlib\inffast.c" />
-    <ClCompile Include="..\Common\zlib\inflate.c" />
-    <ClCompile Include="..\Common\zlib\inftrees.c" />
-    <ClCompile Include="..\Common\zlib\trees.c" />
-    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="FormatCom.cpp" />
     <ClCompile Include="InPlace.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
@@ -461,22 +319,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" &gt;NUL:
     <ClInclude Include="..\Common\Exception.h" />
     <ClInclude Include="..\Common\Fat.h" />
     <ClInclude Include="..\Common\Format.h" />
-    <ClInclude Include="..\Common\libzip\compat.h" />
-    <ClInclude Include="..\Common\libzip\config.h" />
-    <ClInclude Include="..\Common\libzip\zconf.h" />
-    <ClInclude Include="..\Common\libzip\zip.h" />
-    <ClInclude Include="..\Common\libzip\zipint.h" />
-    <ClInclude Include="..\Common\libzip\zipwin32.h" />
-    <ClInclude Include="..\Common\zlib\crc32.h" />
-    <ClInclude Include="..\Common\zlib\deflate.h" />
-    <ClInclude Include="..\Common\zlib\inffast.h" />
-    <ClInclude Include="..\Common\zlib\inffixed.h" />
-    <ClInclude Include="..\Common\zlib\inflate.h" />
-    <ClInclude Include="..\Common\zlib\inftrees.h" />
-    <ClInclude Include="..\Common\zlib\trees.h" />
-    <ClInclude Include="..\Common\zlib\zconf.h" />
-    <ClInclude Include="..\Common\zlib\zlib.h" />
-    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="FormatCom.h" />
     <ClInclude Include="..\Common\GfMul.h" />
     <ClInclude Include="InPlace.h" />
diff --git a/src/Format/Format.vcxproj.filters b/src/Format/Format.vcxproj.filters
index e250fefe..4f0e81eb 100644
--- a/src/Format/Format.vcxproj.filters
+++ b/src/Format/Format.vcxproj.filters
@@ -19,12 +19,6 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{881fda51-0ca5-4603-9de7-c618932554b4}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Common\libzip">
-      <UniqueIdentifier>{89e6575e-aa9c-47e4-8280-47d282b11228}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common\zlib">
-      <UniqueIdentifier>{1ebcc85d-1ce3-488c-89e5-f8605df170e2}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FormatCom.cpp">
@@ -114,342 +108,6 @@
     <ClCompile Include="..\Common\Xts.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_err_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fclose.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fread.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_hash.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_io_util.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_memdup.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_call.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_function.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_read.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_window.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_string.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\adler32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\crc32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\deflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inffast.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inftrees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\trees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\zutil.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="FormatCom.idl">
@@ -550,54 +208,6 @@
     <ClInclude Include="..\Common\Xts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\libzip\compat.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\config.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zip.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipint.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipwin32.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\crc32.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\deflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffast.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffixed.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inftrees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\trees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zconf.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zlib.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zutil.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin">
diff --git a/src/Mount/Mount.vcxproj b/src/Mount/Mount.vcxproj
index 2f4abfea..3c2ae567 100644
--- a/src/Mount/Mount.vcxproj
+++ b/src/Mount/Mount.vcxproj
@@ -115,7 +115,7 @@
       <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Debug\crypto.lib;..\Common\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -164,7 +164,7 @@ copy Debug\VeraCrypt.exe "..\Debug\Setup Files" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Debug\crypto.lib;..\Common\x64\Debug\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -208,7 +208,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -253,7 +253,7 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" &gt;NUL:
       <DisableSpecificWarnings>4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCrypt.exe</OutputFile>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <DelayLoadDLLs>mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -274,148 +274,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" &gt;NUL:
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c" />
-    <ClCompile Include="..\Common\libzip\zip_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
-    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fread.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
-    <ClCompile Include="..\Common\libzip\zip_hash.c" />
-    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
-    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
-    <ClCompile Include="..\Common\libzip\zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
-    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_string.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
-    <ClCompile Include="..\Common\zlib\adler32.c" />
-    <ClCompile Include="..\Common\zlib\crc32.c" />
-    <ClCompile Include="..\Common\zlib\deflate.c" />
-    <ClCompile Include="..\Common\zlib\inffast.c" />
-    <ClCompile Include="..\Common\zlib\inflate.c" />
-    <ClCompile Include="..\Common\zlib\inftrees.c" />
-    <ClCompile Include="..\Common\zlib\trees.c" />
-    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="Favorites.cpp" />
     <ClCompile Include="Hotkeys.c" />
     <ClCompile Include="MainCom.cpp" />
@@ -468,13 +326,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" &gt;NUL:
     <Midl Include="MainCom.idl" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Common\libzip\compat.h" />
-    <ClInclude Include="..\Common\libzip\config.h" />
-    <ClInclude Include="..\Common\libzip\zconf.h" />
-    <ClInclude Include="..\Common\libzip\zip.h" />
-    <ClInclude Include="..\Common\libzip\zipconf.h" />
-    <ClInclude Include="..\Common\libzip\zipint.h" />
-    <ClInclude Include="..\Common\libzip\zipwin32.h" />
     <ClInclude Include="..\Common\Wipe.h" />
     <ClInclude Include="..\Common\Apidrvr.h" />
     <ClInclude Include="..\Common\BaseCom.h" />
@@ -488,16 +339,6 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" &gt;NUL:
     <ClInclude Include="..\Common\Dlgcode.h" />
     <ClInclude Include="..\Common\EncryptionThreadPool.h" />
     <ClInclude Include="..\Common\Exception.h" />
-    <ClInclude Include="..\Common\zlib\crc32.h" />
-    <ClInclude Include="..\Common\zlib\deflate.h" />
-    <ClInclude Include="..\Common\zlib\inffast.h" />
-    <ClInclude Include="..\Common\zlib\inffixed.h" />
-    <ClInclude Include="..\Common\zlib\inflate.h" />
-    <ClInclude Include="..\Common\zlib\inftrees.h" />
-    <ClInclude Include="..\Common\zlib\trees.h" />
-    <ClInclude Include="..\Common\zlib\zconf.h" />
-    <ClInclude Include="..\Common\zlib\zlib.h" />
-    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="Favorites.h" />
     <ClInclude Include="..\Common\GfMul.h" />
     <ClInclude Include="Hotkeys.h" />
diff --git a/src/Mount/Mount.vcxproj.filters b/src/Mount/Mount.vcxproj.filters
index b649a04d..b29330c4 100644
--- a/src/Mount/Mount.vcxproj.filters
+++ b/src/Mount/Mount.vcxproj.filters
@@ -19,12 +19,6 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{f805ede6-c210-4210-95ce-e33edb12bc27}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Common\libzip">
-      <UniqueIdentifier>{318128e2-1443-4dce-83e6-f3e1c92d6787}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common\zlib">
-      <UniqueIdentifier>{21a4f879-0684-4016-ad89-f27c8ab96cf8}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Favorites.cpp">
@@ -108,342 +102,6 @@
     <ClCompile Include="..\Common\Xts.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fclose.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fread.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_io_util.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_function.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_read.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_window.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_string.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\adler32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\crc32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\deflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\trees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\zutil.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inftrees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inffast.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_err_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_hash.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_memdup.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_call.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="MainCom.idl">
@@ -547,57 +205,6 @@
     <ClInclude Include="..\Common\Xts.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\libzip\compat.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\config.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zip.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipint.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipwin32.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\crc32.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\deflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffast.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffixed.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inftrees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\trees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zconf.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zlib.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zutil.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Boot\Windows\Rescue_Serpent_SHA2\BootSector.bin">
diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj
index 8c5e8677..d85d877d 100644
--- a/src/Setup/Setup.vcxproj
+++ b/src/Setup/Setup.vcxproj
@@ -69,7 +69,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>libcmtd.lib;atlsd.lib;mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libcmtd.lib;atlsd.lib;mpr.lib;..\Common\Debug\Zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptSetup.exe</OutputFile>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
       <DelayLoadDLLs>user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -108,7 +108,7 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
     </ClCompile>
     <Link>
       <AdditionalOptions>/IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>mpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>mpr.lib;..\Common\Release\Zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)VeraCryptSetup.exe</OutputFile>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
       <DelayLoadDLLs>user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -129,138 +129,6 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c" />
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c" />
-    <ClCompile Include="..\Common\libzip\zip_entry.c" />
-    <ClCompile Include="..\Common\libzip\zip_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_err_str.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c" />
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c" />
-    <ClCompile Include="..\Common\libzip\zip_fclose.c" />
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_add.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c" />
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c" />
-    <ClCompile Include="..\Common\libzip\zip_fread.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c" />
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c" />
-    <ClCompile Include="..\Common\libzip\zip_hash.c" />
-    <ClCompile Include="..\Common\libzip\zip_io_util.c" />
-    <ClCompile Include="..\Common\libzip\zip_memdup.c" />
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c" />
-    <ClCompile Include="..\Common\libzip\zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_rename.c" />
-    <ClCompile Include="..\Common\libzip\zip_replace.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c" />
-    <ClCompile Include="..\Common\libzip\zip_set_name.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_call.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_close.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_error.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_function.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_open.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_read.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_window.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_write.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c" />
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c" />
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c" />
-    <ClCompile Include="..\Common\libzip\zip_strerror.c" />
-    <ClCompile Include="..\Common\libzip\zip_string.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c" />
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c" />
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c" />
-    <ClCompile Include="..\Common\zlib\adler32.c" />
-    <ClCompile Include="..\Common\zlib\compress.c" />
-    <ClCompile Include="..\Common\zlib\crc32.c" />
-    <ClCompile Include="..\Common\zlib\deflate.c" />
-    <ClCompile Include="..\Common\zlib\inffast.c" />
-    <ClCompile Include="..\Common\zlib\inflate.c" />
-    <ClCompile Include="..\Common\zlib\inftrees.c" />
-    <ClCompile Include="..\Common\zlib\trees.c" />
-    <ClCompile Include="..\Common\zlib\uncompr.c" />
-    <ClCompile Include="..\Common\zlib\zutil.c" />
     <ClCompile Include="ComSetup.cpp" />
     <ClCompile Include="Dir.c" />
     <ClCompile Include="SelfExtract.c" />
@@ -303,22 +171,6 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" &gt;NUL
   <ItemGroup>
     <ClInclude Include="..\Common\Apidrvr.h" />
     <ClInclude Include="..\Common\Combo.h" />
-    <ClInclude Include="..\Common\libzip\compat.h" />
-    <ClInclude Include="..\Common\libzip\config.h" />
-    <ClInclude Include="..\Common\libzip\zconf.h" />
-    <ClInclude Include="..\Common\libzip\zip.h" />
-    <ClInclude Include="..\Common\libzip\zipint.h" />
-    <ClInclude Include="..\Common\libzip\zipwin32.h" />
-    <ClInclude Include="..\Common\zlib\crc32.h" />
-    <ClInclude Include="..\Common\zlib\deflate.h" />
-    <ClInclude Include="..\Common\zlib\inffast.h" />
-    <ClInclude Include="..\Common\zlib\inffixed.h" />
-    <ClInclude Include="..\Common\zlib\inflate.h" />
-    <ClInclude Include="..\Common\zlib\inftrees.h" />
-    <ClInclude Include="..\Common\zlib\trees.h" />
-    <ClInclude Include="..\Common\zlib\zconf.h" />
-    <ClInclude Include="..\Common\zlib\zlib.h" />
-    <ClInclude Include="..\Common\zlib\zutil.h" />
     <ClInclude Include="ComSetup.h" />
     <ClInclude Include="..\Common\Crc.h" />
     <ClInclude Include="Dir.h" />
diff --git a/src/Setup/Setup.vcxproj.filters b/src/Setup/Setup.vcxproj.filters
index b2ba0dec..d747363f 100644
--- a/src/Setup/Setup.vcxproj.filters
+++ b/src/Setup/Setup.vcxproj.filters
@@ -19,12 +19,6 @@
     <Filter Include="Resource Files\Common">
       <UniqueIdentifier>{a540fb0a-850b-4cb9-85f9-ade0112ebb50}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\Common\libzip">
-      <UniqueIdentifier>{72792e98-38ea-4b68-a06e-140c3941d057}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Common\zlib">
-      <UniqueIdentifier>{25bed244-7b06-46a3-8912-a3493143f281}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ComSetup.cpp">
@@ -57,356 +51,14 @@
     <ClCompile Include="..\Common\Dlgcode.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\Endian.c">
-      <Filter>Source Files\Common</Filter>
-    </ClCompile>
     <ClCompile Include="..\Common\Language.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
     <ClCompile Include="..\Common\Registry.c">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\libzip\mkstemp.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_dir.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_add_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_delete.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dir_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_dirent.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_discard.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_entry.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_err_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_get_sys_type.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_error_to_str.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_extra_field_api.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fclose.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fdopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_add.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_clear.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_error_get.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_get_offset.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_external_attributes.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_set_mtime.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_file_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_filerange_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fopen_index_encrypted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_fread.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_compression_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_encryption_implementation.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_entries.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_get_num_files.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_hash.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_io_util.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_memdup.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_name_locate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_rename.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_replace.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_archive_flag.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_default_password.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_comment.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_file_compression.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_set_name.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_begin_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_buffer.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_call.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_close.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_commit_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_crc.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_deflate.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_error.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_filep.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_free.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_function.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_is_deleted.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_layered.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_open.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_pkware.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_read.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_remove.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_rollback_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_seek_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_supports.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_tell_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32a.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32handle.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32utf8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_win32w.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_window.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_write.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_source_zip_new.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_index.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_stat_init.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_strerror.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_string.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_all.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_archive.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_unchange_data.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\libzip\zip_utf-8.c">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\adler32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\compress.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\crc32.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\deflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inffast.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inflate.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\inftrees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\trees.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\uncompr.c">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\zlib\zutil.c">
-      <Filter>Source Files\Common\zlib</Filter>
+    <ClCompile Include="..\Common\Endian.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -493,54 +145,6 @@
     <ClInclude Include="Wizard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\libzip\compat.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\config.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zconf.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zip.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipint.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\libzip\zipwin32.h">
-      <Filter>Source Files\Common\libzip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\crc32.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\deflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffast.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inffixed.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inflate.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\inftrees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\trees.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zconf.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zlib.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\zlib\zutil.h">
-      <Filter>Source Files\Common\zlib</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="Setup.manifest">
diff --git a/src/VeraCrypt.sln b/src/VeraCrypt.sln
index 420bb9ca..cc0387ed 100644
--- a/src/VeraCrypt.sln
+++ b/src/VeraCrypt.sln
@@ -5,14 +5,28 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Driver", "Driver\Driver.vcxproj", "{EF5EF444-18D0-40D7-8DFA-775EC4448602}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Format", "Format\Format.vcxproj", "{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mount", "Mount\Mount.vcxproj", "{E4C40F94-E7F9-4981-86E4-186B46F993F3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "Setup\Setup.vcxproj", "{DF5F654D-BD44-4E31-B92E-B68074DC37A8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Boot", "Boot\Windows\Boot.vcxproj", "{8B7F059F-E4C7-4E11-88F5-EE8B8433072E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExpandVolume", "ExpandVolume\ExpandVolume.vcxproj", "{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC} = {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zip", "Common\Zip.vcxproj", "{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -436,6 +450,62 @@ Global
 		{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|Win32.ActiveCfg = Release|Win32
 		{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|x64.ActiveCfg = Release|x64
 		{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.Setup|x64.Build.0 = Release|x64
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.ActiveCfg = Debug|x64
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.Build.0 = Debug|x64
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|x64.ActiveCfg = Release|x64
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|x64.Build.0 = Release|x64
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot Loader|x64.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Boot|x64.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64 Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x64|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86 Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver x86|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Driver|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Format|x64.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Mount|x64.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Release|x64.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|Win32.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|Win32.Build.0 = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup Debug|x64.ActiveCfg = Debug|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|Win32.ActiveCfg = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|Win32.Build.0 = Release|Win32
+		{6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.Setup|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE