icon resources path to include\msapi changed

git-svn-id: http://svn.miranda-ng.org/main/trunk@1560 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

26 files changed, 96 insertions, 186 deletions

diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj.user b/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj.user
deleted file mode 100644
index 695b5c78b9..0000000000
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-</Project>
\ No newline at end of file
diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
index 2c844ac8df..d9492edd6b 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_AIM.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
index 504464b74a..0ce9f55b3d 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Gadu.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
index 8cc8bd2180..ea716fbc37 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_General.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
index db6fbc72a5..d9262c8f29 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_ICQ.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
index 1182622491..b97dc15339 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_IRC.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
index ace42d400f..5e13daff31 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Jabber.vcxproj
@@ -76,7 +76,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -86,7 +86,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -96,7 +96,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -106,7 +106,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
index b48d7292ca..35cadb94d4 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MRA.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
index 3b28789ef8..e33831c85b 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_MSN.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
index cf050a8ca1..788f37c86b 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Multiprotocols.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
index 2c89c463b0..f5c6556e0c 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Packs.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
index fe775db2ab..f3e63d8220 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_QQ.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
index f703f87539..e6b6720e47 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_RSS.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
index d689e42d6d..2d44688e9d 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Skype.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
index 5cb4bf24b7..4fa4977da1 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Tlen.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
index 450dfcba6e..0dcf19136f 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_VoIP.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
index 7aed2c03da..414b248d59 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Weather.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
index c1b81fff93..c4f2e8e93c 100644
--- a/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
+++ b/plugins/FingerPrintModPlus/iconpacks/ClientIcons_Yahoo.vcxproj
@@ -70,7 +70,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -80,7 +80,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -90,7 +90,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
index 0f836a8fc5..a969e084be 100644
--- a/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
+++ b/plugins/MetaContacts/proto_metacontacts/Proto_MetaContacts.vcxproj
@@ -79,7 +79,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -91,7 +91,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -103,7 +103,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -115,7 +115,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
index 070e8a429f..2925ed9220 100644
--- a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
@@ -77,7 +77,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -89,7 +89,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

   </ItemDefinitionGroup>

@@ -112,7 +112,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

   </ItemDefinitionGroup>

diff --git a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters
index 913919d0ea..c0afa0256c 100644
--- a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj.filters
@@ -20,93 +20,6 @@
     </ClInclude>

   </ItemGroup>

   <ItemGroup>

-    <None Include="..\..\res\angeli-icons\AddXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\button.bold.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\button.fontface.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\button.italic.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\button.textcolor.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\button.underline.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\CloseXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\delete.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\empty.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\error.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\HistoryXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\Incom.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\InfoXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\Logo.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\MultiXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\OptXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\Outg.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\Pencil.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\PicXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\Quote02.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\SaveXP.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\secureim_off.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\secureim_on.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\angeli-icons\Send.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\smbutton.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\statuschange.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\Typing32.ico">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="..\..\res\unknown.bmp">

-      <Filter>Ressourcendateien</Filter>

-    </None>

-    <None Include="ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="ICONSXP.rc">

       <Filter>Ressourcendateien</Filter>

     </ResourceCompile>

diff --git a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
index 76c08c565d..99e3562966 100644
--- a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
@@ -76,7 +76,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -88,7 +88,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -100,7 +100,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -112,7 +112,7 @@
     </Link>

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
index b5d9b03aa6..9f66dd6e35 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

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

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

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

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

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

     <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <SubSystem>Windows</SubSystem>

diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
index 053172de33..99c35f9a62 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
index 87ac00bf4b..d5823e18ac 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
index 5e49622b34..df3e51bdf3 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>

@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>

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

     <ResourceCompile>

-      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\Src;..\..\..\..\include\msapi</AdditionalIncludeDirectories>

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

     </ResourceCompile>

     <Link>