86 files changed, 149 insertions, 30 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index 0f0357f2da..ea4dd06f21 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -447,6 +447,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\ProxySwitch\ProxySwitch.vcxproj", "{7446276D-5845-4258-A245-83D1D4D3CEC3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -2005,6 +2007,14 @@ Global
 		{7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|Win32.Build.0 = Release|Win32
 		{7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.ActiveCfg = Release|x64
 		{7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.Build.0 = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2130,6 +2140,7 @@ Global
 		{AD0D0500-CE7D-417D-9C36-3620D56CA6D4} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 		{7DC23E4E-2448-4811-AABD-F5D069F6E74A} = {F9C41695-3353-4564-A154-58106829B19C}
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index 316e590ec7..f98587fce8 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -139,6 +139,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols", "Protocols", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{6221EF9E-F53A-4381-B760-4C0208E5D597}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\sqlite3.vcxproj", "{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -507,6 +511,22 @@ Global
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.Build.0 = Release|Win32
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.ActiveCfg = Release|x64
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.Build.0 = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|Win32.Build.0 = Debug|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.ActiveCfg = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Debug|x64.Build.0 = Debug|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.ActiveCfg = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|Win32.Build.0 = Debug|Win32
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|x64.ActiveCfg = Debug|x64
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Debug|x64.Build.0 = Debug|x64
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|Win32.ActiveCfg = Release|Win32
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|Win32.Build.0 = Release|Win32
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.ActiveCfg = Release|x64
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -556,6 +576,8 @@ Global
 		{793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
 		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
 		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}
diff --git a/libs/libmdbx/libmdbx.vcxproj b/libs/libmdbx/libmdbx.vcxproj
new file mode 100644
index 0000000000..ea7e127144
--- /dev/null
+++ b/libs/libmdbx/libmdbx.vcxproj
@@ -0,0 +1,46 @@
+<?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>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{6D19209B-ECE7-4B9C-941C-0AA2B484F199}</ProjectGuid>
+    <ProjectName>libmdbx</ProjectName>
+    <TargetName>libmdbx</TargetName>
+  </PropertyGroup>
+  <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>MDBX_CONFIG_MANUAL_TLS_CALLBACK=1;LIBMDBX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\src\lck-windows.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\src\mdbx.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\src\osal.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\src\version.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/libs/libmdbx/libmdbx.vcxproj.filters b/libs/libmdbx/libmdbx.vcxproj.filters
new file mode 100644
index 0000000000..8bcc022f48
--- /dev/null
+++ b/libs/libmdbx/libmdbx.vcxproj.filters
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClCompile Include="src\stdafx.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\lck-windows.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\mdbx.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\osal.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\src\version.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/Dbx_mdbx/src/libmdbx/.circleci/config.yml b/libs/libmdbx/src/.circleci/config.yml
index 91e11a4bfe..91e11a4bfe 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/.circleci/config.yml
+++ b/libs/libmdbx/src/.circleci/config.yml
diff --git a/plugins/Dbx_mdbx/src/libmdbx/.clang-format b/libs/libmdbx/src/.clang-format
index 6c59ef3a39..6c59ef3a39 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/.clang-format
+++ b/libs/libmdbx/src/.clang-format
diff --git a/plugins/Dbx_mdbx/src/libmdbx/.gitignore b/libs/libmdbx/src/.gitignore
index 2ea34c8009..2ea34c8009 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/.gitignore
+++ b/libs/libmdbx/src/.gitignore
diff --git a/plugins/Dbx_mdbx/src/libmdbx/.travis.yml b/libs/libmdbx/src/.travis.yml
index 590944bb91..590944bb91 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/.travis.yml
+++ b/libs/libmdbx/src/.travis.yml
diff --git a/plugins/Dbx_mdbx/src/libmdbx/AUTHORS b/libs/libmdbx/src/AUTHORS
index 0a1a199682..0a1a199682 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/AUTHORS
+++ b/libs/libmdbx/src/AUTHORS
diff --git a/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt b/libs/libmdbx/src/CMakeLists.txt
index b664075556..b664075556 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/CMakeLists.txt
+++ b/libs/libmdbx/src/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/COPYRIGHT b/libs/libmdbx/src/COPYRIGHT
index 7c2fd24c78..7c2fd24c78 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/COPYRIGHT
+++ b/libs/libmdbx/src/COPYRIGHT
diff --git a/plugins/Dbx_mdbx/src/libmdbx/LICENSE b/libs/libmdbx/src/LICENSE
index 05ad7571e4..05ad7571e4 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/LICENSE
+++ b/libs/libmdbx/src/LICENSE
diff --git a/plugins/Dbx_mdbx/src/libmdbx/Makefile b/libs/libmdbx/src/Makefile
index dabf2f98e7..dabf2f98e7 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/Makefile
+++ b/libs/libmdbx/src/Makefile
diff --git a/plugins/Dbx_mdbx/src/libmdbx/README-RU.md b/libs/libmdbx/src/README-RU.md
index f4ae5e8f14..f4ae5e8f14 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/README-RU.md
+++ b/libs/libmdbx/src/README-RU.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/README.md b/libs/libmdbx/src/README.md
index 92b6542fa7..92b6542fa7 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/README.md
+++ b/libs/libmdbx/src/README.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/TODO.md b/libs/libmdbx/src/TODO.md
index 810b18dc4a..810b18dc4a 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/TODO.md
+++ b/libs/libmdbx/src/TODO.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/appveyor.yml b/libs/libmdbx/src/appveyor.yml
index d002453fdd..d002453fdd 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/appveyor.yml
+++ b/libs/libmdbx/src/appveyor.yml
diff --git a/plugins/Dbx_mdbx/src/libmdbx/build.sh b/libs/libmdbx/src/build.sh
index 5170882265..5170882265 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/build.sh
+++ b/libs/libmdbx/src/build.sh
diff --git a/plugins/Dbx_mdbx/src/libmdbx/dll.vcxproj b/libs/libmdbx/src/dll.vcxproj
index 746de67bd9..746de67bd9 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/dll.vcxproj
+++ b/libs/libmdbx/src/dll.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.config b/libs/libmdbx/src/libmdbx.config
index e0284f4257..e0284f4257 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.config
+++ b/libs/libmdbx/src/libmdbx.config
diff --git a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.creator b/libs/libmdbx/src/libmdbx.creator
index e94cbbd302..e94cbbd302 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.creator
+++ b/libs/libmdbx/src/libmdbx.creator
diff --git a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.files b/libs/libmdbx/src/libmdbx.files
index 38125146e4..38125146e4 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.files
+++ b/libs/libmdbx/src/libmdbx.files
diff --git a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.includes b/libs/libmdbx/src/libmdbx.includes
index 0b5ade5690..0b5ade5690 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/libmdbx.includes
+++ b/libs/libmdbx/src/libmdbx.includes
diff --git a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h b/libs/libmdbx/src/mdbx.h
index 35faed8488..35faed8488 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/mdbx.h
+++ b/libs/libmdbx/src/mdbx.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/package.sh b/libs/libmdbx/src/package.sh
index d7f9ab297a..d7f9ab297a 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/package.sh
+++ b/libs/libmdbx/src/package.sh
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/bits.h b/libs/libmdbx/src/src/bits.h
index 955a583264..955a583264 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/bits.h
+++ b/libs/libmdbx/src/src/bits.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/defs.h b/libs/libmdbx/src/src/defs.h
index b6076cc1b3..b6076cc1b3 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/defs.h
+++ b/libs/libmdbx/src/src/defs.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/lck-posix.c b/libs/libmdbx/src/src/lck-posix.c
index 869b98c054..869b98c054 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/lck-posix.c
+++ b/libs/libmdbx/src/src/lck-posix.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/lck-windows.c b/libs/libmdbx/src/src/lck-windows.c
index ab3fae57f8..ab3fae57f8 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/lck-windows.c
+++ b/libs/libmdbx/src/src/lck-windows.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/mdbx.c b/libs/libmdbx/src/src/mdbx.c
index ad55a98f81..ad55a98f81 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/mdbx.c
+++ b/libs/libmdbx/src/src/mdbx.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/osal.c b/libs/libmdbx/src/src/osal.c
index 738a179465..738a179465 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/osal.c
+++ b/libs/libmdbx/src/src/osal.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/osal.h b/libs/libmdbx/src/src/osal.h
index daa79064f9..daa79064f9 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/osal.h
+++ b/libs/libmdbx/src/src/osal.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/CMakeLists.txt b/libs/libmdbx/src/src/tools/CMakeLists.txt
index 3e200098f8..3e200098f8 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/CMakeLists.txt
+++ b/libs/libmdbx/src/src/tools/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_chk.c b/libs/libmdbx/src/src/tools/mdbx_chk.c
index 51096c4053..51096c4053 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_chk.c
+++ b/libs/libmdbx/src/src/tools/mdbx_chk.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_chk.vcxproj b/libs/libmdbx/src/src/tools/mdbx_chk.vcxproj
index d4cc420d36..d4cc420d36 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_chk.vcxproj
+++ b/libs/libmdbx/src/src/tools/mdbx_chk.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.1 b/libs/libmdbx/src/src/tools/mdbx_copy.1
index db6c453abd..db6c453abd 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.1
+++ b/libs/libmdbx/src/src/tools/mdbx_copy.1
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.c b/libs/libmdbx/src/src/tools/mdbx_copy.c
index ee3f739d4d..ee3f739d4d 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.c
+++ b/libs/libmdbx/src/src/tools/mdbx_copy.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.vcxproj b/libs/libmdbx/src/src/tools/mdbx_copy.vcxproj
index 6910060fcb..6910060fcb 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_copy.vcxproj
+++ b/libs/libmdbx/src/src/tools/mdbx_copy.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.1 b/libs/libmdbx/src/src/tools/mdbx_dump.1
index ccfcc0c9da..ccfcc0c9da 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.1
+++ b/libs/libmdbx/src/src/tools/mdbx_dump.1
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.c b/libs/libmdbx/src/src/tools/mdbx_dump.c
index c854e0ad15..c854e0ad15 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.c
+++ b/libs/libmdbx/src/src/tools/mdbx_dump.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.vcxproj b/libs/libmdbx/src/src/tools/mdbx_dump.vcxproj
index b44eb19328..b44eb19328 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_dump.vcxproj
+++ b/libs/libmdbx/src/src/tools/mdbx_dump.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.1 b/libs/libmdbx/src/src/tools/mdbx_load.1
index 7a18a6c018..7a18a6c018 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.1
+++ b/libs/libmdbx/src/src/tools/mdbx_load.1
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.c b/libs/libmdbx/src/src/tools/mdbx_load.c
index 4a337a1af3..4a337a1af3 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.c
+++ b/libs/libmdbx/src/src/tools/mdbx_load.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.vcxproj b/libs/libmdbx/src/src/tools/mdbx_load.vcxproj
index 6af6cc457c..6af6cc457c 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_load.vcxproj
+++ b/libs/libmdbx/src/src/tools/mdbx_load.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.1 b/libs/libmdbx/src/src/tools/mdbx_stat.1
index ca427f7a66..ca427f7a66 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.1
+++ b/libs/libmdbx/src/src/tools/mdbx_stat.1
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.c b/libs/libmdbx/src/src/tools/mdbx_stat.c
index a219b9ec0e..a219b9ec0e 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.c
+++ b/libs/libmdbx/src/src/tools/mdbx_stat.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.vcxproj b/libs/libmdbx/src/src/tools/mdbx_stat.vcxproj
index 1adcefde89..1adcefde89 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/mdbx_stat.vcxproj
+++ b/libs/libmdbx/src/src/tools/mdbx_stat.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/wingetopt.c b/libs/libmdbx/src/src/tools/wingetopt.c
index 1dd0d069fb..1dd0d069fb 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/wingetopt.c
+++ b/libs/libmdbx/src/src/tools/wingetopt.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/tools/wingetopt.h b/libs/libmdbx/src/src/tools/wingetopt.h
index fdff368374..fdff368374 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/tools/wingetopt.h
+++ b/libs/libmdbx/src/src/tools/wingetopt.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/src/version.c b/libs/libmdbx/src/src/version.c
index dfb4a5724c..dfb4a5724c 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/src/version.c
+++ b/libs/libmdbx/src/src/version.c
diff --git a/libs/libmdbx/src/stdafx.cxx b/libs/libmdbx/src/stdafx.cxx
new file mode 100644
index 0000000000..d79ecdb2b4
--- /dev/null
+++ b/libs/libmdbx/src/stdafx.cxx
@@ -0,0 +1,10 @@
+
+#include "stdafx.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved)
+{
+  mdbx_dll_callback(hInstDLL, reason, reserved);
+  return TRUE;
+}
diff --git a/libs/libmdbx/src/stdafx.h b/libs/libmdbx/src/stdafx.h
new file mode 100644
index 0000000000..6cc2b8b88f
--- /dev/null
+++ b/libs/libmdbx/src/stdafx.h
@@ -0,0 +1,28 @@
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (c) 2012-18 Miranda NG team (https://miranda-ng.org),
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#pragma once
+
+#include <windows.h>
+
+#include "mdbx.h"
+\ No newline at end of file
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/CMakeLists.txt b/libs/libmdbx/src/test/CMakeLists.txt
index 3ed01bddf9..3ed01bddf9 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/CMakeLists.txt
+++ b/libs/libmdbx/src/test/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/base.h b/libs/libmdbx/src/test/base.h
index b23f776aa3..b23f776aa3 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/base.h
+++ b/libs/libmdbx/src/test/base.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/cases.cc b/libs/libmdbx/src/test/cases.cc
index 4f4306d58e..4f4306d58e 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/cases.cc
+++ b/libs/libmdbx/src/test/cases.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/chrono.cc b/libs/libmdbx/src/test/chrono.cc
index f734668628..f734668628 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/chrono.cc
+++ b/libs/libmdbx/src/test/chrono.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/chrono.h b/libs/libmdbx/src/test/chrono.h
index c2bd5627a6..c2bd5627a6 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/chrono.h
+++ b/libs/libmdbx/src/test/chrono.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/config.cc b/libs/libmdbx/src/test/config.cc
index cbff68ce4e..cbff68ce4e 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/config.cc
+++ b/libs/libmdbx/src/test/config.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/config.h b/libs/libmdbx/src/test/config.h
index 86f37fbed8..86f37fbed8 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/config.h
+++ b/libs/libmdbx/src/test/config.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/dead.cc b/libs/libmdbx/src/test/dead.cc
index ee13fbd0ae..ee13fbd0ae 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/dead.cc
+++ b/libs/libmdbx/src/test/dead.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/hill.cc b/libs/libmdbx/src/test/hill.cc
index c9115784d4..c9115784d4 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/hill.cc
+++ b/libs/libmdbx/src/test/hill.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/jitter.cc b/libs/libmdbx/src/test/jitter.cc
index e7faf2a3f9..e7faf2a3f9 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/jitter.cc
+++ b/libs/libmdbx/src/test/jitter.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/keygen.cc b/libs/libmdbx/src/test/keygen.cc
index 99b46f2976..99b46f2976 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/keygen.cc
+++ b/libs/libmdbx/src/test/keygen.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/keygen.h b/libs/libmdbx/src/test/keygen.h
index c1e907bc0b..c1e907bc0b 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/keygen.h
+++ b/libs/libmdbx/src/test/keygen.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/log.cc b/libs/libmdbx/src/test/log.cc
index 521e1d6900..521e1d6900 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/log.cc
+++ b/libs/libmdbx/src/test/log.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/log.h b/libs/libmdbx/src/test/log.h
index e97e954cea..e97e954cea 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/log.h
+++ b/libs/libmdbx/src/test/log.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/main.cc b/libs/libmdbx/src/test/main.cc
index bc3198ed3a..bc3198ed3a 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/main.cc
+++ b/libs/libmdbx/src/test/main.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/osal-unix.cc b/libs/libmdbx/src/test/osal-unix.cc
index 8132e267ef..8132e267ef 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/osal-unix.cc
+++ b/libs/libmdbx/src/test/osal-unix.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/osal-windows.cc b/libs/libmdbx/src/test/osal-windows.cc
index 109c835a96..109c835a96 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/osal-windows.cc
+++ b/libs/libmdbx/src/test/osal-windows.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/osal.h b/libs/libmdbx/src/test/osal.h
index c27282a656..c27282a656 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/osal.h
+++ b/libs/libmdbx/src/test/osal.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/CMakeLists.txt b/libs/libmdbx/src/test/pcrf/CMakeLists.txt
index 399c33f88f..399c33f88f 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/CMakeLists.txt
+++ b/libs/libmdbx/src/test/pcrf/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/README.md b/libs/libmdbx/src/test/pcrf/README.md
index b2c9b5ce95..b2c9b5ce95 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/README.md
+++ b/libs/libmdbx/src/test/pcrf/README.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/pcrf_test.c b/libs/libmdbx/src/test/pcrf/pcrf_test.c
index 213c8b1d80..213c8b1d80 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/pcrf/pcrf_test.c
+++ b/libs/libmdbx/src/test/pcrf/pcrf_test.c
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/test.cc b/libs/libmdbx/src/test/test.cc
index 3750af525f..3750af525f 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/test.cc
+++ b/libs/libmdbx/src/test/test.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/test.h b/libs/libmdbx/src/test/test.h
index ef1c4caa47..ef1c4caa47 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/test.h
+++ b/libs/libmdbx/src/test/test.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/test.vcxproj b/libs/libmdbx/src/test/test.vcxproj
index 3ee13cf8cf..3ee13cf8cf 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/test.vcxproj
+++ b/libs/libmdbx/src/test/test.vcxproj
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/try.cc b/libs/libmdbx/src/test/try.cc
index 1deae71d31..1deae71d31 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/try.cc
+++ b/libs/libmdbx/src/test/try.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/utils.cc b/libs/libmdbx/src/test/utils.cc
index 0855c7eef3..0855c7eef3 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/utils.cc
+++ b/libs/libmdbx/src/test/utils.cc
diff --git a/plugins/Dbx_mdbx/src/libmdbx/test/utils.h b/libs/libmdbx/src/test/utils.h
index 5d62909fd5..5d62909fd5 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/test/utils.h
+++ b/libs/libmdbx/src/test/utils.h
diff --git a/plugins/Dbx_mdbx/src/libmdbx/tutorial/CMakeLists.txt b/libs/libmdbx/src/tutorial/CMakeLists.txt
index 196f1f48d7..196f1f48d7 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/tutorial/CMakeLists.txt
+++ b/libs/libmdbx/src/tutorial/CMakeLists.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/tutorial/README.md b/libs/libmdbx/src/tutorial/README.md
index b5218da304..b5218da304 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/tutorial/README.md
+++ b/libs/libmdbx/src/tutorial/README.md
diff --git a/plugins/Dbx_mdbx/src/libmdbx/tutorial/sample-bdb.txt b/libs/libmdbx/src/tutorial/sample-bdb.txt
index 1015d06460..1015d06460 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/tutorial/sample-bdb.txt
+++ b/libs/libmdbx/src/tutorial/sample-bdb.txt
diff --git a/plugins/Dbx_mdbx/src/libmdbx/tutorial/sample-mdbx.c b/libs/libmdbx/src/tutorial/sample-mdbx.c
index aaafbc31cf..aaafbc31cf 100644
--- a/plugins/Dbx_mdbx/src/libmdbx/tutorial/sample-mdbx.c
+++ b/libs/libmdbx/src/tutorial/sample-mdbx.c
diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
index 4cc04efd5c..4b2e3bcc38 100644
--- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
+++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj
@@ -18,6 +18,11 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libs\libmdbx\libmdbx.vcxproj">
+      <Project>{6d19209b-ece7-4b9c-941c-0aa2b484f199}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Dbx_mdbx</ProjectName>
     <ProjectGuid>{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}</ProjectGuid>
@@ -26,28 +31,9 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
   </ImportGroup>
-  <ItemGroup>
-    <ClCompile Include="src\libmdbx\src\lck-windows.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\libmdbx\src\mdbx.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\libmdbx\src\osal.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\libmdbx\src\version.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\libmdbx\mdbx.h" />
-  </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">MDB_DEBUG=5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>MDBX_CONFIG_MANUAL_TLS_CALLBACK=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 </Project>
 \ No newline at end of file
diff --git a/plugins/Dbx_mdbx/src/init.cpp b/plugins/Dbx_mdbx/src/init.cpp
index 8998211776..391fe88b56 100644
--- a/plugins/Dbx_mdbx/src/init.cpp
+++ b/plugins/Dbx_mdbx/src/init.cpp
@@ -47,16 +47,6 @@ CMPlugin::CMPlugin() :
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-EXTERN_C void NTAPI tls_callback(PVOID module, DWORD reason, PVOID reserved);
-
-BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID reserved)
-{
-	mdbx_dll_callback(hInstDLL, reason, reserved);
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
 extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_DATABASE, MIID_LAST };
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 49f182f5cf..2ee27c924a 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -48,7 +48,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_netlib.h>
 #include <m_gui.h>
 
-#include "libmdbx/mdbx.h"
+#include "../../Libs/libmdbx/src/mdbx.h"
 
 #ifndef thread_local
 #	define thread_local __declspec(thread)