diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj b/amxmodx/msvc12/amxmodx_mm.vcxproj
index 9a23b358..d2d877f6 100644
--- a/amxmodx/msvc12/amxmodx_mm.vcxproj
+++ b/amxmodx/msvc12/amxmodx_mm.vcxproj
@@ -121,7 +121,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\zlib\zlib.lib;..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <Version>0.1</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\extra\lib_win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -176,7 +176,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\zlib\zlib.lib;..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\extra\lib_win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -225,7 +225,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\zlib\zlib.lib;..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <Version>0.1</Version>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\extra\lib_win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -278,7 +278,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>..\zlib\zlib.lib;..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\JIT\amxjitsn.obj;..\JIT\amxexecn.obj;..\JIT\natives-x86.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\extra\lib_win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>LIBC;LIBCD;LIBCMTD;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -301,6 +301,18 @@
     <ClCompile Include="..\..\public\hashing\hashers\sha256.cpp" />
     <ClCompile Include="..\..\public\hashing\hashers\sha3.cpp" />
     <ClCompile Include="..\..\public\hashing\hashers\keccak.cpp" />
+    <ClCompile Include="..\..\public\zlib\adler32.c" />
+    <ClCompile Include="..\..\public\zlib\compress.c" />
+    <ClCompile Include="..\..\public\zlib\crc32.c" />
+    <ClCompile Include="..\..\public\zlib\deflate.c" />
+    <ClCompile Include="..\..\public\zlib\gzio.c" />
+    <ClCompile Include="..\..\public\zlib\infback.c" />
+    <ClCompile Include="..\..\public\zlib\inffast.c" />
+    <ClCompile Include="..\..\public\zlib\inflate.c" />
+    <ClCompile Include="..\..\public\zlib\inftrees.c" />
+    <ClCompile Include="..\..\public\zlib\trees.c" />
+    <ClCompile Include="..\..\public\zlib\uncompr.c" />
+    <ClCompile Include="..\..\public\zlib\zutil.c" />
     <ClCompile Include="..\amx.cpp" />
     <ClCompile Include="..\amxcore.cpp" />
     <ClCompile Include="..\amxdbg.cpp" />
diff --git a/amxmodx/msvc12/amxmodx_mm.vcxproj.filters b/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
index f3bd74b1..42587a20 100644
--- a/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
+++ b/amxmodx/msvc12/amxmodx_mm.vcxproj.filters
@@ -39,6 +39,8 @@
     </Filter>
     <Filter Include="Hashing\Hashers">
       <UniqueIdentifier>{v3248ea1-a53v-5ax5-b2d1-f3gh53d2fg43}</UniqueIdentifier>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{2b925879-cb15-4a3d-9236-cf43eaf6b3cf}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -227,6 +229,41 @@
     </ClCompile>
     <ClCompile Include="..\..\public\hashing\hashers\keccak.cpp">
       <Filter>Hashing\Hashers</Filter>
+    <ClCompile Include="..\..\public\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\compress.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\gzio.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\infback.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\uncompr.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\public\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
diff --git a/compiler/amxxpc/amxxpc.vcxproj b/compiler/amxxpc/amxxpc.vcxproj
index 12b05448..e542e7e1 100644
--- a/compiler/amxxpc/amxxpc.vcxproj
+++ b/compiler/amxxpc/amxxpc.vcxproj
@@ -64,7 +64,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\public;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\public;..\..\public\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -85,7 +85,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\public;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\public;..\..\public\zlib;..\..\amxmodx\;C:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -97,21 +97,21 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\public\zlib\adler32.c" />
+    <ClCompile Include="..\..\public\zlib\compress.c" />
+    <ClCompile Include="..\..\public\zlib\crc32.c" />
+    <ClCompile Include="..\..\public\zlib\deflate.c" />
+    <ClCompile Include="..\..\public\zlib\gzio.c" />
+    <ClCompile Include="..\..\public\zlib\infback.c" />
+    <ClCompile Include="..\..\public\zlib\inffast.c" />
+    <ClCompile Include="..\..\public\zlib\inflate.c" />
+    <ClCompile Include="..\..\public\zlib\inftrees.c" />
+    <ClCompile Include="..\..\public\zlib\trees.c" />
+    <ClCompile Include="..\..\public\zlib\uncompr.c" />
+    <ClCompile Include="..\..\public\zlib\zutil.c" />
     <ClCompile Include="amx.cpp" />
     <ClCompile Include="amxxpc.cpp" />
     <ClCompile Include="Binary.cpp" />
-    <ClCompile Include="zlib\adler32.c" />
-    <ClCompile Include="zlib\compress.c" />
-    <ClCompile Include="zlib\crc32.c" />
-    <ClCompile Include="zlib\deflate.c" />
-    <ClCompile Include="zlib\gzio.c" />
-    <ClCompile Include="zlib\infback.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="amx.h" />
@@ -124,16 +124,6 @@
     <ClInclude Include="sclinux.h" />
     <ClInclude Include="zconf.h" />
     <ClInclude Include="zlib.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>
   <ItemGroup>
     <ResourceCompile Include="amxxpc1.rc">
diff --git a/compiler/amxxpc/amxxpc.vcxproj.filters b/compiler/amxxpc/amxxpc.vcxproj.filters
index cf7dedf1..e5eac7ab 100644
--- a/compiler/amxxpc/amxxpc.vcxproj.filters
+++ b/compiler/amxxpc/amxxpc.vcxproj.filters
@@ -14,7 +14,7 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
     </Filter>
     <Filter Include="zlib">
-      <UniqueIdentifier>{95894152-d509-4905-9205-97a44db61085}</UniqueIdentifier>
+      <UniqueIdentifier>{dc85e679-8bc3-49f7-8823-b761223c8e8e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -27,40 +27,40 @@
     <ClCompile Include="Binary.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\adler32.c">
+    <ClCompile Include="..\..\public\zlib\adler32.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\compress.c">
+    <ClCompile Include="..\..\public\zlib\compress.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\crc32.c">
+    <ClCompile Include="..\..\public\zlib\crc32.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\deflate.c">
+    <ClCompile Include="..\..\public\zlib\deflate.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\gzio.c">
+    <ClCompile Include="..\..\public\zlib\gzio.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\infback.c">
+    <ClCompile Include="..\..\public\zlib\infback.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\inffast.c">
+    <ClCompile Include="..\..\public\zlib\inffast.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\inflate.c">
+    <ClCompile Include="..\..\public\zlib\inflate.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\inftrees.c">
+    <ClCompile Include="..\..\public\zlib\inftrees.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\trees.c">
+    <ClCompile Include="..\..\public\zlib\trees.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\uncompr.c">
+    <ClCompile Include="..\..\public\zlib\uncompr.c">
       <Filter>zlib</Filter>
     </ClCompile>
-    <ClCompile Include="zlib\zutil.c">
+    <ClCompile Include="..\..\public\zlib\zutil.c">
       <Filter>zlib</Filter>
     </ClCompile>
   </ItemGroup>
@@ -95,36 +95,6 @@
     <ClInclude Include="zlib.h">
       <Filter>Header Files</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>
   <ItemGroup>
     <ResourceCompile Include="amxxpc1.rc">
diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters
index 01d95974..925629bc 100644
--- a/dlls/geoip/msvc12/geoip.vcxproj.filters
+++ b/dlls/geoip/msvc12/geoip.vcxproj.filters
@@ -23,9 +23,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\GeoIP2\maxminddb.c">
-      <Filter>GeoIP2</Filter>
-    </ClCompile>
     <ClCompile Include="..\geoip_util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -38,6 +35,9 @@
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
+    <ClCompile Include="..\GeoIP2\maxminddb.c">
+      <Filter>GeoIP2</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\GeoIP2\maxminddb.h">
diff --git a/dlls/mysqlx/msvc12/mysqlx.vcxproj b/dlls/mysqlx/msvc12/mysqlx.vcxproj
index 231f1034..b0a700b8 100644
--- a/dlls/mysqlx/msvc12/mysqlx.vcxproj
+++ b/dlls/mysqlx/msvc12/mysqlx.vcxproj
@@ -99,6 +99,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\public\zlib\adler32.c" />
+    <ClCompile Include="..\..\..\public\zlib\compress.c" />
+    <ClCompile Include="..\..\..\public\zlib\crc32.c" />
+    <ClCompile Include="..\..\..\public\zlib\deflate.c" />
+    <ClCompile Include="..\..\..\public\zlib\gzio.c" />
+    <ClCompile Include="..\..\..\public\zlib\infback.c" />
+    <ClCompile Include="..\..\..\public\zlib\inffast.c" />
+    <ClCompile Include="..\..\..\public\zlib\inflate.c" />
+    <ClCompile Include="..\..\..\public\zlib\inftrees.c" />
+    <ClCompile Include="..\..\..\public\zlib\trees.c" />
+    <ClCompile Include="..\..\..\public\zlib\uncompr.c" />
+    <ClCompile Include="..\..\..\public\zlib\zutil.c" />
     <ClCompile Include="..\basic_sql.cpp" />
     <ClCompile Include="..\handles.cpp" />
     <ClCompile Include="..\module.cpp" />
diff --git a/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters b/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
index 0bf07341..8d93d52a 100644
--- a/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
+++ b/dlls/mysqlx/msvc12/mysqlx.vcxproj.filters
@@ -36,6 +36,9 @@
     <Filter Include="Pawn Includes">
       <UniqueIdentifier>{05423057-6d62-454a-b5f8-b451d91be196}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\zlib">
+      <UniqueIdentifier>{557b0e54-eb0e-488f-b8bc-3cee3f8ddfba}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\basic_sql.cpp">
@@ -77,6 +80,42 @@
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp">
       <Filter>Module SDK\SDK Base</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\adler32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\compress.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\crc32.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\deflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\gzio.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\infback.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\inffast.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\inflate.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\inftrees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\trees.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\uncompr.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\public\zlib\zutil.c">
+      <Filter>Source Files\zlib</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\mysql2_header.h">