small project fixes

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

18 files changed, 88 insertions, 96 deletions

diff --git a/Autorun/autorun.vcxproj b/Autorun/autorun.vcxproj
index 8b8efd2..8ca5fc5 100644
--- a/Autorun/autorun.vcxproj
+++ b/Autorun/autorun.vcxproj
@@ -58,12 +58,8 @@
       <WarningLevel>Level3</WarningLevel>

       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

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

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

-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Debug\autorun.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Debug\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

@@ -80,14 +76,12 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\autorun.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Console</SubSystem>

-      <ImportLibrary>.\Debug\autorun.lib</ImportLibrary>

       <BaseAddress>0x30040000</BaseAddress>

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

@@ -101,7 +95,7 @@
       <Optimization>MinSpace</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

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

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

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

       <BrowseInformation>true</BrowseInformation>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

diff --git a/Bass_interface/Bass_interface.vcxproj b/Bass_interface/Bass_interface.vcxproj
index f37c5a6..e04c8ab 100644
--- a/Bass_interface/Bass_interface.vcxproj
+++ b/Bass_interface/Bass_interface.vcxproj
@@ -85,7 +85,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

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

       <CompileAs>CompileAsC</CompileAs>

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -126,7 +127,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

@@ -154,7 +155,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>false</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

diff --git a/Boltun/Boltun.vcproj b/Boltun/Boltun.vcproj
index c2ef199..ce832cf 100644
--- a/Boltun/Boltun.vcproj
+++ b/Boltun/Boltun.vcproj
@@ -54,7 +54,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				WholeProgramOptimization="true"

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

+				AdditionalIncludeDirectories="../include"

 				PreprocessorDefinitions="NDEBUG;BOLTUN_EXPORTS;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -153,7 +153,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

+				AdditionalIncludeDirectories="../include"

 				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOLTUN_EXPORTS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -236,7 +236,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

+						AdditionalIncludeDirectories="../include"

 						PreprocessorDefinitions=""

 					/>

 				</FileConfiguration>

@@ -245,7 +245,7 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						AdditionalIncludeDirectories=""

+						AdditionalIncludeDirectories="../include"

 						PreprocessorDefinitions=""

 					/>

 				</FileConfiguration>

diff --git a/BossKeyPlus/BossKey.vcproj b/BossKeyPlus/BossKey.vcproj
index 8a14b05..6395ea6 100644
--- a/BossKeyPlus/BossKey.vcproj
+++ b/BossKeyPlus/BossKey.vcproj
@@ -25,7 +25,7 @@
 				GlobalOptimizations="TRUE"

 				InlineFunctionExpansion="0"

 				FavorSizeOrSpeed="2"

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

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

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

 				StringPooling="TRUE"

 				RuntimeLibrary="2"

@@ -93,7 +93,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -159,7 +159,7 @@
 				GlobalOptimizations="TRUE"

 				InlineFunctionExpansion="0"

 				FavorSizeOrSpeed="2"

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

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

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

 				StringPooling="TRUE"

 				RuntimeLibrary="2"

@@ -228,7 +228,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

diff --git a/BossKeyPlus/BossKey_10.vcxproj b/BossKeyPlus/BossKey_10.vcxproj
index 3171fc6..cfc9aa8 100644
--- a/BossKeyPlus/BossKey_10.vcxproj
+++ b/BossKeyPlus/BossKey_10.vcxproj
@@ -103,7 +103,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

       <BrowseInformationFile>

       </BrowseInformationFile>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

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

@@ -183,7 +184,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>Default</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -232,7 +233,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

diff --git a/BossKeyPlus/BossKey_9.vcproj b/BossKeyPlus/BossKey_9.vcproj
index f1fe087..9a56805 100644
--- a/BossKeyPlus/BossKey_9.vcproj
+++ b/BossKeyPlus/BossKey_9.vcproj
@@ -55,7 +55,7 @@
 				InlineFunctionExpansion="0"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

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

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

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

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -144,7 +144,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="0"

 				FavorSizeOrSpeed="2"

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

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

 				PreprocessorDefinitions="_WIN64"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -242,7 +242,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -326,7 +326,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

diff --git a/BuddyPounce/buddypounce.vcxproj b/BuddyPounce/buddypounce.vcxproj
index f7d9181..d45a4c5 100644
--- a/BuddyPounce/buddypounce.vcxproj
+++ b/BuddyPounce/buddypounce.vcxproj
@@ -65,7 +65,7 @@
       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

@@ -103,7 +103,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <ResourceCompile>

diff --git a/authstate/authstate.vcproj b/authstate/authstate.vcproj
index 34901fa..12c647f 100644
--- a/authstate/authstate.vcproj
+++ b/authstate/authstate.vcproj
@@ -19,7 +19,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

@@ -70,7 +70,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="1"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/authstate/authstate_10.vcxproj b/authstate/authstate_10.vcxproj
index fc2314e..f54aef6 100644
--- a/authstate/authstate_10.vcxproj
+++ b/authstate/authstate_10.vcxproj
@@ -159,7 +159,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -174,7 +174,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -183,7 +182,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -201,14 +200,13 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -224,7 +222,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -233,7 +230,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -251,7 +248,6 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -261,7 +257,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -288,7 +284,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -316,7 +312,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

@@ -344,7 +340,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

diff --git a/authstate/authstate_9.vcproj b/authstate/authstate_9.vcproj
index d2af804..bcd25c9 100644
--- a/authstate/authstate_9.vcproj
+++ b/authstate/authstate_9.vcproj
@@ -45,7 +45,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -121,7 +121,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -199,7 +199,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

@@ -281,7 +281,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

@@ -359,7 +359,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -436,7 +436,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -515,7 +515,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

@@ -597,7 +597,7 @@
 				Optimization="3"

 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="2"

diff --git a/buddyexpectator/BuddyExpectator10.vcxproj b/buddyexpectator/BuddyExpectator10.vcxproj
index 3c605a1..321d712 100644
--- a/buddyexpectator/BuddyExpectator10.vcxproj
+++ b/buddyexpectator/BuddyExpectator10.vcxproj
@@ -65,7 +65,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -109,7 +109,7 @@
     <ClCompile>

       <Optimization>MaxSpeed</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

diff --git a/buddyexpectator/BuddyExpectator8.vcproj b/buddyexpectator/BuddyExpectator8.vcproj
index fd4fb47..43b58f5 100644
--- a/buddyexpectator/BuddyExpectator8.vcproj
+++ b/buddyexpectator/BuddyExpectator8.vcproj
@@ -48,7 +48,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				InlineFunctionExpansion="1"

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

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

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

 				StringPooling="true"

 				RuntimeLibrary="0"

diff --git a/buddyexpectator/buddyexpectator.vcproj b/buddyexpectator/buddyexpectator.vcproj
index a83a32c..1040e28 100644
--- a/buddyexpectator/buddyexpectator.vcproj
+++ b/buddyexpectator/buddyexpectator.vcproj
@@ -19,7 +19,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

@@ -68,7 +68,7 @@
 			CharacterSet="2">

 			<Tool

 				Name="VCCLCompilerTool"

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

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

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/console/Console.vcproj b/console/Console.vcproj
index 782cda3..e84cbfb 100644
--- a/console/Console.vcproj
+++ b/console/Console.vcproj
@@ -51,7 +51,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

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

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -74,7 +74,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

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

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -151,7 +151,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

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

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

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

 				StringPooling="true"

 				RuntimeLibrary="2"

@@ -174,7 +174,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

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

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -249,7 +249,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

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

 				PreprocessorDefinitions="_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -272,7 +272,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="_DEBUG"

 				Culture="1033"

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

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -349,7 +349,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="3"

 				InlineFunctionExpansion="2"

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

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

 				PreprocessorDefinitions="_UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -372,7 +372,7 @@
 				Name="VCResourceCompilerTool"

 				PreprocessorDefinitions="NDEBUG"

 				Culture="1033"

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

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

 			/>

 			<Tool

 				Name="VCPreLinkEventTool"

@@ -430,7 +430,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						AdditionalIncludeDirectories=""

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

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						UsePrecompiledHeader="1"

@@ -443,7 +443,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						AdditionalIncludeDirectories=""

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

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS;$(NoInherit)"

 						UsePrecompiledHeader="1"

 						BrowseInformation="1"

@@ -455,7 +455,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						AdditionalIncludeDirectories=""

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

 						BasicRuntimeChecks="3"

 						UsePrecompiledHeader="1"

 						BrowseInformation="1"

@@ -467,7 +467,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						AdditionalIncludeDirectories=""

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

 						UsePrecompiledHeader="1"

 						BrowseInformation="1"

 					/>

@@ -482,7 +482,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						AdditionalIncludeDirectories=""

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

 						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS;$(NoInherit)"

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

@@ -494,7 +494,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						AdditionalIncludeDirectories=""

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

 						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;Console_EXPORTS;$(NoInherit)"

 						BrowseInformation="1"

 					/>

@@ -505,7 +505,7 @@
 					<Tool

 						Name="VCCLCompilerTool"

 						Optimization="0"

-						AdditionalIncludeDirectories=""

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

 						BasicRuntimeChecks="3"

 						BrowseInformation="1"

 					/>

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

 						Name="VCCLCompilerTool"

 						Optimization="2"

-						AdditionalIncludeDirectories=""

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

 						BrowseInformation="1"

 					/>

 				</FileConfiguration>

diff --git a/console/Console.vcxproj b/console/Console.vcxproj
index 274ba88..dbd582d 100644
--- a/console/Console.vcxproj
+++ b/console/Console.vcxproj
@@ -150,7 +150,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -166,7 +166,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -210,7 +210,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <OutputFile>../../Bin/Debug/plugins/Console.dll</OutputFile>

@@ -240,7 +240,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -256,7 +256,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -281,7 +281,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

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

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -300,7 +300,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <OutputFile>../../bin/release/plugins/Console.dll</OutputFile>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <PreprocessorDefinitions>_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -343,7 +343,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

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

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <PreprocessorDefinitions>_UNICODE;WIN32;_DEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -387,7 +387,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <OutputFile>../../Bin/Debug Unicode/plugins/Console.dll</OutputFile>

@@ -417,7 +417,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

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

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

       <PreprocessorDefinitions>_UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -433,7 +433,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -458,7 +458,7 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

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

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

       <PreprocessorDefinitions>_UNICODE;WIN32;NDEBUG;_WINDOWS;_USRDLL;Console_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

@@ -478,7 +478,7 @@
     <ResourceCompile>

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

       <Culture>0x0409</Culture>

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

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

     </ResourceCompile>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

diff --git a/contacts_rate/rate_10.vcxproj b/contacts_rate/rate_10.vcxproj
index a9738a4..c1e998b 100644
--- a/contacts_rate/rate_10.vcxproj
+++ b/contacts_rate/rate_10.vcxproj
@@ -47,7 +47,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -68,7 +68,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <Optimization>MinSpace</Optimization>

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

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

diff --git a/contacts_rate/rate_7.vcproj b/contacts_rate/rate_7.vcproj
index f96dc83..6bcc458 100644
--- a/contacts_rate/rate_7.vcproj
+++ b/contacts_rate/rate_7.vcproj
@@ -19,7 +19,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

+				AdditionalIncludeDirectories="../include"

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

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

@@ -70,7 +70,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="1"

-				AdditionalIncludeDirectories="../../include,../../miranda/miranda/include"

+				AdditionalIncludeDirectories="../include"

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

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

diff --git a/contacts_rate/rate_9.vcproj b/contacts_rate/rate_9.vcproj
index 7ba11d2..994d63a 100644
--- a/contacts_rate/rate_9.vcproj
+++ b/contacts_rate/rate_9.vcproj
@@ -42,7 +42,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

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

+				AdditionalIncludeDirectories="../include"

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

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

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

 				OmitFramePointers="false"

 				EnableFiberSafeOptimizations="false"

-				AdditionalIncludeDirectories="../../include,../../miranda/miranda/include"

+				AdditionalIncludeDirectories="../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;_CRT_SECURE_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				EnableEnhancedInstructionSet="2"