another part of small project fixes

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@199 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

15 files changed, 145 insertions, 79 deletions

diff --git a/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj b/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
index 806c0e3..a17cceb 100644
--- a/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
+++ b/FingerPrintModPlus/fingerprint_mod_vs2010.vcxproj
@@ -115,7 +115,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>../../include;include;src;res</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>FULL;_FULL;WIN32;NDEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -145,7 +145,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;include;src;res</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>FULL;_FULL;WIN32;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -174,7 +174,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>../../include;include;src;res</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -204,7 +204,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;include;src;res</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>FULL;_FULL;_WIN64;_DEBUG;_WINDOWS;_USRDLL;FINGERPRINT_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

diff --git a/dbx_mmap_sa/db3x_mmap_8.vcproj b/dbx_mmap_sa/db3x_mmap_8.vcproj
index 270e275..42723dd 100644
--- a/dbx_mmap_sa/db3x_mmap_8.vcproj
+++ b/dbx_mmap_sa/db3x_mmap_8.vcproj
@@ -48,7 +48,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -143,7 +143,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -239,7 +239,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="false"

 				BasicRuntimeChecks="3"

@@ -337,7 +337,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

diff --git a/dbx_mmap_sa/db3x_mmap_sa.vcproj b/dbx_mmap_sa/db3x_mmap_sa.vcproj
index 5151c5d..b90bc74 100644
--- a/dbx_mmap_sa/db3x_mmap_sa.vcproj
+++ b/dbx_mmap_sa/db3x_mmap_sa.vcproj
@@ -21,7 +21,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk;"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -88,7 +88,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="TRUE"

 				WholeProgramOptimization="TRUE"

-				AdditionalIncludeDirectories="../../include;sdk;"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="TRUE"

 				RuntimeLibrary="2"

@@ -156,7 +156,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk;"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="FALSE"

 				BasicRuntimeChecks="3"

@@ -225,7 +225,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="TRUE"

 				WholeProgramOptimization="TRUE"

-				AdditionalIncludeDirectories="../../include;sdk;"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="TRUE"

 				RuntimeLibrary="0"

diff --git a/dbx_mmap_sa/db3x_mmap_sa_10.sln b/dbx_mmap_sa/db3x_mmap_sa_10.sln
new file mode 100644
index 0000000..53b370a
--- /dev/null
+++ b/dbx_mmap_sa/db3x_mmap_sa_10.sln
@@ -0,0 +1,56 @@
+

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual C++ Express 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbx_mmap_sa", "db3x_mmap_sa_10.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_autobackups", "db_autobackups\db_autobackups_10.vcxproj", "{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbtool", "dbtool\dbtool_10.vcxproj", "{A2E9DA24-95E4-4414-94AF-488A382E276A}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "import_sa", "import_sa\import_sa_10.vcxproj", "{9299B507-1AF9-4C93-9560-5F637D1E0C9E}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug Unicode|Win32 = Debug Unicode|Win32

+		Debug|Win32 = Debug|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.ActiveCfg = Debug|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Debug|Win32.Build.0 = Debug|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Release|Win32.ActiveCfg = Release|Win32

+		{20D781FB-4A20-4B75-B863-304A47182966}.Release|Win32.Build.0 = Release|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|Win32.ActiveCfg = Debug|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Debug|Win32.Build.0 = Debug|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|Win32.ActiveCfg = Release|Win32

+		{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068}.Release|Win32.Build.0 = Release|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Debug|Win32.Build.0 = Debug|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release|Win32.ActiveCfg = Release|Win32

+		{A2E9DA24-95E4-4414-94AF-488A382E276A}.Release|Win32.Build.0 = Release|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Debug|Win32.Build.0 = Debug|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|Win32.ActiveCfg = Release|Win32

+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/dbx_mmap_sa/db3x_mmap_sa_10.vcxproj b/dbx_mmap_sa/db3x_mmap_sa_10.vcxproj
index c62669c..948be15 100644
--- a/dbx_mmap_sa/db3x_mmap_sa_10.vcxproj
+++ b/dbx_mmap_sa/db3x_mmap_sa_10.vcxproj
@@ -177,7 +177,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;./sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -187,6 +187,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -209,7 +210,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -250,7 +251,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;./sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -290,7 +291,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -331,7 +332,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;./sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -342,6 +343,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <StringPooling>false</StringPooling>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -364,7 +366,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -402,7 +404,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;./sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -442,7 +444,7 @@
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <OmitFramePointers>true</OmitFramePointers>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

diff --git a/dbx_mmap_sa/db3x_mmap_sa_8.vcproj b/dbx_mmap_sa/db3x_mmap_sa_8.vcproj
index c5d7be9..9df6eac 100644
--- a/dbx_mmap_sa/db3x_mmap_sa_8.vcproj
+++ b/dbx_mmap_sa/db3x_mmap_sa_8.vcproj
@@ -47,7 +47,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -143,7 +143,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -240,7 +240,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="false"

 				BasicRuntimeChecks="3"

@@ -339,7 +339,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

diff --git a/dbx_mmap_sa/db3x_mmap_sa_9.vcproj b/dbx_mmap_sa/db3x_mmap_sa_9.vcproj
index d98741c..e30abfd 100644
--- a/dbx_mmap_sa/db3x_mmap_sa_9.vcproj
+++ b/dbx_mmap_sa/db3x_mmap_sa_9.vcproj
@@ -50,7 +50,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -140,7 +140,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -235,7 +235,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -335,7 +335,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -431,7 +431,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -516,7 +516,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -606,7 +606,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -701,7 +701,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;sdk"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB3X_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

diff --git a/dbx_mmap_sa/db_autobackups/db_autobackups_10.vcxproj b/dbx_mmap_sa/db_autobackups/db_autobackups_10.vcxproj
index be122ad..4921f8c 100644
--- a/dbx_mmap_sa/db_autobackups/db_autobackups_10.vcxproj
+++ b/dbx_mmap_sa/db_autobackups/db_autobackups_10.vcxproj
@@ -155,7 +155,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -164,6 +164,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -178,7 +179,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -197,13 +198,14 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -219,7 +221,7 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

@@ -241,7 +243,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -250,6 +252,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -261,7 +264,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -277,13 +280,14 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../sdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -296,7 +300,7 @@
   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

diff --git a/dbx_mmap_sa/db_autobackups/db_autobackups_8.vcproj b/dbx_mmap_sa/db_autobackups/db_autobackups_8.vcproj
index 0fa17c1..4cb9b7f 100644
--- a/dbx_mmap_sa/db_autobackups/db_autobackups_8.vcproj
+++ b/dbx_mmap_sa/db_autobackups/db_autobackups_8.vcproj
@@ -40,7 +40,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -116,7 +116,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -193,7 +193,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -269,7 +269,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/dbx_mmap_sa/db_autobackups/db_autobackups_9.vcproj b/dbx_mmap_sa/db_autobackups/db_autobackups_9.vcproj
index eb64412..0659b1d 100644
--- a/dbx_mmap_sa/db_autobackups/db_autobackups_9.vcproj
+++ b/dbx_mmap_sa/db_autobackups/db_autobackups_9.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -120,7 +120,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -195,7 +195,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -272,7 +272,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -348,7 +348,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -422,7 +422,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -495,7 +495,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -570,7 +570,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DB_AUTOBACKUPS_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/dbx_mmap_sa/dbtool/dbtool_10.vcxproj b/dbx_mmap_sa/dbtool/dbtool_10.vcxproj
index ffc3283..c76a9f5 100644
--- a/dbx_mmap_sa/dbtool/dbtool_10.vcxproj
+++ b/dbx_mmap_sa/dbtool/dbtool_10.vcxproj
@@ -176,7 +176,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -187,6 +187,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -208,7 +209,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -244,7 +245,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -287,7 +288,7 @@
       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -326,7 +327,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -337,6 +338,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -358,7 +360,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>false</ExceptionHandling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -393,7 +395,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -435,7 +437,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

diff --git a/dbx_mmap_sa/dbtool/dbtool_8.vcproj b/dbx_mmap_sa/dbtool/dbtool_8.vcproj
index 865109e..6f5405d 100644
--- a/dbx_mmap_sa/dbtool/dbtool_8.vcproj
+++ b/dbx_mmap_sa/dbtool/dbtool_8.vcproj
@@ -49,7 +49,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

@@ -146,7 +146,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -248,7 +248,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

@@ -344,7 +344,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				StringPooling="true"

 				ExceptionHandling="0"

diff --git a/dbx_mmap_sa/dbtool/dbtool_9.vcproj b/dbx_mmap_sa/dbtool/dbtool_9.vcproj
index dbaf22c..f8f2fe5 100644
--- a/dbx_mmap_sa/dbtool/dbtool_9.vcproj
+++ b/dbx_mmap_sa/dbtool/dbtool_9.vcproj
@@ -47,7 +47,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

@@ -138,7 +138,7 @@
 				EnableIntrinsicFunctions="false"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				StringPooling="true"

 				ExceptionHandling="0"

@@ -230,7 +230,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				ExceptionHandling="0"

 				BasicRuntimeChecks="3"

@@ -320,7 +320,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../../include"

+				AdditionalIncludeDirectories="../../include,../../ExternalAPI"

 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;DATABASE_INDEPENDANT"

 				StringPooling="true"

 				ExceptionHandling="0"

diff --git a/dbx_mmap_sa/import_sa/import_sa_10.vcxproj b/dbx_mmap_sa/import_sa/import_sa_10.vcxproj
index ef387da..6e9e3f3 100644
--- a/dbx_mmap_sa/import_sa/import_sa_10.vcxproj
+++ b/dbx_mmap_sa/import_sa/import_sa_10.vcxproj
@@ -179,7 +179,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

@@ -239,7 +239,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

@@ -295,7 +295,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>

       </ExceptionHandling>

@@ -312,6 +312,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -344,7 +345,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <ExceptionHandling>

       </ExceptionHandling>

@@ -393,7 +394,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <ExceptionHandling>

@@ -410,10 +411,11 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

       <CompileAs>Default</CompileAs>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>../../../include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -441,7 +443,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <ExceptionHandling>

@@ -497,7 +499,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;../sdk</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

@@ -518,7 +520,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>../../../include</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

@@ -552,7 +554,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IMPORT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

diff --git a/dbx_mmap_sa/import_sa/version.h b/dbx_mmap_sa/import_sa/version.h
index b6a787e..43c6741 100644
--- a/dbx_mmap_sa/import_sa/version.h
+++ b/dbx_mmap_sa/import_sa/version.h
@@ -1,4 +1,4 @@
-#include "m_version.h"

+#include <m_version.h>

 

 #define __FILEVERSION_STRING        MIRANDA_VERSION_FILEVERSION

 #define __VERSION_STRING            MIRANDA_VERSION_STRING