73 files changed, 108 insertions, 2181 deletions
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln
index 9fd4dfacf8..47aa50cd3e 100644
--- a/bin10/mir_dev.sln
+++ b/bin10/mir_dev.sln
@@ -122,7 +122,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_10.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_10.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index a086484794..0d20c1d9ca 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -122,7 +122,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_10.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_10.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 475148c2b3..1e8d8cb16a 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -122,7 +122,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_10.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_10.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln
index f0e2ff3598..54b24d394c 100644
--- a/bin12/mir_dev.sln
+++ b/bin12/mir_dev.sln
@@ -124,7 +124,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_12.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_12.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 74e7a49d29..3335c00594 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -124,7 +124,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_12.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_12.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln
index 94e861b541..8eef7dad61 100644
--- a/bin14/mir_dev.sln
+++ b/bin14/mir_dev.sln
@@ -124,7 +124,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_14.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_14.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln
index a91408fac9..46b9285607 100644
--- a/bin14/mir_full.sln
+++ b/bin14/mir_full.sln
@@ -124,7 +124,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TranslitSwitcher", "..\plug
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UserGuide", "..\plugins\UserGuide\UserGuide.vcxproj", "{92E3BDEE-DD17-4619-AD61-70C0ADE04217}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx_14.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx", "..\plugins\UserInfoEx\UInfoEx.vcxproj", "{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Variables", "..\plugins\Variables\Variables_14.vcxproj", "{3038EF69-85BE-4D92-9864-CD6A5EBB558A}"
 EndProject
diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj b/plugins/UserInfoEx/UInfoEx.vcxproj
new file mode 100644
index 0000000000..0da6d52753
--- /dev/null
+++ b/plugins/UserInfoEx/UInfoEx.vcxproj
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>UInfoEx</ProjectName>
+    <ProjectGuid>{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}</ProjectGuid>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
+  </ImportGroup>
+  <ItemGroup>
+    <ClCompile Include="src\ex_import\*.cpp">
+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="src\Flags\*.cpp">
+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\ex_import\*.h" />
+    <ClInclude Include="src\Flags\*.h" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj.filters b/plugins/UserInfoEx/UInfoEx.vcxproj.filters
new file mode 100644
index 0000000000..de5ad9f66c
--- /dev/null
+++ b/plugins/UserInfoEx/UInfoEx.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+</Project>
+\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj b/plugins/UserInfoEx/UInfoEx_10.vcxproj
deleted file mode 100644
index ddc731d57e..0000000000
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>UInfoEx</ProjectName>
-    <ProjectGuid>{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>
-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp" />
-    <ClCompile Include="src\classMTime.cpp" />
-    <ClCompile Include="src\classPsTree.cpp" />
-    <ClCompile Include="src\classPsTreeItem.cpp" />
-    <ClCompile Include="src\stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp" />
-    <ClCompile Include="src\mir_contactqueue.cpp" />
-    <ClCompile Include="src\mir_db.cpp" />
-    <ClCompile Include="src\mir_icolib.cpp" />
-    <ClCompile Include="src\mir_menuitems.cpp" />
-    <ClCompile Include="src\mir_string.cpp" />
-    <ClCompile Include="src\psp_options.cpp" />
-    <ClCompile Include="src\commonheaders.cpp" />
-    <ClCompile Include="src\svc_avatar.cpp" />
-    <ClCompile Include="src\svc_constants.cpp" />
-    <ClCompile Include="src\svc_contactinfo.cpp" />
-    <ClCompile Include="src\svc_email.cpp" />
-    <ClCompile Include="src\svc_gender.cpp" />
-    <ClCompile Include="src\svc_homepage.cpp" />
-    <ClCompile Include="src\svc_phone.cpp" />
-    <ClCompile Include="src\svc_refreshci.cpp" />
-    <ClCompile Include="src\svc_reminder.cpp" />
-    <ClCompile Include="src\svc_timezone.cpp" />
-    <ClCompile Include="src\svc_timezone_old.cpp" />
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp" />
-    <ClCompile Include="src\dlg_msgbox.cpp" />
-    <ClCompile Include="src\dlg_propsheet.cpp" />
-    <ClCompile Include="src\psp_about.cpp" />
-    <ClCompile Include="src\psp_anniversary.cpp" />
-    <ClCompile Include="src\psp_base.cpp" />
-    <ClCompile Include="src\psp_company.cpp" />
-    <ClCompile Include="src\psp_contact.cpp" />
-    <ClCompile Include="src\psp_general.cpp" />
-    <ClCompile Include="src\psp_origin.cpp" />
-    <ClCompile Include="src\psp_profile.cpp" />
-    <ClCompile Include="src\ctrl_annivedit.cpp" />
-    <ClCompile Include="src\ctrl_base.cpp" />
-    <ClCompile Include="src\ctrl_button.cpp" />
-    <ClCompile Include="src\ctrl_combo.cpp" />
-    <ClCompile Include="src\ctrl_contact.cpp" />
-    <ClCompile Include="src\ctrl_edit.cpp" />
-    <ClCompile Include="src\ctrl_tzcombo.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h" />
-    <ClInclude Include="src\classMTime.h" />
-    <ClInclude Include="src\commonheaders.h" />
-    <ClInclude Include="src\mir_contactqueue.h" />
-    <ClInclude Include="src\mir_db.h" />
-    <ClInclude Include="src\mir_icolib.h" />
-    <ClInclude Include="src\mir_menuitems.h" />
-    <ClInclude Include="src\mir_string.h" />
-    <ClInclude Include="src\psp_options.h" />
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\svc_avatar.h" />
-    <ClInclude Include="src\svc_constants.h" />
-    <ClInclude Include="src\svc_contactinfo.h" />
-    <ClInclude Include="src\svc_email.h" />
-    <ClInclude Include="src\svc_gender.h" />
-    <ClInclude Include="src\svc_homepage.h" />
-    <ClInclude Include="src\svc_phone.h" />
-    <ClInclude Include="src\svc_refreshci.h" />
-    <ClInclude Include="src\svc_reminder.h" />
-    <ClInclude Include="src\svc_timezone.h" />
-    <ClInclude Include="src\svc_timezone_old.h" />
-    <ClInclude Include="src\ex_import\classExImContactBase.h" />
-    <ClInclude Include="src\ex_import\classExImContactXML.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h" />
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h" />
-    <ClInclude Include="src\ex_import\svc_ExImINI.h" />
-    <ClInclude Include="src\ex_import\svc_ExImport.h" />
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h" />
-    <ClInclude Include="src\ex_import\svc_ExImXML.h" />
-    <ClInclude Include="src\ex_import\tinystr.h" />
-    <ClInclude Include="src\ex_import\tinyxml.h" />
-    <ClInclude Include="src\Flags\svc_flags.h" />
-    <ClInclude Include="src\Flags\svc_flagsicons.h" />
-    <ClInclude Include="src\dlg_anniversarylist.h" />
-    <ClInclude Include="src\dlg_msgbox.h" />
-    <ClInclude Include="src\dlg_propsheet.h" />
-    <ClInclude Include="src\psp_base.h" />
-    <ClInclude Include="src\ctrl_annivedit.h" />
-    <ClInclude Include="src\ctrl_base.h" />
-    <ClInclude Include="src\ctrl_button.h" />
-    <ClInclude Include="src\ctrl_combo.h" />
-    <ClInclude Include="src\ctrl_contact.h" />
-    <ClInclude Include="src\ctrl_edit.h" />
-    <ClInclude Include="src\ctrl_tzcombo.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc" />
-    <ResourceCompile Include="Res\version.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Res\default.ico" />
-    <None Include="Res\dragcopy.cur" />
-    <None Include="Res\flags.png" />
-    <None Include="Res\main.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
deleted file mode 100644
index a6a771e14b..0000000000
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Services">
-      <UniqueIdentifier>{b6c244bf-9fad-4419-8f0f-9cb07cf48bb7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\Ex/Import">
-      <UniqueIdentifier>{0fd3588b-939c-41d0-bf47-e7bc29392b99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\flags">
-      <UniqueIdentifier>{bb1813db-77e2-46a5-af77-89f8bd382af5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs">
-      <UniqueIdentifier>{05209198-8422-4c92-ba1b-434bbd1a5869}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{7ac41146-b304-4f61-949a-4dcaa9c5bee5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controls">
-      <UniqueIdentifier>{480875a4-2930-4f2f-8f11-2dc84845017a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{926159d5-1636-487b-be43-1dea440490d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Controls">
-      <UniqueIdentifier>{e9323c0f-751b-4d5f-a19d-cd0c77e3b95b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs">
-      <UniqueIdentifier>{b10482a3-319f-409a-bd1d-453ce3cec51c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{0aa9d5ba-3483-45da-8c07-97cc50a110f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services">
-      <UniqueIdentifier>{55ff31c6-3890-4a48-aaba-c56ab175e43f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\Ex/Import">
-      <UniqueIdentifier>{3fc1aa6a-fcba-4c80-958b-3fd7ecd855d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\flags">
-      <UniqueIdentifier>{27726155-f4de-448c-bb09-f521cc7c1775}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classMTime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTreeItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\commonheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_contactqueue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_icolib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_menuitems.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_avatar.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_constants.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_contactinfo.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_email.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_gender.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_homepage.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_phone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_refreshci.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_reminder.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone_old.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_msgbox.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_propsheet.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_about.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_anniversary.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_base.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_company.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_contact.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_general.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_origin.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_profile.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_annivedit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_base.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_button.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_combo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_contact.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_edit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_tzcombo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_options.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\classMTime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\commonheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_contactqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_db.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_icolib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_menuitems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_annivedit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_base.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_button.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_combo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_contact.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_edit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_tzcombo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_anniversarylist.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_msgbox.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_propsheet.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_base.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_avatar.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_constants.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_contactinfo.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_email.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_gender.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_homepage.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_phone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_refreshci.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_reminder.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone_old.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactBase.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImINI.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImport.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinystr.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinyxml.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flags.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flagsicons.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_options.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="Res\version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Res\main.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Res\default.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Res\dragcopy.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Res\flags.png">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_12.vcxproj b/plugins/UserInfoEx/UInfoEx_12.vcxproj
deleted file mode 100644
index 848d629b13..0000000000
--- a/plugins/UserInfoEx/UInfoEx_12.vcxproj
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>UInfoEx</ProjectName>
-    <ProjectGuid>{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp" />
-    <ClCompile Include="src\classMTime.cpp" />
-    <ClCompile Include="src\classPsTree.cpp" />
-    <ClCompile Include="src\classPsTreeItem.cpp" />
-    <ClCompile Include="src\stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp" />
-    <ClCompile Include="src\mir_contactqueue.cpp" />
-    <ClCompile Include="src\mir_db.cpp" />
-    <ClCompile Include="src\mir_icolib.cpp" />
-    <ClCompile Include="src\mir_menuitems.cpp" />
-    <ClCompile Include="src\mir_string.cpp" />
-    <ClCompile Include="src\psp_options.cpp" />
-    <ClCompile Include="src\commonheaders.cpp" />
-    <ClCompile Include="src\svc_avatar.cpp" />
-    <ClCompile Include="src\svc_constants.cpp" />
-    <ClCompile Include="src\svc_contactinfo.cpp" />
-    <ClCompile Include="src\svc_email.cpp" />
-    <ClCompile Include="src\svc_gender.cpp" />
-    <ClCompile Include="src\svc_homepage.cpp" />
-    <ClCompile Include="src\svc_phone.cpp" />
-    <ClCompile Include="src\svc_refreshci.cpp" />
-    <ClCompile Include="src\svc_reminder.cpp" />
-    <ClCompile Include="src\svc_timezone.cpp" />
-    <ClCompile Include="src\svc_timezone_old.cpp" />
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp" />
-    <ClCompile Include="src\dlg_msgbox.cpp" />
-    <ClCompile Include="src\dlg_propsheet.cpp" />
-    <ClCompile Include="src\psp_about.cpp" />
-    <ClCompile Include="src\psp_anniversary.cpp" />
-    <ClCompile Include="src\psp_base.cpp" />
-    <ClCompile Include="src\psp_company.cpp" />
-    <ClCompile Include="src\psp_contact.cpp" />
-    <ClCompile Include="src\psp_general.cpp" />
-    <ClCompile Include="src\psp_origin.cpp" />
-    <ClCompile Include="src\psp_profile.cpp" />
-    <ClCompile Include="src\ctrl_annivedit.cpp" />
-    <ClCompile Include="src\ctrl_base.cpp" />
-    <ClCompile Include="src\ctrl_button.cpp" />
-    <ClCompile Include="src\ctrl_combo.cpp" />
-    <ClCompile Include="src\ctrl_contact.cpp" />
-    <ClCompile Include="src\ctrl_edit.cpp" />
-    <ClCompile Include="src\ctrl_tzcombo.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h" />
-    <ClInclude Include="src\classMTime.h" />
-    <ClInclude Include="src\commonheaders.h" />
-    <ClInclude Include="src\mir_contactqueue.h" />
-    <ClInclude Include="src\mir_db.h" />
-    <ClInclude Include="src\mir_icolib.h" />
-    <ClInclude Include="src\mir_menuitems.h" />
-    <ClInclude Include="src\mir_string.h" />
-    <ClInclude Include="src\psp_options.h" />
-    <ClInclude Include="src\svc_avatar.h" />
-    <ClInclude Include="src\svc_constants.h" />
-    <ClInclude Include="src\svc_contactinfo.h" />
-    <ClInclude Include="src\svc_email.h" />
-    <ClInclude Include="src\svc_gender.h" />
-    <ClInclude Include="src\svc_homepage.h" />
-    <ClInclude Include="src\svc_phone.h" />
-    <ClInclude Include="src\svc_refreshci.h" />
-    <ClInclude Include="src\svc_reminder.h" />
-    <ClInclude Include="src\svc_timezone.h" />
-    <ClInclude Include="src\svc_timezone_old.h" />
-    <ClInclude Include="src\ex_import\classExImContactBase.h" />
-    <ClInclude Include="src\ex_import\classExImContactXML.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h" />
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h" />
-    <ClInclude Include="src\ex_import\svc_ExImINI.h" />
-    <ClInclude Include="src\ex_import\svc_ExImport.h" />
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h" />
-    <ClInclude Include="src\ex_import\svc_ExImXML.h" />
-    <ClInclude Include="src\ex_import\tinystr.h" />
-    <ClInclude Include="src\ex_import\tinyxml.h" />
-    <ClInclude Include="src\Flags\svc_flags.h" />
-    <ClInclude Include="src\Flags\svc_flagsicons.h" />
-    <ClInclude Include="src\dlg_anniversarylist.h" />
-    <ClInclude Include="src\dlg_msgbox.h" />
-    <ClInclude Include="src\dlg_propsheet.h" />
-    <ClInclude Include="src\psp_base.h" />
-    <ClInclude Include="src\ctrl_annivedit.h" />
-    <ClInclude Include="src\ctrl_base.h" />
-    <ClInclude Include="src\ctrl_button.h" />
-    <ClInclude Include="src\ctrl_combo.h" />
-    <ClInclude Include="src\ctrl_contact.h" />
-    <ClInclude Include="src\ctrl_edit.h" />
-    <ClInclude Include="src\ctrl_tzcombo.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc" />
-    <ResourceCompile Include="Res\version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_12.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_12.vcxproj.filters
deleted file mode 100644
index ab87a3a61d..0000000000
--- a/plugins/UserInfoEx/UInfoEx_12.vcxproj.filters
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Services">
-      <UniqueIdentifier>{b6c244bf-9fad-4419-8f0f-9cb07cf48bb7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\Ex/Import">
-      <UniqueIdentifier>{0fd3588b-939c-41d0-bf47-e7bc29392b99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\flags">
-      <UniqueIdentifier>{bb1813db-77e2-46a5-af77-89f8bd382af5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs">
-      <UniqueIdentifier>{05209198-8422-4c92-ba1b-434bbd1a5869}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{7ac41146-b304-4f61-949a-4dcaa9c5bee5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controls">
-      <UniqueIdentifier>{480875a4-2930-4f2f-8f11-2dc84845017a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{926159d5-1636-487b-be43-1dea440490d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Controls">
-      <UniqueIdentifier>{e9323c0f-751b-4d5f-a19d-cd0c77e3b95b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs">
-      <UniqueIdentifier>{b10482a3-319f-409a-bd1d-453ce3cec51c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{0aa9d5ba-3483-45da-8c07-97cc50a110f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services">
-      <UniqueIdentifier>{55ff31c6-3890-4a48-aaba-c56ab175e43f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\Ex/Import">
-      <UniqueIdentifier>{3fc1aa6a-fcba-4c80-958b-3fd7ecd855d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\flags">
-      <UniqueIdentifier>{27726155-f4de-448c-bb09-f521cc7c1775}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classMTime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTreeItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\commonheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_contactqueue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_icolib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_menuitems.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_avatar.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_constants.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_contactinfo.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_email.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_gender.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_homepage.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_phone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_refreshci.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_reminder.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone_old.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_msgbox.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_propsheet.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_about.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_anniversary.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_base.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_company.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_contact.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_general.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_origin.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_profile.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_annivedit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_base.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_button.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_combo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_contact.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_edit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_tzcombo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_options.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\classMTime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\commonheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_contactqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_db.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_icolib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_menuitems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_annivedit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_base.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_button.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_combo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_contact.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_edit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_tzcombo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_anniversarylist.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_msgbox.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_propsheet.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_base.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_avatar.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_constants.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_contactinfo.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_email.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_gender.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_homepage.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_phone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_refreshci.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_reminder.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone_old.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactBase.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImINI.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImport.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinystr.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinyxml.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flags.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flagsicons.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_options.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="Res\version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_14.vcxproj b/plugins/UserInfoEx/UInfoEx_14.vcxproj
deleted file mode 100644
index 031a2ce71e..0000000000
--- a/plugins/UserInfoEx/UInfoEx_14.vcxproj
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>UInfoEx</ProjectName>
-    <ProjectGuid>{AD3B6CDC-7B26-4338-B6AE-0306DEDA0D6A}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <IgnoreImportLibrary>true</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <WarningLevel>Level3</WarningLevel>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>comctl32.lib;shlwapi.lib;UxTheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp" />
-    <ClCompile Include="src\classMTime.cpp" />
-    <ClCompile Include="src\classPsTree.cpp" />
-    <ClCompile Include="src\classPsTreeItem.cpp" />
-    <ClCompile Include="src\stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp" />
-    <ClCompile Include="src\mir_contactqueue.cpp" />
-    <ClCompile Include="src\mir_db.cpp" />
-    <ClCompile Include="src\mir_icolib.cpp" />
-    <ClCompile Include="src\mir_menuitems.cpp" />
-    <ClCompile Include="src\mir_string.cpp" />
-    <ClCompile Include="src\psp_options.cpp" />
-    <ClCompile Include="src\commonheaders.cpp" />
-    <ClCompile Include="src\svc_avatar.cpp" />
-    <ClCompile Include="src\svc_constants.cpp" />
-    <ClCompile Include="src\svc_contactinfo.cpp" />
-    <ClCompile Include="src\svc_email.cpp" />
-    <ClCompile Include="src\svc_gender.cpp" />
-    <ClCompile Include="src\svc_homepage.cpp" />
-    <ClCompile Include="src\svc_phone.cpp" />
-    <ClCompile Include="src\svc_refreshci.cpp" />
-    <ClCompile Include="src\svc_reminder.cpp" />
-    <ClCompile Include="src\svc_timezone.cpp" />
-    <ClCompile Include="src\svc_timezone_old.cpp" />
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp" />
-    <ClCompile Include="src\dlg_msgbox.cpp" />
-    <ClCompile Include="src\dlg_propsheet.cpp" />
-    <ClCompile Include="src\psp_about.cpp" />
-    <ClCompile Include="src\psp_anniversary.cpp" />
-    <ClCompile Include="src\psp_base.cpp" />
-    <ClCompile Include="src\psp_company.cpp" />
-    <ClCompile Include="src\psp_contact.cpp" />
-    <ClCompile Include="src\psp_general.cpp" />
-    <ClCompile Include="src\psp_origin.cpp" />
-    <ClCompile Include="src\psp_profile.cpp" />
-    <ClCompile Include="src\ctrl_annivedit.cpp" />
-    <ClCompile Include="src\ctrl_base.cpp" />
-    <ClCompile Include="src\ctrl_button.cpp" />
-    <ClCompile Include="src\ctrl_combo.cpp" />
-    <ClCompile Include="src\ctrl_contact.cpp" />
-    <ClCompile Include="src\ctrl_edit.cpp" />
-    <ClCompile Include="src\ctrl_tzcombo.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h" />
-    <ClInclude Include="src\classMTime.h" />
-    <ClInclude Include="src\commonheaders.h" />
-    <ClInclude Include="src\mir_contactqueue.h" />
-    <ClInclude Include="src\mir_db.h" />
-    <ClInclude Include="src\mir_icolib.h" />
-    <ClInclude Include="src\mir_menuitems.h" />
-    <ClInclude Include="src\mir_string.h" />
-    <ClInclude Include="src\psp_options.h" />
-    <ClInclude Include="src\svc_avatar.h" />
-    <ClInclude Include="src\svc_constants.h" />
-    <ClInclude Include="src\svc_contactinfo.h" />
-    <ClInclude Include="src\svc_email.h" />
-    <ClInclude Include="src\svc_gender.h" />
-    <ClInclude Include="src\svc_homepage.h" />
-    <ClInclude Include="src\svc_phone.h" />
-    <ClInclude Include="src\svc_refreshci.h" />
-    <ClInclude Include="src\svc_reminder.h" />
-    <ClInclude Include="src\svc_timezone.h" />
-    <ClInclude Include="src\svc_timezone_old.h" />
-    <ClInclude Include="src\ex_import\classExImContactBase.h" />
-    <ClInclude Include="src\ex_import\classExImContactXML.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h" />
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h" />
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h" />
-    <ClInclude Include="src\ex_import\svc_ExImINI.h" />
-    <ClInclude Include="src\ex_import\svc_ExImport.h" />
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h" />
-    <ClInclude Include="src\ex_import\svc_ExImXML.h" />
-    <ClInclude Include="src\ex_import\tinystr.h" />
-    <ClInclude Include="src\ex_import\tinyxml.h" />
-    <ClInclude Include="src\Flags\svc_flags.h" />
-    <ClInclude Include="src\Flags\svc_flagsicons.h" />
-    <ClInclude Include="src\dlg_anniversarylist.h" />
-    <ClInclude Include="src\dlg_msgbox.h" />
-    <ClInclude Include="src\dlg_propsheet.h" />
-    <ClInclude Include="src\psp_base.h" />
-    <ClInclude Include="src\ctrl_annivedit.h" />
-    <ClInclude Include="src\ctrl_base.h" />
-    <ClInclude Include="src\ctrl_button.h" />
-    <ClInclude Include="src\ctrl_combo.h" />
-    <ClInclude Include="src\ctrl_contact.h" />
-    <ClInclude Include="src\ctrl_edit.h" />
-    <ClInclude Include="src\ctrl_tzcombo.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc" />
-    <ResourceCompile Include="Res\version.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx_14.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_14.vcxproj.filters
deleted file mode 100644
index ab87a3a61d..0000000000
--- a/plugins/UserInfoEx/UInfoEx_14.vcxproj.filters
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\Services">
-      <UniqueIdentifier>{b6c244bf-9fad-4419-8f0f-9cb07cf48bb7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\Ex/Import">
-      <UniqueIdentifier>{0fd3588b-939c-41d0-bf47-e7bc29392b99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Services\flags">
-      <UniqueIdentifier>{bb1813db-77e2-46a5-af77-89f8bd382af5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs">
-      <UniqueIdentifier>{05209198-8422-4c92-ba1b-434bbd1a5869}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{7ac41146-b304-4f61-949a-4dcaa9c5bee5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Controls">
-      <UniqueIdentifier>{480875a4-2930-4f2f-8f11-2dc84845017a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{926159d5-1636-487b-be43-1dea440490d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Controls">
-      <UniqueIdentifier>{e9323c0f-751b-4d5f-a19d-cd0c77e3b95b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs">
-      <UniqueIdentifier>{b10482a3-319f-409a-bd1d-453ce3cec51c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Dialogs\Details Pages">
-      <UniqueIdentifier>{0aa9d5ba-3483-45da-8c07-97cc50a110f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services">
-      <UniqueIdentifier>{55ff31c6-3890-4a48-aaba-c56ab175e43f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\Ex/Import">
-      <UniqueIdentifier>{3fc1aa6a-fcba-4c80-958b-3fd7ecd855d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Services\flags">
-      <UniqueIdentifier>{27726155-f4de-448c-bb09-f521cc7c1775}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\classMAnnivDate.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classMTime.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTree.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\classPsTreeItem.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\commonheaders.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_contactqueue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_db.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_icolib.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_menuitems.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\mir_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_avatar.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_constants.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_contactinfo.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_email.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_gender.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_homepage.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_phone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_refreshci.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_reminder.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\svc_timezone_old.cpp">
-      <Filter>Source Files\Services</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinystr.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxml.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
-      <Filter>Source Files\Services\Ex/Import</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flags.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
-      <Filter>Source Files\Services\flags</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_anniversarylist.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_msgbox.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\dlg_propsheet.cpp">
-      <Filter>Source Files\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_about.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_anniversary.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_base.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_company.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_contact.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_general.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_origin.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_profile.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_annivedit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_base.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_button.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_combo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_contact.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_edit.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ctrl_tzcombo.cpp">
-      <Filter>Source Files\Controls</Filter>
-    </ClCompile>
-    <ClCompile Include="src\stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\psp_options.cpp">
-      <Filter>Source Files\Dialogs\Details Pages</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\classMAnnivDate.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\classMTime.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\commonheaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_contactqueue.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_db.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_icolib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_menuitems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\mir_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_annivedit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_base.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_button.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_combo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_contact.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_edit.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ctrl_tzcombo.h">
-      <Filter>Header Files\Controls</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_anniversarylist.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_msgbox.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\dlg_propsheet.h">
-      <Filter>Header Files\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_base.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_avatar.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_constants.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_contactinfo.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_email.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_gender.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_homepage.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_phone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_refreshci.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_reminder.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\svc_timezone_old.h">
-      <Filter>Header Files\Services</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactBase.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\classExImContactXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImModules.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\dlg_ExImProgress.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\mir_rfcCodecs.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImINI.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImport.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImVCF.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\svc_ExImXML.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinystr.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ex_import\tinyxml.h">
-      <Filter>Header Files\Services\Ex/Import</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flags.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Flags\svc_flagsicons.h">
-      <Filter>Header Files\Services\flags</Filter>
-    </ClInclude>
-    <ClInclude Include="src\psp_options.h">
-      <Filter>Header Files\Dialogs\Details Pages</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Res\resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="Res\version.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 33d0ccf619..98c2b9744a 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 #define M_ENABLE_SUBCTLS			(WM_APP+1)
 
diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index edc6e1718c..3468fcb749 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
@@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /************************* Bitmap Access **************************/
 
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index 6515cb28a5..6ab6a0644b 100644
--- a/plugins/UserInfoEx/src/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * System Includes:
  **/
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * name:	MAnnivDate
diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp
index 35955d4d14..ac8eee269a 100644
--- a/plugins/UserInfoEx/src/classMTime.cpp
+++ b/plugins/UserInfoEx/src/classMTime.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * System Includes:
  **/
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /******************************************************************************************
  * class MTime
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 033ce4c271..890af51d6c 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /***********************************************************************************************************
  * construction and destruction
diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 48607af40a..1ab4e27610 100644
--- a/plugins/UserInfoEx/src/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * name:	BoldGroupTitlesEnumChildren()
diff --git a/plugins/UserInfoEx/src/commonheaders.cpp b/plugins/UserInfoEx/src/commonheaders.cpp
index 9b4d77bff0..4a169f82ab 100644
--- a/plugins/UserInfoEx/src/commonheaders.cpp
+++ b/plugins/UserInfoEx/src/commonheaders.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 // global:
 HINSTANCE ghInst = NULL;
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index 25454e73c3..c13a17dbd6 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 CBaseCtrl* CAnnivEditCtrl::CreateObj(HWND hDlg, WORD idCtrl, LPCSTR pszSetting)
 {
diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp
index 9c82d728ad..c226ec3134 100644
--- a/plugins/UserInfoEx/src/ctrl_base.cpp
+++ b/plugins/UserInfoEx/src/ctrl_base.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /***********************************************************************************************************
  * Old methods for setting text color of dialog controls
diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index 38f34149d1..e2ec2b7292 100644
--- a/plugins/UserInfoEx/src/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 // Used for our own cheap TrackMouseEvent
 #define BUTTON_POLLID			 100
diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp
index b32ea49ee0..12a84556ad 100644
--- a/plugins/UserInfoEx/src/ctrl_combo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_combo.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * This static method creates an object for the CCombo class and returns its pointer.
diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 372e830963..b89767a117 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define MAX_CAT			64
 
diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index 299aeb0663..e627eb5882 100644
--- a/plugins/UserInfoEx/src/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * This function creates a CEditCtrl object. 
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index 52dd6b0d1b..5192cde19c 100644
--- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static INT_PTR EnumNamesProc(CTimeZone *pTimeZone, int index, LPARAM lParam)
 {
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 9584657a6a..2d1d7761a5 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
  * System Includes:
  **/
-#include "commonheaders.h"
+#include "stdafx.h"
 #include "svc_gender.h"
 #include "svc_reminder.h"
 #include "dlg_anniversarylist.h"
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index d2a8f9baec..dec690cae0 100644
--- a/plugins/UserInfoEx/src/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 #include <Commdlg.h>
 #include <m_clui.h>
 #include <m_skin.h>
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index 3d9324da40..b0f9a2999e 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 /**
 * System & local includes:
 **/
-#include "commonheaders.h"
+#include "stdafx.h"
 #include "dlg_propsheet.h"
 #include "psp_base.h"
 #include "ex_import\svc_ExImport.h"
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 0951d07ace..22bb4cea5f 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /**
  * name:	CExImContactBase
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 50e52a490f..fcdd7b15c4 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /***********************************************************************************************************
  * common stuff
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 7c3c94c116..a0cac027d1 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /***********************************************************************************************************
  * typedefs
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index c25ca2a7a3..449b84cace 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 #define HKEY_MIRANDA_PLACESBAR	_T("Software\\Miranda NG\\PlacesBar")
 #define HKEY_WINPOL_PLACESBAR	_T("Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar")
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index f2d1f52d8d..5d242d12a5 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /***********************************************************************************************************
  * windows procedure
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index de7bfe646e..2491f58242 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * system & local includes:
  **/
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /***********************************************************************************************************
  * exporting stuff
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 73322070da..2d9e69541f 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * system & local includes:
  **/
 
-#include "../commonheaders.h"
+#include "../stdafx.h"
 
 #define BLOCKSIZE 260
 
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index d6cb697531..687e596e13 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 #define XMLCARD_VERSION	"1.1"
 
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index e2dd3d4ee7..fa5139c530 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 /***********************************************************************************************************
  * internal functions
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.cpp b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
index 1041e8f037..55da240e24 100644
--- a/plugins/UserInfoEx/src/ex_import/tinystr.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
@@ -42,7 +42,7 @@ Copyright:
 ===============================================================================
  */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 #ifndef TIXML_USE_STL
 
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
index b41bffa85e..e03c5150bd 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
@@ -30,7 +30,7 @@ Copyright:
 ===============================================================================
  */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 bool TiXmlBase::condenseWhiteSpace = true;
 
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
index f227011d67..5832e115f0 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
@@ -30,7 +30,7 @@ Copyright:
 ===============================================================================
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 // The goal of the seperate error file is to make the first
 // step towards localization. tinyxml (currently) only supports
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
index 40f271cb3e..8f38ee8ce7 100644
--- a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
@@ -30,7 +30,7 @@ Copyright:
 ===============================================================================
 */
 
-#include "..\commonheaders.h"
+#include "..\stdafx.h"
 
 // Note tha "PutString" hardcodes the same list. This
 // is less flexible than it appears. Changing the entries
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 77324e2eee..a674881ea7 100644
--- a/plugins/UserInfoEx/src/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static PLUGININFOEX pluginInfo = {
 	sizeof(PLUGININFOEX),
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.cpp b/plugins/UserInfoEx/src/mir_contactqueue.cpp
index d07cc07213..f0d8c23a62 100644
--- a/plugins/UserInfoEx/src/mir_contactqueue.cpp
+++ b/plugins/UserInfoEx/src/mir_contactqueue.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static int QueueSortItems(const CQueueItem *i1, const CQueueItem *i2)
 {
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index 2574bf1e8a..689e364cc7 100644
--- a/plugins/UserInfoEx/src/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 namespace DB {
 
diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index 5ab5e1cefc..448e67b7ec 100644
--- a/plugins/UserInfoEx/src/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 typedef struct _ICODESC 
 {
diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index 003a2c9a88..bf72501961 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 enum ECascadeType {
 	MCAS_DISABLED	= 2,
diff --git a/plugins/UserInfoEx/src/mir_string.cpp b/plugins/UserInfoEx/src/mir_string.cpp
index 2f2dd7a62a..b483b0fdb9 100644
--- a/plugins/UserInfoEx/src/mir_string.cpp
+++ b/plugins/UserInfoEx/src/mir_string.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 char* mir_strncat_c(char *pszDest, const char cSrc)
 {
diff --git a/plugins/UserInfoEx/src/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp
index 2ee8e1fc78..d097a200b6 100644
--- a/plugins/UserInfoEx/src/psp_about.cpp
+++ b/plugins/UserInfoEx/src/psp_about.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * Dialog procedure for the about/nodes information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp
index 3c602c500c..e634756e2f 100644
--- a/plugins/UserInfoEx/src/psp_anniversary.cpp
+++ b/plugins/UserInfoEx/src/psp_anniversary.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * Dialog procedure for the anniversary add/edit dialog
diff --git a/plugins/UserInfoEx/src/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp
index eda25cd133..9437f693f3 100644
--- a/plugins/UserInfoEx/src/psp_base.cpp
+++ b/plugins/UserInfoEx/src/psp_base.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 void UpDate_CountryIcon(HWND hCtrl, int countryID)
 {
diff --git a/plugins/UserInfoEx/src/psp_company.cpp b/plugins/UserInfoEx/src/psp_company.cpp
index 924b69f1da..48797d60bd 100644
--- a/plugins/UserInfoEx/src/psp_company.cpp
+++ b/plugins/UserInfoEx/src/psp_company.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * Dialog procedure for the company contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index 88f61ba4f9..eef460bcbc 100644
--- a/plugins/UserInfoEx/src/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * Dialog procedure for the home contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp
index 946cd6ceb5..e0e5e349b0 100644
--- a/plugins/UserInfoEx/src/psp_general.cpp
+++ b/plugins/UserInfoEx/src/psp_general.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * Dialog procedure for the contact information propertysheetpage
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index a87e9ba81a..27df42185d 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define PSM_ENABLE_TABITEM	(WM_USER+106)
 
diff --git a/plugins/UserInfoEx/src/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp
index a3275fa436..7e104fc3d4 100644
--- a/plugins/UserInfoEx/src/psp_origin.cpp
+++ b/plugins/UserInfoEx/src/psp_origin.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
  * This is the dialog procedure for the advanced contact information propertysheetpage.
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index babaa68667..d359f18298 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define LVF_EDITLABEL	8
 
diff --git a/plugins/UserInfoEx/src/stdafx.cpp b/plugins/UserInfoEx/src/stdafx.cxx
index 048b14e9d2..6fb37564b7 100644
--- a/plugins/UserInfoEx/src/stdafx.cpp
+++ b/plugins/UserInfoEx/src/stdafx.cxx
@@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "commonheaders.h"
-\ No newline at end of file
+#include "stdafx.h"
+\ No newline at end of file
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/stdafx.h
index 2fbfbafe67..43675c5b5d 100644
--- a/plugins/UserInfoEx/src/commonheaders.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 0
-#define _CRT_SECURE_NO_WARNINGS
 
 /***********************************************************************************************************
  * standard windows includes
diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp
index 3dde09a036..9f26ba8a6a 100644
--- a/plugins/UserInfoEx/src/svc_avatar.cpp
+++ b/plugins/UserInfoEx/src/svc_avatar.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 namespace NServices
 {
diff --git a/plugins/UserInfoEx/src/svc_constants.cpp b/plugins/UserInfoEx/src/svc_constants.cpp
index 0abc59b0fd..21621fe2ce 100644
--- a/plugins/UserInfoEx/src/svc_constants.cpp
+++ b/plugins/UserInfoEx/src/svc_constants.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static IDSTRLIST TmplLanguages[] = {
 	{ 0, LPGEN("Unspecified"), 0},
diff --git a/plugins/UserInfoEx/src/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp
index 627d3c2794..aaaf2d0a1b 100644
--- a/plugins/UserInfoEx/src/svc_contactinfo.cpp
+++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * System Includes:
  **/
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define	CI_TCHAR(ci)	(((ci)->dwFlag & CNF_UNICODE) ? DBVT_WCHAR : DBVT_ASCIIZ)
 
diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp
index 825416ad0e..5b1ffd38a4 100644
--- a/plugins/UserInfoEx/src/svc_email.cpp
+++ b/plugins/UserInfoEx/src/svc_email.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static HGENMENU ghMenuItem = NULL;
 static HANDLE ghExtraIconDef = INVALID_HANDLE_VALUE;
diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp
index 409dca888c..50c400fa0c 100644
--- a/plugins/UserInfoEx/src/svc_gender.cpp
+++ b/plugins/UserInfoEx/src/svc_gender.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static HANDLE ghExtraIconF = INVALID_HANDLE_VALUE;
 static HANDLE ghExtraIconM = INVALID_HANDLE_VALUE;
diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp
index 773846657e..1afc7c46ab 100644
--- a/plugins/UserInfoEx/src/svc_homepage.cpp
+++ b/plugins/UserInfoEx/src/svc_homepage.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 static HGENMENU ghMenuItem = NULL;
 static HANDLE ghExtraIconDef = INVALID_HANDLE_VALUE;
diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp
index 9246ff87a0..587ddc483d 100644
--- a/plugins/UserInfoEx/src/svc_phone.cpp
+++ b/plugins/UserInfoEx/src/svc_phone.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 enum EPhoneType 
 {
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index f30db6a40b..9d430eaf48 100644
--- a/plugins/UserInfoEx/src/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define HM_PROTOACK	(WM_USER+100)
 
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index aacdf1e6c1..b0b9f6e23d 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * System Includes:
  **/
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /**
 * The CEvent structure describes the next anniversary to remind of.
diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp
index 29605c9c1d..76954c6d17 100644
--- a/plugins/UserInfoEx/src/svc_timezone.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 /***********************************************************************************************************
  * services
diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp
index 18da6a4739..0ad0da33b8 100644
--- a/plugins/UserInfoEx/src/svc_timezone_old.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include "commonheaders.h"
+#include "stdafx.h"
 
 #define TZREG		"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"
 #define TZREG_9X	"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Time Zones"