412 files changed, 568 insertions, 570 deletions
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
index dadf62115d..b5d9b03aa6 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj
@@ -71,7 +71,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -83,7 +83,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -107,7 +107,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc" />
-    <ResourceCompile Include="icons_version.rc" />
+    <ResourceCompile Include="res\icons.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj.filters b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj.filters
index 8b304d260d..d113f16f5b 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10.vcxproj.filters
@@ -1,10 +1,6 @@
 <?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="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc">
+    <ResourceCompile Include="res\icons.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
index 72f5b0419f..053172de33 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc" />
-    <ResourceCompile Include="icons_z2.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
+    <ResourceCompile Include="res\icons_z2.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj.filters b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj.filters
index 679dc605bd..ca2c9e7650 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/default/icons_default_10_z2.vcxproj.filters
@@ -1,10 +1,6 @@
 <?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="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_z2.rc">
+    <ResourceCompile Include="res\icons_z2.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/default/Anniversary.ico b/plugins/UserInfoEx/IconPacks/default/res/Anniversary.ico
index 9c8b6076fd..9c8b6076fd 100644
--- a/plugins/UserInfoEx/IconPacks/default/Anniversary.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/Anniversary.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/Search.ico b/plugins/UserInfoEx/IconPacks/default/res/Search.ico
index 4e64cd5a06..4e64cd5a06 100644
--- a/plugins/UserInfoEx/IconPacks/default/Search.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/Search.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/address.ico b/plugins/UserInfoEx/IconPacks/default/res/address.ico
index 94bdae9b05..94bdae9b05 100644
--- a/plugins/UserInfoEx/IconPacks/default/address.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/address.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta0.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta0.ico
index cee07be826..cee07be826 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta0.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta0.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta1.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta1.ico
index bbd4b98436..bbd4b98436 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta1.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta1.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta2.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta2.ico
index a31c4935bd..a31c4935bd 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta2.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta2.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta3.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta3.ico
index 5511c1a3b7..5511c1a3b7 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta3.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta3.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta4.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta4.ico
index fc8c862136..fc8c862136 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta4.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta4.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta5.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta5.ico
index b1a6328124..b1a6328124 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta5.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta5.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta6.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta6.ico
index 502e52979a..502e52979a 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta6.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta6.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta7.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta7.ico
index ea6e898a18..ea6e898a18 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta7.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta7.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta8.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta8.ico
index bea757c58d..bea757c58d 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta8.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta8.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dta9.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta9.ico
index 43e96076e5..43e96076e5 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dta9.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dta9.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/anniversary/dtax.ico b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dtax.ico
index 55492e1abd..55492e1abd 100644
--- a/plugins/UserInfoEx/IconPacks/default/anniversary/dtax.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/anniversary/dtax.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/backup.ico b/plugins/UserInfoEx/IconPacks/default/res/backup.ico
index a889ac4f4e..a889ac4f4e 100644
--- a/plugins/UserInfoEx/IconPacks/default/backup.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/backup.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday.ico
index f703cb9a46..f703cb9a46 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb0.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb0.ico
index 00ca4b216d..00ca4b216d 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb0.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb0.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb1.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb1.ico
index 81370ae23d..81370ae23d 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb1.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb1.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb2.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb2.ico
index fefb9ee13f..fefb9ee13f 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb2.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb2.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb3.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb3.ico
index f9aaeb7bce..f9aaeb7bce 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb3.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb3.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb4.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb4.ico
index ee58870ded..ee58870ded 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb4.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb4.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb5.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb5.ico
index 091e854ef1..091e854ef1 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb5.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb5.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb6.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb6.ico
index 4350a6f18f..4350a6f18f 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb6.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb6.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb7.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb7.ico
index db4f8da3d7..db4f8da3d7 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb7.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb7.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb8.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb8.ico
index fb7ba2ddc5..fb7ba2ddc5 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb8.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb8.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtb9.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb9.ico
index ff184f65fc..ff184f65fc 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtb9.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtb9.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/birthday/dtbX.ico b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtbX.ico
index b4acc3c5af..b4acc3c5af 100644
--- a/plugins/UserInfoEx/IconPacks/default/birthday/dtbX.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/birthday/dtbX.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnAdd.ico b/plugins/UserInfoEx/IconPacks/default/res/btnAdd.ico
index 7d4591305d..7d4591305d 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnAdd.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnAdd.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnApply.ico b/plugins/UserInfoEx/IconPacks/default/res/btnApply.ico
index e6ecd95bae..e6ecd95bae 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnApply.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnApply.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnClose.ico b/plugins/UserInfoEx/IconPacks/default/res/btnClose.ico
index f0d688b8de..f0d688b8de 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnClose.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnClose.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnDelete.ico b/plugins/UserInfoEx/IconPacks/default/res/btnDelete.ico
index 9cdb6799c1..9cdb6799c1 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnDelete.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnDelete.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnDownarrow.ico b/plugins/UserInfoEx/IconPacks/default/res/btnDownarrow.ico
index 341a4072a6..341a4072a6 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnDownarrow.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnDownarrow.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnEdit.ico b/plugins/UserInfoEx/IconPacks/default/res/btnEdit.ico
index e91ede69bf..e91ede69bf 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnEdit.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnEdit.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnGoto.ico b/plugins/UserInfoEx/IconPacks/default/res/btnGoto.ico
index 3197fa0865..3197fa0865 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnGoto.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnGoto.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnOk.ico b/plugins/UserInfoEx/IconPacks/default/res/btnOk.ico
index c83612c147..c83612c147 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnOk.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnOk.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btnUpdate.ico b/plugins/UserInfoEx/IconPacks/default/res/btnUpdate.ico
index 66a948f398..66a948f398 100644
--- a/plugins/UserInfoEx/IconPacks/default/btnUpdate.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btnUpdate.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/btneximport.ico b/plugins/UserInfoEx/IconPacks/default/res/btneximport.ico
index 547e34358e..547e34358e 100644
--- a/plugins/UserInfoEx/IconPacks/default/btneximport.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/btneximport.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/clock.ico b/plugins/UserInfoEx/IconPacks/default/res/clock.ico
index 6191c8f7b4..6191c8f7b4 100644
--- a/plugins/UserInfoEx/IconPacks/default/clock.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/clock.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/dlgDetails.ico b/plugins/UserInfoEx/IconPacks/default/res/dlgDetails.ico
index e1c4b23c29..e1c4b23c29 100644
--- a/plugins/UserInfoEx/IconPacks/default/dlgDetails.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/dlgDetails.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/dlgMail.ico b/plugins/UserInfoEx/IconPacks/default/res/dlgMail.ico
index 94bfde11ca..94bfde11ca 100644
--- a/plugins/UserInfoEx/IconPacks/default/dlgMail.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/dlgMail.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/dlgPhone.ico b/plugins/UserInfoEx/IconPacks/default/res/dlgPhone.ico
index 0939fb8727..0939fb8727 100644
--- a/plugins/UserInfoEx/IconPacks/default/dlgPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/dlgPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/export.ico b/plugins/UserInfoEx/IconPacks/default/res/export.ico
index 28d425327b..28d425327b 100644
--- a/plugins/UserInfoEx/IconPacks/default/export.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/export.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/female.ico b/plugins/UserInfoEx/IconPacks/default/res/female.ico
index bd8d9f245e..bd8d9f245e 100644
--- a/plugins/UserInfoEx/IconPacks/default/female.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/female.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/icons.rc b/plugins/UserInfoEx/IconPacks/default/res/icons.rc
index a018fb1382..7a7844370f 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons.rc
+++ b/plugins/UserInfoEx/IconPacks/default/res/icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_version.rc b/plugins/UserInfoEx/IconPacks/default/res/icons_version.rc
index afcc2bb426..13c13aaee5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_version.rc
+++ b/plugins/UserInfoEx/IconPacks/default/res/icons_version.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "icons_version.h"
+#include "..\src\icons_version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -61,34 +61,3 @@ VS_VERSION_INFO VERSIONINFO
 
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-#endif    // APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_z2.rc b/plugins/UserInfoEx/IconPacks/default/res/icons_z2.rc
index b88784a6ac..6a8291a879 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_z2.rc
+++ b/plugins/UserInfoEx/IconPacks/default/res/icons_z2.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/default/import.ico b/plugins/UserInfoEx/IconPacks/default/res/import.ico
index b301e8d353..b301e8d353 100644
--- a/plugins/UserInfoEx/IconPacks/default/import.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/import.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstCellular.ico b/plugins/UserInfoEx/IconPacks/default/res/lstCellular.ico
index dbbeabf4a2..dbbeabf4a2 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstCellular.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstCellular.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstCustomPhone.ico b/plugins/UserInfoEx/IconPacks/default/res/lstCustomPhone.ico
index 01c02594fa..01c02594fa 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstCustomPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstCustomPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstEmail.ico b/plugins/UserInfoEx/IconPacks/default/res/lstEmail.ico
index c619922f18..c619922f18 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstEmail.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstEmail.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstFax.ico b/plugins/UserInfoEx/IconPacks/default/res/lstFax.ico
index 710a96cb17..710a96cb17 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstFax.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstFax.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstFolder.ico b/plugins/UserInfoEx/IconPacks/default/res/lstFolder.ico
index 536e00fe39..536e00fe39 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstFolder.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstFolder.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstModules.ico b/plugins/UserInfoEx/IconPacks/default/res/lstModules.ico
index 1b29670675..1b29670675 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstModules.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstModules.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/lstPhone.ico b/plugins/UserInfoEx/IconPacks/default/res/lstPhone.ico
index 5c7d34d7e1..5c7d34d7e1 100644
--- a/plugins/UserInfoEx/IconPacks/default/lstPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/lstPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/main.ico b/plugins/UserInfoEx/IconPacks/default/res/main.ico
index 85a59decec..85a59decec 100644
--- a/plugins/UserInfoEx/IconPacks/default/main.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/main.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/male.ico b/plugins/UserInfoEx/IconPacks/default/res/male.ico
index 0298fc87c4..0298fc87c4 100644
--- a/plugins/UserInfoEx/IconPacks/default/male.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/male.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/marital.ico b/plugins/UserInfoEx/IconPacks/default/res/marital.ico
index ea273a1450..ea273a1450 100644
--- a/plugins/UserInfoEx/IconPacks/default/marital.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/marital.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/miranda.ico b/plugins/UserInfoEx/IconPacks/default/res/miranda.ico
index 4a770732e8..4a770732e8 100644
--- a/plugins/UserInfoEx/IconPacks/default/miranda.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/miranda.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/password.ico b/plugins/UserInfoEx/IconPacks/default/res/password.ico
index 964fcea884..964fcea884 100644
--- a/plugins/UserInfoEx/IconPacks/default/password.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/password.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treeAbout.ICO b/plugins/UserInfoEx/IconPacks/default/res/treeAbout.ICO
index 7b5dc5491a..7b5dc5491a 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeAbout.ICO
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeAbout.ICO
diff --git a/plugins/UserInfoEx/IconPacks/default/treeAdvanced.ico b/plugins/UserInfoEx/IconPacks/default/res/treeAdvanced.ico
index 947f68bcc7..947f68bcc7 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeAdvanced.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeAdvanced.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treeCompany.ico b/plugins/UserInfoEx/IconPacks/default/res/treeCompany.ico
index fd7c89c0b1..fd7c89c0b1 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeCompany.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeCompany.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treeContact.ico b/plugins/UserInfoEx/IconPacks/default/res/treeContact.ico
index e14c540a0f..e14c540a0f 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeContact.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeContact.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treeGeneral.ico b/plugins/UserInfoEx/IconPacks/default/res/treeGeneral.ico
index 0a14825f9f..0a14825f9f 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeGeneral.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeGeneral.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treeNotes.ico b/plugins/UserInfoEx/IconPacks/default/res/treeNotes.ico
index 771d3b4c0b..771d3b4c0b 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeNotes.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeNotes.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/treePhoto.ICO b/plugins/UserInfoEx/IconPacks/default/res/treePhoto.ICO
index 523dcc5948..523dcc5948 100644
--- a/plugins/UserInfoEx/IconPacks/default/treePhoto.ICO
+++ b/plugins/UserInfoEx/IconPacks/default/res/treePhoto.ICO
diff --git a/plugins/UserInfoEx/IconPacks/default/treeProfile.ico b/plugins/UserInfoEx/IconPacks/default/res/treeProfile.ico
index 5461bdda99..5461bdda99 100644
--- a/plugins/UserInfoEx/IconPacks/default/treeProfile.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/treeProfile.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/aquarius.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/aquarius.ico
index 71e908f98f..71e908f98f 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/aries.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/aries.ico
index a83c33f252..a83c33f252 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/cancer.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/cancer.ico
index 059cc16a1e..059cc16a1e 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/capricorn.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/capricorn.ico
index 50892bb347..50892bb347 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/gemini.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/gemini.ico
index 1d11882c1c..1d11882c1c 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/leo.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/leo.ico
index 87daea39f6..87daea39f6 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/libra.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/libra.ico
index 728c428883..728c428883 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/pisces.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/pisces.ico
index 8e85ba4e52..8e85ba4e52 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/sagittarius.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/sagittarius.ico
index 5d82ba7828..5d82ba7828 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/scorpio.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/scorpio.ico
index 59f93e8dfd..59f93e8dfd 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/taurus.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/taurus.ico
index 4583f28bef..4583f28bef 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac/virgo.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac/virgo.ico
index f1d241fa4e..f1d241fa4e 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/aquarius.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/aquarius.ico
index 096e235168..096e235168 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/aries.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/aries.ico
index 5e2e36b4ed..5e2e36b4ed 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/cancer.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/cancer.ico
index e561cbcfb9..e561cbcfb9 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/capricorn.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/capricorn.ico
index 364dae632c..364dae632c 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/gemini.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/gemini.ico
index afa6b89d4c..afa6b89d4c 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/leo.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/leo.ico
index fb288f0ec6..fb288f0ec6 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/libra.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/libra.ico
index a8277aa2ce..a8277aa2ce 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/pisces.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/pisces.ico
index 72cff46ea9..72cff46ea9 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/sagittarius.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/sagittarius.ico
index 6a7cdbae94..6a7cdbae94 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/scorpio.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/scorpio.ico
index 0011bb066c..0011bb066c 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/taurus.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/taurus.ico
index f98cf89eb9..f98cf89eb9 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/default/zodiac2/virgo.ico b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/virgo.ico
index 67a2a1077f..67a2a1077f 100644
--- a/plugins/UserInfoEx/IconPacks/default/zodiac2/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/default/res/zodiac2/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/icons.h b/plugins/UserInfoEx/IconPacks/default/src/icons.h
index 46871836bd..46871836bd 100644
--- a/plugins/UserInfoEx/IconPacks/icons.h
+++ b/plugins/UserInfoEx/IconPacks/default/src/icons.h
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_version.h b/plugins/UserInfoEx/IconPacks/default/src/icons_version.h
index 70cfcad517..70cfcad517 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_version.h
+++ b/plugins/UserInfoEx/IconPacks/default/src/icons_version.h
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
index a00d82d3d5..87ac00bf4b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc" />
-    <ResourceCompile Include="icons_version.rc" />
+    <ResourceCompile Include="res\icons.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
index 8b304d260d..d113f16f5b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10.vcxproj.filters
@@ -1,10 +1,6 @@
 <?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="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons.rc">
+    <ResourceCompile Include="res\icons.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
index d1ee7631a1..5e49622b34 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -82,7 +82,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -94,7 +94,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -106,7 +106,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\Res;..\..\include\msapi</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Src;..\..\include\msapi</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
@@ -117,12 +117,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h" />
-    <ClInclude Include="icons_version.h" />
+    <ClInclude Include="src\icons.h" />
+    <ClInclude Include="src\icons_version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc" />
-    <ResourceCompile Include="icons_z2.rc" />
+    <ResourceCompile Include="res\icons_version.rc" />
+    <ResourceCompile Include="res\icons_z2.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
index 679dc605bd..ca2c9e7650 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
+++ b/plugins/UserInfoEx/IconPacks/ice/icons_ice_10_z2.vcxproj.filters
@@ -1,10 +1,6 @@
 <?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="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
@@ -15,18 +11,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\icons.h">
+    <ClInclude Include="src\icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="icons_version.h">
+    <ClInclude Include="src\icons_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="icons_version.rc">
+    <ResourceCompile Include="res\icons_version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="icons_z2.rc">
+    <ResourceCompile Include="res\icons_z2.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/UserInfoEx/IconPacks/ice/Anniversary.ico b/plugins/UserInfoEx/IconPacks/ice/res/Anniversary.ico
index 5ade05b164..5ade05b164 100644
--- a/plugins/UserInfoEx/IconPacks/ice/Anniversary.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/Anniversary.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/Search.ico b/plugins/UserInfoEx/IconPacks/ice/res/Search.ico
index 01c82c6970..01c82c6970 100644
--- a/plugins/UserInfoEx/IconPacks/ice/Search.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/Search.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/address.ico b/plugins/UserInfoEx/IconPacks/ice/res/address.ico
index b12d3bace8..b12d3bace8 100644
--- a/plugins/UserInfoEx/IconPacks/ice/address.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/address.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/AnnList.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/AnnList.ico
index 29f7ac620b..29f7ac620b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/AnnList.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/AnnList.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta0.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta0.ico
index 29f7ac620b..29f7ac620b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta0.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta0.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta1.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta1.ico
index 2028f0fa21..2028f0fa21 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta1.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta1.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta2.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta2.ico
index b287f5edc9..b287f5edc9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta2.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta2.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta3.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta3.ico
index 10880e39dc..10880e39dc 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta3.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta3.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta4.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta4.ico
index d3a791f264..d3a791f264 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta4.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta4.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta5.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta5.ico
index 816c1f7e73..816c1f7e73 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta5.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta5.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta6.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta6.ico
index 57698e51c1..57698e51c1 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta6.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta6.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta7.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta7.ico
index 272dcba4e2..272dcba4e2 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta7.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta7.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta8.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta8.ico
index 8114b38981..8114b38981 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta8.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta8.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta9.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta9.ico
index a76627e93a..a76627e93a 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dta9.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dta9.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/anniversary/dtax.ico b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dtax.ico
index 1db4ae540f..1db4ae540f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/anniversary/dtax.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/anniversary/dtax.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/backup.ico b/plugins/UserInfoEx/IconPacks/ice/res/backup.ico
index be4f150bba..be4f150bba 100644
--- a/plugins/UserInfoEx/IconPacks/ice/backup.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/backup.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday.ico
index a826639236..a826639236 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb0.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb0.ico
index a826639236..a826639236 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb0.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb0.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb1.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb1.ico
index d01b8994cf..d01b8994cf 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb1.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb1.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb2.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb2.ico
index e299d640ae..e299d640ae 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb2.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb2.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb3.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb3.ico
index a5f6c8ef1a..a5f6c8ef1a 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb3.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb3.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb4.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb4.ico
index 5ebb2acf03..5ebb2acf03 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb4.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb4.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb5.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb5.ico
index 55ccefde29..55ccefde29 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb5.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb5.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb6.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb6.ico
index ec5789d521..ec5789d521 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb6.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb6.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb7.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb7.ico
index 58577f7594..58577f7594 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb7.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb7.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb8.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb8.ico
index fa718fc68c..fa718fc68c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb8.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb8.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb9.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb9.ico
index dfb98ad3ba..dfb98ad3ba 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtb9.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtb9.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/birthday/dtbX.ico b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtbX.ico
index e3d87ec3c0..e3d87ec3c0 100644
--- a/plugins/UserInfoEx/IconPacks/ice/birthday/dtbX.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/birthday/dtbX.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnAdd.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnAdd.ico
index fa37e9357c..fa37e9357c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnAdd.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnAdd.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnApply.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnApply.ico
index 82a63473cc..82a63473cc 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnApply.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnApply.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnClose.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnClose.ico
index 9433c50698..9433c50698 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnClose.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnClose.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnDelete.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnDelete.ico
index 0509e4400f..0509e4400f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnDelete.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnDelete.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnDownarrow.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnDownarrow.ico
index fb3f085bc7..fb3f085bc7 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnDownarrow.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnDownarrow.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnEdit.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnEdit.ico
index b09cff0c9d..b09cff0c9d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnEdit.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnEdit.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnGoto.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnGoto.ico
index 63c082b5d5..63c082b5d5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnGoto.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnGoto.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnOk.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnOk.ico
index 5bf142d1f5..5bf142d1f5 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnOk.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnOk.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btnUpdate.ico b/plugins/UserInfoEx/IconPacks/ice/res/btnUpdate.ico
index a389a6798d..a389a6798d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btnUpdate.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btnUpdate.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/btneximport.ico b/plugins/UserInfoEx/IconPacks/ice/res/btneximport.ico
index 9c3a6c7b6d..9c3a6c7b6d 100644
--- a/plugins/UserInfoEx/IconPacks/ice/btneximport.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/btneximport.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/clock.ico b/plugins/UserInfoEx/IconPacks/ice/res/clock.ico
index 625d8c4c06..625d8c4c06 100644
--- a/plugins/UserInfoEx/IconPacks/ice/clock.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/clock.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/default.ico b/plugins/UserInfoEx/IconPacks/ice/res/default.ico
index 8b3af75f05..8b3af75f05 100644
--- a/plugins/UserInfoEx/IconPacks/ice/default.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/default.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgDetails.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgDetails.ico
index e501ec7c4f..e501ec7c4f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgDetails.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgDetails.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgMail.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgMail.ico
index 8d87fa5a3f..8d87fa5a3f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgMail.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgMail.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/dlgPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/dlgPhone.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/dlgPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/dlgPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/export.ico b/plugins/UserInfoEx/IconPacks/ice/res/export.ico
index e2b5b596a8..e2b5b596a8 100644
--- a/plugins/UserInfoEx/IconPacks/ice/export.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/export.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/female.ico b/plugins/UserInfoEx/IconPacks/ice/res/female.ico
index fe1cbd2bce..fe1cbd2bce 100644
--- a/plugins/UserInfoEx/IconPacks/ice/female.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/female.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons.rc
index a018fb1382..7a7844370f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_version.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons_version.rc
index afcc2bb426..13c13aaee5 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_version.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons_version.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "icons_version.h"
+#include "..\src\icons_version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -61,34 +61,3 @@ VS_VERSION_INFO VERSIONINFO
 
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-END
-
-#endif    // APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/UserInfoEx/IconPacks/default/icons_z2.rc b/plugins/UserInfoEx/IconPacks/ice/res/icons_z2.rc
index b88784a6ac..6a8291a879 100644
--- a/plugins/UserInfoEx/IconPacks/default/icons_z2.rc
+++ b/plugins/UserInfoEx/IconPacks/ice/res/icons_z2.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "../icons.h"
+#include "..\src\icons.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/UserInfoEx/IconPacks/ice/import.ico b/plugins/UserInfoEx/IconPacks/ice/res/import.ico
index 900ccca6f4..900ccca6f4 100644
--- a/plugins/UserInfoEx/IconPacks/ice/import.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/import.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstCellular.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstCellular.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstCellular.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstCellular.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstCustomPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstCustomPhone.ico
index 3afc88a85f..3afc88a85f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstCustomPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstCustomPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstEmail.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstEmail.ico
index 7ae4607452..7ae4607452 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstEmail.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstEmail.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstFax.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstFax.ico
index 3d13b10d46..3d13b10d46 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstFax.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstFax.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstFolder.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstFolder.ico
index e1c1008fac..e1c1008fac 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstFolder.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstFolder.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstModules.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstModules.ico
index 8a9e089fa9..8a9e089fa9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstModules.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstModules.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/lstPhone.ico b/plugins/UserInfoEx/IconPacks/ice/res/lstPhone.ico
index 3afc88a85f..3afc88a85f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/lstPhone.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/lstPhone.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/main.ico b/plugins/UserInfoEx/IconPacks/ice/res/main.ico
index 8d5d317df1..8d5d317df1 100644
--- a/plugins/UserInfoEx/IconPacks/ice/main.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/main.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/male.ico b/plugins/UserInfoEx/IconPacks/ice/res/male.ico
index ebd0420554..ebd0420554 100644
--- a/plugins/UserInfoEx/IconPacks/ice/male.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/male.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/marital.ico b/plugins/UserInfoEx/IconPacks/ice/res/marital.ico
index 23eae17734..23eae17734 100644
--- a/plugins/UserInfoEx/IconPacks/ice/marital.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/marital.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/miranda.ico b/plugins/UserInfoEx/IconPacks/ice/res/miranda.ico
index 8b04a3bb30..8b04a3bb30 100644
--- a/plugins/UserInfoEx/IconPacks/ice/miranda.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/miranda.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/password.ico b/plugins/UserInfoEx/IconPacks/ice/res/password.ico
index c598650631..c598650631 100644
--- a/plugins/UserInfoEx/IconPacks/ice/password.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/password.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeAbout.ICO b/plugins/UserInfoEx/IconPacks/ice/res/treeAbout.ICO
index 8a6347b2d3..8a6347b2d3 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeAbout.ICO
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeAbout.ICO
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeAdvanced.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeAdvanced.ico
index 07d0c449bb..07d0c449bb 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeAdvanced.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeAdvanced.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeCompany.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeCompany.ico
index a8b19b3ab6..a8b19b3ab6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeCompany.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeCompany.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeContact.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeContact.ico
index 8a6347b2d3..8a6347b2d3 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeContact.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeContact.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeGeneral.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeGeneral.ico
index 1fa668ed49..1fa668ed49 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeGeneral.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeGeneral.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeNotes.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeNotes.ico
index e3b1dbc7d4..e3b1dbc7d4 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeNotes.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeNotes.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/treePhoto.ICO b/plugins/UserInfoEx/IconPacks/ice/res/treePhoto.ICO
index 4b84b8e02b..4b84b8e02b 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treePhoto.ICO
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treePhoto.ICO
diff --git a/plugins/UserInfoEx/IconPacks/ice/treeProfile.ico b/plugins/UserInfoEx/IconPacks/ice/res/treeProfile.ico
index 11e884ed0f..11e884ed0f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/treeProfile.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/treeProfile.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/aquarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aquarius.ico
index 71e908f98f..71e908f98f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/aries.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aries.ico
index a83c33f252..a83c33f252 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/cancer.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/cancer.ico
index 059cc16a1e..059cc16a1e 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/capricorn.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/capricorn.ico
index 50892bb347..50892bb347 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/gemini.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/gemini.ico
index 1d11882c1c..1d11882c1c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/leo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/leo.ico
index 87daea39f6..87daea39f6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/libra.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/libra.ico
index 728c428883..728c428883 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/pisces.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/pisces.ico
index 8e85ba4e52..8e85ba4e52 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/sagittarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/sagittarius.ico
index 5d82ba7828..5d82ba7828 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/scorpio.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/scorpio.ico
index 59f93e8dfd..59f93e8dfd 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/taurus.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/taurus.ico
index 4583f28bef..4583f28bef 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac/virgo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/virgo.ico
index f1d241fa4e..f1d241fa4e 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aquarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aquarius.ico
index 096e235168..096e235168 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aquarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aquarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aries.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aries.ico
index 5e2e36b4ed..5e2e36b4ed 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/aries.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/aries.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/cancer.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/cancer.ico
index e561cbcfb9..e561cbcfb9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/cancer.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/cancer.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/capricorn.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/capricorn.ico
index 364dae632c..364dae632c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/capricorn.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/capricorn.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/gemini.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/gemini.ico
index afa6b89d4c..afa6b89d4c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/gemini.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/gemini.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/leo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/leo.ico
index fb288f0ec6..fb288f0ec6 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/leo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/leo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/libra.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/libra.ico
index a8277aa2ce..a8277aa2ce 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/libra.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/libra.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/pisces.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/pisces.ico
index 72cff46ea9..72cff46ea9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/pisces.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/pisces.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/sagittarius.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/sagittarius.ico
index 6a7cdbae94..6a7cdbae94 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/sagittarius.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/sagittarius.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/scorpio.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/scorpio.ico
index 0011bb066c..0011bb066c 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/scorpio.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/scorpio.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/taurus.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/taurus.ico
index f98cf89eb9..f98cf89eb9 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/taurus.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/taurus.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/zodiac2/virgo.ico b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/virgo.ico
index 67a2a1077f..67a2a1077f 100644
--- a/plugins/UserInfoEx/IconPacks/ice/zodiac2/virgo.ico
+++ b/plugins/UserInfoEx/IconPacks/ice/res/zodiac2/virgo.ico
diff --git a/plugins/UserInfoEx/IconPacks/ice/src/icons.h b/plugins/UserInfoEx/IconPacks/ice/src/icons.h
new file mode 100644
index 0000000000..46871836bd
--- /dev/null
+++ b/plugins/UserInfoEx/IconPacks/ice/src/icons.h
@@ -0,0 +1,112 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by uinfoex_icons.rc
+//
+#define IDI_FIRST_ICON                  101
+
+// dialog inforbar
+#define IDI_DLG_DETAILS                 101
+#define IDI_DLG_PHONE                   102
+#define IDI_DLG_EMAIL                   103
+
+// dialog infobar & buttons
+#define IDI_ANNIVERSARY					104
+#define IDI_EXPORT						105
+#define IDI_IMPORT						106
+#define IDI_SEARCH						107
+
+// common icons of details dialog pages
+#define IDI_MIRANDA                     108
+#define IDI_PASSWORD                    109
+#define IDI_FEMALE                      110
+#define IDI_MALE                        111
+#define IDI_CLOCK                       112
+#define IDI_MARITAL                     113
+
+// commonly used buttons
+#define IDI_BTN_UPDATE                  114
+#define IDI_BTN_OK                      115
+#define IDI_BTN_CLOSE                   116
+#define IDI_BTN_APPLY                   117
+#define IDI_BTN_GOTO                    118
+#define IDI_BTN_PHONE                   119
+#define IDI_BTN_FAX                     120
+#define IDI_BTN_CELLULAR                121
+#define IDI_BTN_CUSTOMPHONE             122
+#define IDI_BTN_EMAIL                   123
+#define IDI_BTN_DOWNARROW               124
+#define IDI_BTN_ADD                     125
+#define IDI_BTN_EDIT                    126
+#define IDI_BTN_DELETE                  127
+#define IDI_BTN_EXIMPORT                128
+#define IDI_BTN_BIRTHDAY_BACKUP         129
+
+// details treeview icons
+#define IDI_TREE_GENERAL                130
+#define IDI_TREE_ADVANCED               131
+#define IDI_TREE_COMPANY                132
+#define IDI_TREE_CONTACT                133
+#define IDI_TREE_ABOUT                  134
+#define IDI_TREE_PHOTO                  135
+#define IDI_TREE_ADDRESS                136
+#define IDI_TREE_NOTES                  137
+#define IDI_TREE_PROFILE                138
+
+// export: choose modules
+#define IDI_LST_MODULES                 139
+#define IDI_LST_FOLDER                  140
+
+// zodiac icons
+#define IDI_ZOD_AQUARIUS                141
+#define IDI_ZOD_ARIES                   142
+#define IDI_ZOD_CANCER                  143
+#define IDI_ZOD_CAPRICORN               144
+#define IDI_ZOD_GEMINI                  145
+#define IDI_ZOD_LEO                     146
+#define IDI_ZOD_LIBRA                   147
+#define IDI_ZOD_PISCES                  148
+#define IDI_ZOD_SAGITTARIUS             149
+#define IDI_ZOD_SCORPIO                 150
+#define IDI_ZOD_TAURUS                  151
+#define IDI_ZOD_VIRGO                   152
+
+// reminder
+#define IDI_BIRTHDAY                    153
+#define IDI_RMD_DTB0                    154
+#define IDI_RMD_DTB1                    155
+#define IDI_RMD_DTB2                    156
+#define IDI_RMD_DTB3                    157
+#define IDI_RMD_DTB4                    158
+#define IDI_RMD_DTB5                    159
+#define IDI_RMD_DTB6                    160
+#define IDI_RMD_DTB7                    161
+#define IDI_RMD_DTB8                    162
+#define IDI_RMD_DTB9                    163
+#define IDI_RMD_DTBX                    164
+#define IDI_RMD_DTA0                    165
+#define IDI_RMD_DTA1                    166
+#define IDI_RMD_DTA2                    167
+#define IDI_RMD_DTA3                    168
+#define IDI_RMD_DTA4                    169
+#define IDI_RMD_DTA5                    170
+#define IDI_RMD_DTA6                    171
+#define IDI_RMD_DTA7                    172
+#define IDI_RMD_DTA8                    173
+#define IDI_RMD_DTA9                    174
+#define IDI_RMD_DTAX                    175
+
+#define IDI_LASTICON                    175
+
+// version text
+#define IDS_ICOPACKVERSION              1001
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        1002
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/plugins/UserInfoEx/IconPacks/ice/icons_version.h b/plugins/UserInfoEx/IconPacks/ice/src/icons_version.h
index 70cfcad517..70cfcad517 100644
--- a/plugins/UserInfoEx/IconPacks/ice/icons_version.h
+++ b/plugins/UserInfoEx/IconPacks/ice/src/icons_version.h
diff --git a/plugins/UserInfoEx/Res/resource.rc b/plugins/UserInfoEx/Res/resource.rc
index e17441d49f..894eb385c8 100644
--- a/plugins/UserInfoEx/Res/resource.rc
+++ b/plugins/UserInfoEx/Res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -600,7 +600,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 1 TEXTINCLUDE
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 3 TEXTINCLUDE
diff --git a/plugins/UserInfoEx/sounds/birthday.wav b/plugins/UserInfoEx/Res/sounds/birthday.wav
index 167b20e0ad..167b20e0ad 100644
--- a/plugins/UserInfoEx/sounds/birthday.wav
+++ b/plugins/UserInfoEx/Res/sounds/birthday.wav
diff --git a/plugins/UserInfoEx/sounds/birthdaycoming.wav b/plugins/UserInfoEx/Res/sounds/birthdaycoming.wav
index 31d28974b3..31d28974b3 100644
--- a/plugins/UserInfoEx/sounds/birthdaycoming.wav
+++ b/plugins/UserInfoEx/Res/sounds/birthdaycoming.wav
diff --git a/plugins/UserInfoEx/sounds/reminder.wav b/plugins/UserInfoEx/Res/sounds/reminder.wav
index e43ce07c97..e43ce07c97 100644
--- a/plugins/UserInfoEx/sounds/reminder.wav
+++ b/plugins/UserInfoEx/Res/sounds/reminder.wav
diff --git a/plugins/UserInfoEx/Res/version.rc b/plugins/UserInfoEx/Res/version.rc
index b321f38765..a1dad4d861 100644
--- a/plugins/UserInfoEx/Res/version.rc
+++ b/plugins/UserInfoEx/Res/version.rc
@@ -10,7 +10,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
-#include "version.h"
+#include "..\src\version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj b/plugins/UserInfoEx/UInfoEx_10.vcxproj
index 461657e5ae..9ed80c6ee0 100644
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj
+++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj
@@ -72,8 +72,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -98,8 +98,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -125,8 +125,8 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <WarningLevel>Level3</WarningLevel>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -153,8 +153,8 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <WarningLevel>Level3</WarningLevel>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -177,136 +177,129 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="classMAnnivDate.cpp" />
-    <ClCompile Include="classMTime.cpp" />
-    <ClCompile Include="classPsTree.cpp" />
-    <ClCompile Include="classPsTreeItem.cpp" />
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\classMAnnivDate.cpp" />
+    <ClCompile Include="src\classMTime.cpp" />
+    <ClCompile Include="src\classPsTree.cpp" />
+    <ClCompile Include="src\classPsTreeItem.cpp" />
+    <ClCompile Include="src\commonheaders.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="init.cpp" />
-    <ClCompile Include="mir_contactqueue.cpp" />
-    <ClCompile Include="mir_db.cpp" />
-    <ClCompile Include="mir_icolib.cpp" />
-    <ClCompile Include="mir_menuitems.cpp" />
-    <ClCompile Include="mir_string.cpp" />
-    <ClCompile Include="psp_options.cpp" />
-    <ClCompile Include="svc_avatar.cpp" />
-    <ClCompile Include="svc_constants.cpp" />
-    <ClCompile Include="svc_contactinfo.cpp" />
-    <ClCompile Include="svc_email.cpp" />
-    <ClCompile Include="svc_gender.cpp" />
-    <ClCompile Include="svc_homepage.cpp" />
-    <ClCompile Include="svc_phone.cpp" />
-    <ClCompile Include="svc_refreshci.cpp" />
-    <ClCompile Include="svc_reminder.cpp" />
-    <ClCompile Include="svc_timezone.cpp" />
-    <ClCompile Include="svc_timezone_old.cpp" />
-    <ClCompile Include="ex_import\classExImContactBase.cpp" />
-    <ClCompile Include="ex_import\classExImContactXML.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImModules.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImOpenSaveFile.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImProgress.cpp" />
-    <ClCompile Include="ex_import\svc_ExImINI.cpp" />
-    <ClCompile Include="ex_import\svc_ExImport.cpp" />
-    <ClCompile Include="ex_import\svc_ExImVCF.cpp" />
-    <ClCompile Include="ex_import\svc_ExImXML.cpp" />
-    <ClCompile Include="ex_import\tinystr.cpp">
+    <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\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" />
+    <ClCompile Include="src\ex_import\classExImContactXML.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImINI.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImport.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImXML.cpp" />
+    <ClCompile Include="src\ex_import\tinystr.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxml.cpp">
+    <ClCompile Include="src\ex_import\tinyxml.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlerror.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlparser.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Flags\svc_countrylistext.cpp">
+    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flags.cpp">
+    <ClCompile Include="src\Flags\svc_flags.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flagsicons.cpp">
+    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="dlg_anniversarylist.cpp" />
-    <ClCompile Include="dlg_msgbox.cpp" />
-    <ClCompile Include="dlg_propsheet.cpp" />
-    <ClCompile Include="psp_about.cpp" />
-    <ClCompile Include="psp_anniversary.cpp" />
-    <ClCompile Include="psp_base.cpp" />
-    <ClCompile Include="psp_company.cpp" />
-    <ClCompile Include="psp_contact.cpp" />
-    <ClCompile Include="psp_general.cpp" />
-    <ClCompile Include="psp_origin.cpp" />
-    <ClCompile Include="psp_profile.cpp" />
-    <ClCompile Include="ctrl_annivedit.cpp" />
-    <ClCompile Include="ctrl_base.cpp" />
-    <ClCompile Include="ctrl_button.cpp" />
-    <ClCompile Include="ctrl_combo.cpp" />
-    <ClCompile Include="ctrl_contact.cpp" />
-    <ClCompile Include="ctrl_edit.cpp" />
-    <ClCompile Include="ctrl_tzcombo.cpp" />
+    <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="classMAnnivDate.h" />
-    <ClInclude Include="classMTime.h" />
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="mir_contactqueue.h" />
-    <ClInclude Include="mir_db.h" />
-    <ClInclude Include="mir_icolib.h" />
-    <ClInclude Include="mir_menuitems.h" />
-    <ClInclude Include="mir_string.h" />
-    <ClInclude Include="psp_options.h" />
-    <ClInclude Include="svc_avatar.h" />
-    <ClInclude Include="svc_constants.h" />
-    <ClInclude Include="svc_contactinfo.h" />
-    <ClInclude Include="svc_email.h" />
-    <ClInclude Include="svc_gender.h" />
-    <ClInclude Include="svc_homepage.h" />
-    <ClInclude Include="svc_phone.h" />
-    <ClInclude Include="svc_refreshci.h" />
-    <ClInclude Include="svc_reminder.h" />
-    <ClInclude Include="svc_timezone.h" />
-    <ClInclude Include="svc_timezone_old.h" />
-    <ClInclude Include="ex_import\classExImContactBase.h" />
-    <ClInclude Include="ex_import\classExImContactXML.h" />
-    <ClInclude Include="ex_import\dlg_ExImModules.h" />
-    <ClInclude Include="ex_import\dlg_ExImOpenSaveFile.h" />
-    <ClInclude Include="ex_import\dlg_ExImProgress.h" />
-    <ClInclude Include="ex_import\mir_rfcCodecs.h" />
-    <ClInclude Include="ex_import\svc_ExImINI.h" />
-    <ClInclude Include="ex_import\svc_ExImport.h" />
-    <ClInclude Include="ex_import\svc_ExImVCF.h" />
-    <ClInclude Include="ex_import\svc_ExImXML.h" />
-    <ClInclude Include="ex_import\tinystr.h" />
-    <ClInclude Include="ex_import\tinyxml.h" />
-    <ClInclude Include="Flags\svc_countrylistext.h" />
-    <ClInclude Include="Flags\svc_flags.h" />
-    <ClInclude Include="Flags\svc_flagsicons.h" />
-    <ClInclude Include="dlg_anniversarylist.h" />
-    <ClInclude Include="dlg_msgbox.h" />
-    <ClInclude Include="dlg_propsheet.h" />
-    <ClInclude Include="psp_base.h" />
-    <ClInclude Include="ctrl_annivedit.h" />
-    <ClInclude Include="ctrl_base.h" />
-    <ClInclude Include="ctrl_button.h" />
-    <ClInclude Include="ctrl_combo.h" />
-    <ClInclude Include="ctrl_contact.h" />
-    <ClInclude Include="ctrl_edit.h" />
-    <ClInclude Include="ctrl_tzcombo.h" />
-    <ClInclude Include="Res\resource.h" />
-    <ClInclude Include="Res\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Res\default.ico" />
-    <None Include="Res\dragcopy.cur" />
-    <None Include="Res\flags.png" />
-    <None Include="Res\main.ico" />
-    <None Include="changelog.txt" />
+    <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_countrylistext.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" />
+    <ClInclude Include="src\Res\resource.h" />
+    <ClInclude Include="src\Res\version.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Res\resource.rc" />
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
index c812eb4284..1d0ce497eb 100644
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
+++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj.filters
@@ -30,343 +30,321 @@
     <Filter Include="SDK">
       <UniqueIdentifier>{ea8b021b-f82f-4940-933d-15d813da6e9b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="SDK\miranda">
-      <UniqueIdentifier>{708cc988-cbf7-4f8b-aa0e-cec18af48b54}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="classMAnnivDate.cpp">
+    <ClCompile Include="src\classMAnnivDate.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="classMTime.cpp">
+    <ClCompile Include="src\classMTime.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="classPsTree.cpp">
+    <ClCompile Include="src\classPsTree.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="classPsTreeItem.cpp">
+    <ClCompile Include="src\classPsTreeItem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\commonheaders.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="init.cpp">
+    <ClCompile Include="src\init.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_contactqueue.cpp">
+    <ClCompile Include="src\mir_contactqueue.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_db.cpp">
+    <ClCompile Include="src\mir_db.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_icolib.cpp">
+    <ClCompile Include="src\mir_icolib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_menuitems.cpp">
+    <ClCompile Include="src\mir_menuitems.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="mir_string.cpp">
+    <ClCompile Include="src\mir_string.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="psp_options.cpp">
+    <ClCompile Include="src\psp_options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="svc_avatar.cpp">
+    <ClCompile Include="src\svc_avatar.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_constants.cpp">
+    <ClCompile Include="src\svc_constants.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_contactinfo.cpp">
+    <ClCompile Include="src\svc_contactinfo.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_email.cpp">
+    <ClCompile Include="src\svc_email.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_gender.cpp">
+    <ClCompile Include="src\svc_gender.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_homepage.cpp">
+    <ClCompile Include="src\svc_homepage.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_phone.cpp">
+    <ClCompile Include="src\svc_phone.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_refreshci.cpp">
+    <ClCompile Include="src\svc_refreshci.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_reminder.cpp">
+    <ClCompile Include="src\svc_reminder.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_timezone.cpp">
+    <ClCompile Include="src\svc_timezone.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="svc_timezone_old.cpp">
+    <ClCompile Include="src\svc_timezone_old.cpp">
       <Filter>Source Files\Services</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\classExImContactBase.cpp">
+    <ClCompile Include="src\ex_import\classExImContactBase.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\classExImContactXML.cpp">
+    <ClCompile Include="src\ex_import\classExImContactXML.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\dlg_ExImModules.cpp">
+    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\dlg_ExImOpenSaveFile.cpp">
+    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\dlg_ExImProgress.cpp">
+    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\svc_ExImINI.cpp">
+    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\svc_ExImport.cpp">
+    <ClCompile Include="src\ex_import\svc_ExImport.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\svc_ExImVCF.cpp">
+    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\svc_ExImXML.cpp">
+    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\tinystr.cpp">
+    <ClCompile Include="src\ex_import\tinystr.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxml.cpp">
+    <ClCompile Include="src\ex_import\tinyxml.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlerror.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlparser.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClCompile>
-    <ClCompile Include="Flags\svc_countrylistext.cpp">
+    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
       <Filter>Source Files\Services\flags</Filter>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flags.cpp">
+    <ClCompile Include="src\Flags\svc_flags.cpp">
       <Filter>Source Files\Services\flags</Filter>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flagsicons.cpp">
+    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
       <Filter>Source Files\Services\flags</Filter>
     </ClCompile>
-    <ClCompile Include="dlg_anniversarylist.cpp">
+    <ClCompile Include="src\dlg_anniversarylist.cpp">
       <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="dlg_msgbox.cpp">
+    <ClCompile Include="src\dlg_msgbox.cpp">
       <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="dlg_propsheet.cpp">
+    <ClCompile Include="src\dlg_propsheet.cpp">
       <Filter>Source Files\Dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="psp_about.cpp">
+    <ClCompile Include="src\psp_about.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_anniversary.cpp">
+    <ClCompile Include="src\psp_anniversary.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_base.cpp">
+    <ClCompile Include="src\psp_base.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_company.cpp">
+    <ClCompile Include="src\psp_company.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_contact.cpp">
+    <ClCompile Include="src\psp_contact.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_general.cpp">
+    <ClCompile Include="src\psp_general.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_origin.cpp">
+    <ClCompile Include="src\psp_origin.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="psp_profile.cpp">
+    <ClCompile Include="src\psp_profile.cpp">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_annivedit.cpp">
+    <ClCompile Include="src\ctrl_annivedit.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_base.cpp">
+    <ClCompile Include="src\ctrl_base.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_button.cpp">
+    <ClCompile Include="src\ctrl_button.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_combo.cpp">
+    <ClCompile Include="src\ctrl_combo.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_contact.cpp">
+    <ClCompile Include="src\ctrl_contact.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_edit.cpp">
+    <ClCompile Include="src\ctrl_edit.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
-    <ClCompile Include="ctrl_tzcombo.cpp">
+    <ClCompile Include="src\ctrl_tzcombo.cpp">
       <Filter>Source Files\Controls</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="classMAnnivDate.h">
+    <ClInclude Include="src\classMAnnivDate.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="classMTime.h">
+    <ClInclude Include="src\classMTime.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="commonheaders.h">
+    <ClInclude Include="src\commonheaders.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_contactqueue.h">
+    <ClInclude Include="src\mir_contactqueue.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_db.h">
+    <ClInclude Include="src\mir_db.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_icolib.h">
+    <ClInclude Include="src\mir_icolib.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_menuitems.h">
+    <ClInclude Include="src\mir_menuitems.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="mir_string.h">
+    <ClInclude Include="src\mir_string.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="psp_options.h">
+    <ClInclude Include="src\psp_options.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="svc_avatar.h">
+    <ClInclude Include="src\svc_avatar.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_constants.h">
+    <ClInclude Include="src\svc_constants.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_contactinfo.h">
+    <ClInclude Include="src\svc_contactinfo.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_email.h">
+    <ClInclude Include="src\svc_email.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_gender.h">
+    <ClInclude Include="src\svc_gender.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_homepage.h">
+    <ClInclude Include="src\svc_homepage.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_phone.h">
+    <ClInclude Include="src\svc_phone.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_refreshci.h">
+    <ClInclude Include="src\svc_refreshci.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_reminder.h">
+    <ClInclude Include="src\svc_reminder.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_timezone.h">
+    <ClInclude Include="src\svc_timezone.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="svc_timezone_old.h">
+    <ClInclude Include="src\svc_timezone_old.h">
       <Filter>Source Files\Services</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\classExImContactBase.h">
+    <ClInclude Include="src\ex_import\classExImContactBase.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\classExImContactXML.h">
+    <ClInclude Include="src\ex_import\classExImContactXML.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\dlg_ExImModules.h">
+    <ClInclude Include="src\ex_import\dlg_ExImModules.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\dlg_ExImOpenSaveFile.h">
+    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\dlg_ExImProgress.h">
+    <ClInclude Include="src\ex_import\dlg_ExImProgress.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\mir_rfcCodecs.h">
+    <ClInclude Include="src\ex_import\mir_rfcCodecs.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\svc_ExImINI.h">
+    <ClInclude Include="src\ex_import\svc_ExImINI.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\svc_ExImport.h">
+    <ClInclude Include="src\ex_import\svc_ExImport.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\svc_ExImVCF.h">
+    <ClInclude Include="src\ex_import\svc_ExImVCF.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\svc_ExImXML.h">
+    <ClInclude Include="src\ex_import\svc_ExImXML.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\tinystr.h">
+    <ClInclude Include="src\ex_import\tinystr.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="ex_import\tinyxml.h">
+    <ClInclude Include="src\ex_import\tinyxml.h">
       <Filter>Source Files\Services\Ex/Import</Filter>
     </ClInclude>
-    <ClInclude Include="Flags\svc_countrylistext.h">
+    <ClInclude Include="src\Flags\svc_countrylistext.h">
       <Filter>Source Files\Services\flags</Filter>
     </ClInclude>
-    <ClInclude Include="Flags\svc_flags.h">
+    <ClInclude Include="src\Flags\svc_flags.h">
       <Filter>Source Files\Services\flags</Filter>
     </ClInclude>
-    <ClInclude Include="Flags\svc_flagsicons.h">
+    <ClInclude Include="src\Flags\svc_flagsicons.h">
       <Filter>Source Files\Services\flags</Filter>
     </ClInclude>
-    <ClInclude Include="dlg_anniversarylist.h">
+    <ClInclude Include="src\dlg_anniversarylist.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="dlg_msgbox.h">
+    <ClInclude Include="src\dlg_msgbox.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="dlg_propsheet.h">
+    <ClInclude Include="src\dlg_propsheet.h">
       <Filter>Source Files\Dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="psp_base.h">
+    <ClInclude Include="src\psp_base.h">
       <Filter>Source Files\Dialogs\Details Pages</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_annivedit.h">
+    <ClInclude Include="src\ctrl_annivedit.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_base.h">
+    <ClInclude Include="src\ctrl_base.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_button.h">
+    <ClInclude Include="src\ctrl_button.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_combo.h">
+    <ClInclude Include="src\ctrl_combo.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_contact.h">
+    <ClInclude Include="src\ctrl_contact.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_edit.h">
+    <ClInclude Include="src\ctrl_edit.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="ctrl_tzcombo.h">
+    <ClInclude Include="src\ctrl_tzcombo.h">
       <Filter>Source Files\Controls</Filter>
     </ClInclude>
-    <ClInclude Include="Res\resource.h">
-      <Filter>Resource Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Res\version.h">
-      <Filter>Resource Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Res\default.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Res\dragcopy.cur">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="Res\main.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="changelog.txt" />
-    <None Include="Res\flags.png">
-      <Filter>Resource Files</Filter>
-    </None>
+    <ClInclude Include="src\Res\resource.h" />
+    <ClInclude Include="src\Res\version.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Res\resource.rc">
diff --git a/plugins/UserInfoEx/changelog.txt b/plugins/UserInfoEx/docs/changelog.txt
index 06961783b2..06961783b2 100644
--- a/plugins/UserInfoEx/changelog.txt
+++ b/plugins/UserInfoEx/docs/changelog.txt
diff --git a/plugins/UserInfoEx/userinfoex-translation.txt b/plugins/UserInfoEx/docs/userinfoex-translation.txt
index 7c9a8734ad..7c9a8734ad 100644
--- a/plugins/UserInfoEx/userinfoex-translation.txt
+++ b/plugins/UserInfoEx/docs/userinfoex-translation.txt
diff --git a/plugins/UserInfoEx/Flags/svc_countrylistext.cpp b/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
index fabb2749f2..fabb2749f2 100644
--- a/plugins/UserInfoEx/Flags/svc_countrylistext.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_countrylistext.cpp
diff --git a/plugins/UserInfoEx/Flags/svc_countrylistext.h b/plugins/UserInfoEx/src/Flags/svc_countrylistext.h
index a49a289542..a49a289542 100644
--- a/plugins/UserInfoEx/Flags/svc_countrylistext.h
+++ b/plugins/UserInfoEx/src/Flags/svc_countrylistext.h
diff --git a/plugins/UserInfoEx/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 8999df2cca..8999df2cca 100644
--- a/plugins/UserInfoEx/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
diff --git a/plugins/UserInfoEx/Flags/svc_flags.h b/plugins/UserInfoEx/src/Flags/svc_flags.h
index e7f97ab963..e7f97ab963 100644
--- a/plugins/UserInfoEx/Flags/svc_flags.h
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.h
diff --git a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
index d7119cd75e..d7119cd75e 100644
--- a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp
diff --git a/plugins/UserInfoEx/Flags/svc_flagsicons.h b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h
index 7f29330a11..7f29330a11 100644
--- a/plugins/UserInfoEx/Flags/svc_flagsicons.h
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h
diff --git a/plugins/UserInfoEx/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp
index fb487f61d2..fb487f61d2 100644
--- a/plugins/UserInfoEx/classMAnnivDate.cpp
+++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp
diff --git a/plugins/UserInfoEx/classMAnnivDate.h b/plugins/UserInfoEx/src/classMAnnivDate.h
index 4e2d447a13..4e2d447a13 100644
--- a/plugins/UserInfoEx/classMAnnivDate.h
+++ b/plugins/UserInfoEx/src/classMAnnivDate.h
diff --git a/plugins/UserInfoEx/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp
index 3b1dd2e081..3b1dd2e081 100644
--- a/plugins/UserInfoEx/classMTime.cpp
+++ b/plugins/UserInfoEx/src/classMTime.cpp
diff --git a/plugins/UserInfoEx/classMTime.h b/plugins/UserInfoEx/src/classMTime.h
index 9d30c4782e..9d30c4782e 100644
--- a/plugins/UserInfoEx/classMTime.h
+++ b/plugins/UserInfoEx/src/classMTime.h
diff --git a/plugins/UserInfoEx/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index ac88130d17..ac88130d17 100644
--- a/plugins/UserInfoEx/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
diff --git a/plugins/UserInfoEx/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp
index 4f8b641691..4f8b641691 100644
--- a/plugins/UserInfoEx/classPsTreeItem.cpp
+++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp
diff --git a/plugins/UserInfoEx/commonheaders.cpp b/plugins/UserInfoEx/src/commonheaders.cpp
index 608d7ddbfc..608d7ddbfc 100644
--- a/plugins/UserInfoEx/commonheaders.cpp
+++ b/plugins/UserInfoEx/src/commonheaders.cpp
diff --git a/plugins/UserInfoEx/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h
index 6501954a7b..b998884e65 100644
--- a/plugins/UserInfoEx/commonheaders.h
+++ b/plugins/UserInfoEx/src/commonheaders.h
@@ -135,8 +135,9 @@ typedef std::basic_string<TCHAR>	tstring;
 #define GetUserData(p)		GetWindowLongPtr((p), GWLP_USERDATA)
 #define SetUserData(p, l)	SetWindowLongPtr((p), GWLP_USERDATA, (LONG_PTR) (l))
 
-#include "res\resource.h"
-#include "iconpacks/icons.h"
+#include "resource.h"
+#include "../IconPacks/default/src/icons.h"
+#include "../IconPacks/ice/src/icons.h"
 
 #include "svc_constants.h"
 
diff --git a/plugins/UserInfoEx/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index db809906a1..db809906a1 100644
--- a/plugins/UserInfoEx/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
diff --git a/plugins/UserInfoEx/ctrl_annivedit.h b/plugins/UserInfoEx/src/ctrl_annivedit.h
index 412afa8c0d..412afa8c0d 100644
--- a/plugins/UserInfoEx/ctrl_annivedit.h
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.h
diff --git a/plugins/UserInfoEx/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp
index 8203a5c37d..8203a5c37d 100644
--- a/plugins/UserInfoEx/ctrl_base.cpp
+++ b/plugins/UserInfoEx/src/ctrl_base.cpp
diff --git a/plugins/UserInfoEx/ctrl_base.h b/plugins/UserInfoEx/src/ctrl_base.h
index 161f8aeba7..161f8aeba7 100644
--- a/plugins/UserInfoEx/ctrl_base.h
+++ b/plugins/UserInfoEx/src/ctrl_base.h
diff --git a/plugins/UserInfoEx/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index 8278b5b07d..8278b5b07d 100644
--- a/plugins/UserInfoEx/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
diff --git a/plugins/UserInfoEx/ctrl_button.h b/plugins/UserInfoEx/src/ctrl_button.h
index 5dd99bb4f6..5dd99bb4f6 100644
--- a/plugins/UserInfoEx/ctrl_button.h
+++ b/plugins/UserInfoEx/src/ctrl_button.h
diff --git a/plugins/UserInfoEx/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp
index 6cdd5bdd2c..6cdd5bdd2c 100644
--- a/plugins/UserInfoEx/ctrl_combo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_combo.cpp
diff --git a/plugins/UserInfoEx/ctrl_combo.h b/plugins/UserInfoEx/src/ctrl_combo.h
index 84bd4e23a6..84bd4e23a6 100644
--- a/plugins/UserInfoEx/ctrl_combo.h
+++ b/plugins/UserInfoEx/src/ctrl_combo.h
diff --git a/plugins/UserInfoEx/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 8b13ad9256..8b13ad9256 100644
--- a/plugins/UserInfoEx/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
diff --git a/plugins/UserInfoEx/ctrl_contact.h b/plugins/UserInfoEx/src/ctrl_contact.h
index 3a3536e523..3a3536e523 100644
--- a/plugins/UserInfoEx/ctrl_contact.h
+++ b/plugins/UserInfoEx/src/ctrl_contact.h
diff --git a/plugins/UserInfoEx/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp
index 19e018f8cb..19e018f8cb 100644
--- a/plugins/UserInfoEx/ctrl_edit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_edit.cpp
diff --git a/plugins/UserInfoEx/ctrl_edit.h b/plugins/UserInfoEx/src/ctrl_edit.h
index 15a69a5160..15a69a5160 100644
--- a/plugins/UserInfoEx/ctrl_edit.h
+++ b/plugins/UserInfoEx/src/ctrl_edit.h
diff --git a/plugins/UserInfoEx/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
index 26dfbfee32..26dfbfee32 100644
--- a/plugins/UserInfoEx/ctrl_tzcombo.cpp
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp
diff --git a/plugins/UserInfoEx/ctrl_tzcombo.h b/plugins/UserInfoEx/src/ctrl_tzcombo.h
index 3034f57481..3034f57481 100644
--- a/plugins/UserInfoEx/ctrl_tzcombo.h
+++ b/plugins/UserInfoEx/src/ctrl_tzcombo.h
diff --git a/plugins/UserInfoEx/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 1b0cd689da..1b0cd689da 100644
--- a/plugins/UserInfoEx/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
diff --git a/plugins/UserInfoEx/dlg_anniversarylist.h b/plugins/UserInfoEx/src/dlg_anniversarylist.h
index e7ff89e99c..e7ff89e99c 100644
--- a/plugins/UserInfoEx/dlg_anniversarylist.h
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.h
diff --git a/plugins/UserInfoEx/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp
index 5f55802e3d..5f55802e3d 100644
--- a/plugins/UserInfoEx/dlg_msgbox.cpp
+++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp
diff --git a/plugins/UserInfoEx/dlg_msgbox.h b/plugins/UserInfoEx/src/dlg_msgbox.h
index 6b01cd55bf..6b01cd55bf 100644
--- a/plugins/UserInfoEx/dlg_msgbox.h
+++ b/plugins/UserInfoEx/src/dlg_msgbox.h
diff --git a/plugins/UserInfoEx/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index eee049aea1..eee049aea1 100644
--- a/plugins/UserInfoEx/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
diff --git a/plugins/UserInfoEx/dlg_propsheet.h b/plugins/UserInfoEx/src/dlg_propsheet.h
index 622eb8fa33..622eb8fa33 100644
--- a/plugins/UserInfoEx/dlg_propsheet.h
+++ b/plugins/UserInfoEx/src/dlg_propsheet.h
diff --git a/plugins/UserInfoEx/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
index 0f75c0df43..0f75c0df43 100644
--- a/plugins/UserInfoEx/ex_import/classExImContactBase.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp
diff --git a/plugins/UserInfoEx/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
index 55e5d94f67..55e5d94f67 100644
--- a/plugins/UserInfoEx/ex_import/classExImContactBase.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h
diff --git a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 2264f4d278..2264f4d278 100644
--- a/plugins/UserInfoEx/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
diff --git a/plugins/UserInfoEx/ex_import/classExImContactXML.h b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h
index 52ad2ef087..52ad2ef087 100644
--- a/plugins/UserInfoEx/ex_import/classExImContactXML.h
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index 9ca27d7289..9ca27d7289 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImModules.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h
index 69ca65ddd3..69ca65ddd3 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImModules.h
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index d9d0efbd7d..d9d0efbd7d 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h
index eb47e9ab30..eb47e9ab30 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.h
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index 9da4ee4373..9da4ee4373 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImProgress.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h
index 55ab614cfe..55ab614cfe 100644
--- a/plugins/UserInfoEx/ex_import/dlg_ExImProgress.h
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h
diff --git a/plugins/UserInfoEx/ex_import/mir_rfcCodecs.h b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h
index 0fe287ec93..0fe287ec93 100644
--- a/plugins/UserInfoEx/ex_import/mir_rfcCodecs.h
+++ b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
index f3c4ce6362..f3c4ce6362 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImINI.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImINI.h b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h
index 63ecce7cbd..63ecce7cbd 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImINI.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
index 53faf60c02..53faf60c02 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImVCF.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
index 4465614b80..4465614b80 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImVCF.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index dca52f1685..dca52f1685 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
index a2524a7dd6..a2524a7dd6 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImXML.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index 35bb59c3b9..35bb59c3b9 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
diff --git a/plugins/UserInfoEx/ex_import/svc_ExImport.h b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h
index 3539ad72cd..3539ad72cd 100644
--- a/plugins/UserInfoEx/ex_import/svc_ExImport.h
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h
diff --git a/plugins/UserInfoEx/ex_import/tinystr.cpp b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
index 3ec0fe4676..3ec0fe4676 100644
--- a/plugins/UserInfoEx/ex_import/tinystr.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.cpp
diff --git a/plugins/UserInfoEx/ex_import/tinystr.h b/plugins/UserInfoEx/src/ex_import/tinystr.h
index 1061e795d8..1061e795d8 100644
--- a/plugins/UserInfoEx/ex_import/tinystr.h
+++ b/plugins/UserInfoEx/src/ex_import/tinystr.h
diff --git a/plugins/UserInfoEx/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
index 2eba13a7ea..2eba13a7ea 100644
--- a/plugins/UserInfoEx/ex_import/tinyxml.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp
diff --git a/plugins/UserInfoEx/ex_import/tinyxml.h b/plugins/UserInfoEx/src/ex_import/tinyxml.h
index 34e1c25517..0bc947422f 100644
--- a/plugins/UserInfoEx/ex_import/tinyxml.h
+++ b/plugins/UserInfoEx/src/ex_import/tinyxml.h
@@ -40,6 +40,8 @@ Last change by : $Author: ing.u.horn $
 #ifndef TINYXML_INCLUDED
 #define TINYXML_INCLUDED
 
+#define _CRT_SECURE_NO_WARNINGS
+
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4530)
diff --git a/plugins/UserInfoEx/ex_import/tinyxmlerror.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
index 3c42354d11..3c42354d11 100644
--- a/plugins/UserInfoEx/ex_import/tinyxmlerror.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp
diff --git a/plugins/UserInfoEx/ex_import/tinyxmlparser.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
index 73f2c18679..73f2c18679 100644
--- a/plugins/UserInfoEx/ex_import/tinyxmlparser.cpp
+++ b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp
diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/src/init.cpp
index 3f1553855f..3b7b0b8249 100644
--- a/plugins/UserInfoEx/init.cpp
+++ b/plugins/UserInfoEx/src/init.cpp
@@ -28,7 +28,7 @@ Last change by : $Author: ing.u.horn $
 ===============================================================================
 */
 #include "commonheaders.h"
-#include "res/version.h"
+#include "version.h"
 
 #include "mir_menuitems.h"
 #include "ctrl_base.h"
diff --git a/plugins/UserInfoEx/mir_contactqueue.cpp b/plugins/UserInfoEx/src/mir_contactqueue.cpp
index 93e3bbd976..93e3bbd976 100644
--- a/plugins/UserInfoEx/mir_contactqueue.cpp
+++ b/plugins/UserInfoEx/src/mir_contactqueue.cpp
diff --git a/plugins/UserInfoEx/mir_contactqueue.h b/plugins/UserInfoEx/src/mir_contactqueue.h
index b8f77530b7..b8f77530b7 100644
--- a/plugins/UserInfoEx/mir_contactqueue.h
+++ b/plugins/UserInfoEx/src/mir_contactqueue.h
diff --git a/plugins/UserInfoEx/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp
index e4596df4cc..e4596df4cc 100644
--- a/plugins/UserInfoEx/mir_db.cpp
+++ b/plugins/UserInfoEx/src/mir_db.cpp
diff --git a/plugins/UserInfoEx/mir_db.h b/plugins/UserInfoEx/src/mir_db.h
index e06a8788a6..e06a8788a6 100644
--- a/plugins/UserInfoEx/mir_db.h
+++ b/plugins/UserInfoEx/src/mir_db.h
diff --git a/plugins/UserInfoEx/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp
index ef5d22e487..ef5d22e487 100644
--- a/plugins/UserInfoEx/mir_icolib.cpp
+++ b/plugins/UserInfoEx/src/mir_icolib.cpp
diff --git a/plugins/UserInfoEx/mir_icolib.h b/plugins/UserInfoEx/src/mir_icolib.h
index d5ac62e9fa..d5ac62e9fa 100644
--- a/plugins/UserInfoEx/mir_icolib.h
+++ b/plugins/UserInfoEx/src/mir_icolib.h
diff --git a/plugins/UserInfoEx/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index 9f140fb4b7..9f140fb4b7 100644
--- a/plugins/UserInfoEx/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
diff --git a/plugins/UserInfoEx/mir_menuitems.h b/plugins/UserInfoEx/src/mir_menuitems.h
index 1d749ba592..1d749ba592 100644
--- a/plugins/UserInfoEx/mir_menuitems.h
+++ b/plugins/UserInfoEx/src/mir_menuitems.h
diff --git a/plugins/UserInfoEx/mir_string.cpp b/plugins/UserInfoEx/src/mir_string.cpp
index 7ab895ecc6..7ab895ecc6 100644
--- a/plugins/UserInfoEx/mir_string.cpp
+++ b/plugins/UserInfoEx/src/mir_string.cpp
diff --git a/plugins/UserInfoEx/mir_string.h b/plugins/UserInfoEx/src/mir_string.h
index 6e2dad0425..6e2dad0425 100644
--- a/plugins/UserInfoEx/mir_string.h
+++ b/plugins/UserInfoEx/src/mir_string.h
diff --git a/plugins/UserInfoEx/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp
index 0e8362848e..0e8362848e 100644
--- a/plugins/UserInfoEx/psp_about.cpp
+++ b/plugins/UserInfoEx/src/psp_about.cpp
diff --git a/plugins/UserInfoEx/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp
index 4872c655db..4872c655db 100644
--- a/plugins/UserInfoEx/psp_anniversary.cpp
+++ b/plugins/UserInfoEx/src/psp_anniversary.cpp
diff --git a/plugins/UserInfoEx/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp
index e015131ad6..e015131ad6 100644
--- a/plugins/UserInfoEx/psp_base.cpp
+++ b/plugins/UserInfoEx/src/psp_base.cpp
diff --git a/plugins/UserInfoEx/psp_base.h b/plugins/UserInfoEx/src/psp_base.h
index f2ddbba23f..f2ddbba23f 100644
--- a/plugins/UserInfoEx/psp_base.h
+++ b/plugins/UserInfoEx/src/psp_base.h
diff --git a/plugins/UserInfoEx/psp_company.cpp b/plugins/UserInfoEx/src/psp_company.cpp
index c77028e9b0..c77028e9b0 100644
--- a/plugins/UserInfoEx/psp_company.cpp
+++ b/plugins/UserInfoEx/src/psp_company.cpp
diff --git a/plugins/UserInfoEx/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp
index fb38591004..fb38591004 100644
--- a/plugins/UserInfoEx/psp_contact.cpp
+++ b/plugins/UserInfoEx/src/psp_contact.cpp
diff --git a/plugins/UserInfoEx/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp
index 9b9a15a58e..9b9a15a58e 100644
--- a/plugins/UserInfoEx/psp_general.cpp
+++ b/plugins/UserInfoEx/src/psp_general.cpp
diff --git a/plugins/UserInfoEx/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 9399e90f63..9399e90f63 100644
--- a/plugins/UserInfoEx/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
diff --git a/plugins/UserInfoEx/psp_options.h b/plugins/UserInfoEx/src/psp_options.h
index fbed92549a..fbed92549a 100644
--- a/plugins/UserInfoEx/psp_options.h
+++ b/plugins/UserInfoEx/src/psp_options.h
diff --git a/plugins/UserInfoEx/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp
index 3859a4e7bc..3859a4e7bc 100644
--- a/plugins/UserInfoEx/psp_origin.cpp
+++ b/plugins/UserInfoEx/src/psp_origin.cpp
diff --git a/plugins/UserInfoEx/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index e964db40f6..e964db40f6 100644
--- a/plugins/UserInfoEx/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
diff --git a/plugins/UserInfoEx/Res/resdefines.h b/plugins/UserInfoEx/src/resdefines.h
index f92a65f805..f92a65f805 100644
--- a/plugins/UserInfoEx/Res/resdefines.h
+++ b/plugins/UserInfoEx/src/resdefines.h
diff --git a/plugins/UserInfoEx/Res/resource.h b/plugins/UserInfoEx/src/resource.h
index 1419fcc501..1419fcc501 100644
--- a/plugins/UserInfoEx/Res/resource.h
+++ b/plugins/UserInfoEx/src/resource.h
diff --git a/plugins/UserInfoEx/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp
index f9d5515f52..f9d5515f52 100644
--- a/plugins/UserInfoEx/svc_avatar.cpp
+++ b/plugins/UserInfoEx/src/svc_avatar.cpp
diff --git a/plugins/UserInfoEx/svc_avatar.h b/plugins/UserInfoEx/src/svc_avatar.h
index acf00a83e9..acf00a83e9 100644
--- a/plugins/UserInfoEx/svc_avatar.h
+++ b/plugins/UserInfoEx/src/svc_avatar.h
diff --git a/plugins/UserInfoEx/svc_constants.cpp b/plugins/UserInfoEx/src/svc_constants.cpp
index ed803f79f4..ed803f79f4 100644
--- a/plugins/UserInfoEx/svc_constants.cpp
+++ b/plugins/UserInfoEx/src/svc_constants.cpp
diff --git a/plugins/UserInfoEx/svc_constants.h b/plugins/UserInfoEx/src/svc_constants.h
index d2c5a5c135..d2c5a5c135 100644
--- a/plugins/UserInfoEx/svc_constants.h
+++ b/plugins/UserInfoEx/src/svc_constants.h
diff --git a/plugins/UserInfoEx/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp
index 6a54880e67..6a54880e67 100644
--- a/plugins/UserInfoEx/svc_contactinfo.cpp
+++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp
diff --git a/plugins/UserInfoEx/svc_contactinfo.h b/plugins/UserInfoEx/src/svc_contactinfo.h
index 3509858fcd..3509858fcd 100644
--- a/plugins/UserInfoEx/svc_contactinfo.h
+++ b/plugins/UserInfoEx/src/svc_contactinfo.h
diff --git a/plugins/UserInfoEx/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp
index a9a0b47686..a9a0b47686 100644
--- a/plugins/UserInfoEx/svc_email.cpp
+++ b/plugins/UserInfoEx/src/svc_email.cpp
diff --git a/plugins/UserInfoEx/svc_email.h b/plugins/UserInfoEx/src/svc_email.h
index 5544f247f3..5544f247f3 100644
--- a/plugins/UserInfoEx/svc_email.h
+++ b/plugins/UserInfoEx/src/svc_email.h
diff --git a/plugins/UserInfoEx/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp
index 433a7664b9..433a7664b9 100644
--- a/plugins/UserInfoEx/svc_gender.cpp
+++ b/plugins/UserInfoEx/src/svc_gender.cpp
diff --git a/plugins/UserInfoEx/svc_gender.h b/plugins/UserInfoEx/src/svc_gender.h
index d11ecdcd66..d11ecdcd66 100644
--- a/plugins/UserInfoEx/svc_gender.h
+++ b/plugins/UserInfoEx/src/svc_gender.h
diff --git a/plugins/UserInfoEx/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp
index 77248960ac..77248960ac 100644
--- a/plugins/UserInfoEx/svc_homepage.cpp
+++ b/plugins/UserInfoEx/src/svc_homepage.cpp
diff --git a/plugins/UserInfoEx/svc_homepage.h b/plugins/UserInfoEx/src/svc_homepage.h
index 8ca7ce6ae9..8ca7ce6ae9 100644
--- a/plugins/UserInfoEx/svc_homepage.h
+++ b/plugins/UserInfoEx/src/svc_homepage.h
diff --git a/plugins/UserInfoEx/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp
index fab967c9a1..fab967c9a1 100644
--- a/plugins/UserInfoEx/svc_phone.cpp
+++ b/plugins/UserInfoEx/src/svc_phone.cpp
diff --git a/plugins/UserInfoEx/svc_phone.h b/plugins/UserInfoEx/src/svc_phone.h
index 20f7c249b5..20f7c249b5 100644
--- a/plugins/UserInfoEx/svc_phone.h
+++ b/plugins/UserInfoEx/src/svc_phone.h
diff --git a/plugins/UserInfoEx/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp
index bddc9e60ca..bddc9e60ca 100644
--- a/plugins/UserInfoEx/svc_refreshci.cpp
+++ b/plugins/UserInfoEx/src/svc_refreshci.cpp
diff --git a/plugins/UserInfoEx/svc_refreshci.h b/plugins/UserInfoEx/src/svc_refreshci.h
index 4f9c551385..4f9c551385 100644
--- a/plugins/UserInfoEx/svc_refreshci.h
+++ b/plugins/UserInfoEx/src/svc_refreshci.h
diff --git a/plugins/UserInfoEx/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index f91ba47f33..f91ba47f33 100644
--- a/plugins/UserInfoEx/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
diff --git a/plugins/UserInfoEx/svc_reminder.h b/plugins/UserInfoEx/src/svc_reminder.h
index 210250b9f3..210250b9f3 100644
--- a/plugins/UserInfoEx/svc_reminder.h
+++ b/plugins/UserInfoEx/src/svc_reminder.h
diff --git a/plugins/UserInfoEx/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp
index d9d0b4688c..d9d0b4688c 100644
--- a/plugins/UserInfoEx/svc_timezone.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone.cpp
diff --git a/plugins/UserInfoEx/svc_timezone.h b/plugins/UserInfoEx/src/svc_timezone.h
index 1c2dee943d..1c2dee943d 100644
--- a/plugins/UserInfoEx/svc_timezone.h
+++ b/plugins/UserInfoEx/src/svc_timezone.h
diff --git a/plugins/UserInfoEx/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp
index f602f68f5d..f602f68f5d 100644
--- a/plugins/UserInfoEx/svc_timezone_old.cpp
+++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp
diff --git a/plugins/UserInfoEx/svc_timezone_old.h b/plugins/UserInfoEx/src/svc_timezone_old.h
index 9704584e1a..9704584e1a 100644
--- a/plugins/UserInfoEx/svc_timezone_old.h
+++ b/plugins/UserInfoEx/src/svc_timezone_old.h
diff --git a/plugins/UserInfoEx/Res/version.h b/plugins/UserInfoEx/src/version.h
index 8ee84378bf..8ee84378bf 100644
--- a/plugins/UserInfoEx/Res/version.h
+++ b/plugins/UserInfoEx/src/version.h
diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index ec80e2139f..f9ac10a27e 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -72,13 +72,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -92,7 +91,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -100,12 +99,11 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>variables.h</PrecompiledHeaderFile>
     </ClCompile>
@@ -121,18 +119,17 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
-      <AdditionalLibraryDirectories>pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -146,7 +143,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -155,10 +152,9 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;src\pcre\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
-      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <Optimization>Disabled</Optimization>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -171,7 +167,7 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <AdditionalLibraryDirectories>pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>src\pcre\lib64;$(SolutionDir)\lib</AdditionalLibraryDirectories>
     </Link>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\..\include\msapi</AdditionalIncludeDirectories>
@@ -179,63 +175,60 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="contact.cpp" />
-    <ClCompile Include="help.cpp" />
-    <ClCompile Include="lookup3.cpp">
+    <ClCompile Include="src\contact.cpp" />
+    <ClCompile Include="src\help.cpp" />
+    <ClCompile Include="src\lookup3.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="tokenregister.cpp" />
-    <ClCompile Include="variables.cpp" />
-    <ClCompile Include="enumprocs.cpp">
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\tokenregister.cpp" />
+    <ClCompile Include="src\variables.cpp" />
+    <ClCompile Include="src\enumprocs.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="parse_alias.cpp" />
-    <ClCompile Include="parse_external.cpp" />
-    <ClCompile Include="parse_inet.cpp" />
-    <ClCompile Include="parse_logic.cpp" />
-    <ClCompile Include="parse_math.cpp" />
-    <ClCompile Include="parse_metacontacts.cpp" />
-    <ClCompile Include="parse_miranda.cpp" />
-    <ClCompile Include="parse_regexp.cpp" />
-    <ClCompile Include="parse_str.cpp" />
-    <ClCompile Include="parse_system.cpp" />
-    <ClCompile Include="parse_variables.cpp" />
-    <ClCompile Include="parse_xml.cpp" />
-    <ClCompile Include="action_variables.cpp" />
-    <ClCompile Include="condition_variables.cpp" />
-    <ClCompile Include="trigger_variables.cpp" />
+    <ClCompile Include="src\parse_alias.cpp" />
+    <ClCompile Include="src\parse_external.cpp" />
+    <ClCompile Include="src\parse_inet.cpp" />
+    <ClCompile Include="src\parse_logic.cpp" />
+    <ClCompile Include="src\parse_math.cpp" />
+    <ClCompile Include="src\parse_metacontacts.cpp" />
+    <ClCompile Include="src\parse_miranda.cpp" />
+    <ClCompile Include="src\parse_regexp.cpp" />
+    <ClCompile Include="src\parse_str.cpp" />
+    <ClCompile Include="src\parse_system.cpp" />
+    <ClCompile Include="src\parse_variables.cpp" />
+    <ClCompile Include="src\parse_xml.cpp" />
+    <ClCompile Include="src\action_variables.cpp" />
+    <ClCompile Include="src\condition_variables.cpp" />
+    <ClCompile Include="src\trigger_variables.cpp" />
     <ClCompile Include="..\helpers\gen_helpers.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contact.h" />
-    <ClInclude Include="variables.h" />
-    <ClInclude Include="enumprocs.h" />
-    <ClInclude Include="parse_alias.h" />
-    <ClInclude Include="parse_external.h" />
-    <ClInclude Include="parse_inet.h" />
-    <ClInclude Include="parse_logic.h" />
-    <ClInclude Include="parse_math.h" />
-    <ClInclude Include="parse_metacontacts.h" />
-    <ClInclude Include="parse_miranda.h" />
-    <ClInclude Include="parse_regexp.h" />
-    <ClInclude Include="parse_str.h" />
-    <ClInclude Include="parse_system.h" />
-    <ClInclude Include="parse_variables.h" />
-    <ClInclude Include="parse_xml.h" />
-    <ClInclude Include="trigger_variables.h" />
+    <ClInclude Include="src\contact.h" />
+    <ClInclude Include="src\variables.h" />
+    <ClInclude Include="src\enumprocs.h" />
+    <ClInclude Include="src\parse_alias.h" />
+    <ClInclude Include="src\parse_external.h" />
+    <ClInclude Include="src\parse_inet.h" />
+    <ClInclude Include="src\parse_logic.h" />
+    <ClInclude Include="src\parse_math.h" />
+    <ClInclude Include="src\parse_metacontacts.h" />
+    <ClInclude Include="src\parse_miranda.h" />
+    <ClInclude Include="src\parse_regexp.h" />
+    <ClInclude Include="src\parse_str.h" />
+    <ClInclude Include="src\parse_system.h" />
+    <ClInclude Include="src\parse_variables.h" />
+    <ClInclude Include="src\parse_xml.h" />
+    <ClInclude Include="src\trigger_variables.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="V.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Variables.rc" />
-    <ResourceCompile Include="version.rc" />
+    <ResourceCompile Include="res\Variables.rc" />
+    <ResourceCompile Include="res\version.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/Variables/Variables_10.vcxproj.filters b/plugins/Variables/Variables_10.vcxproj.filters
index 03ffbf41a4..5a19c2154c 100644
--- a/plugins/Variables/Variables_10.vcxproj.filters
+++ b/plugins/Variables/Variables_10.vcxproj.filters
@@ -25,73 +25,73 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="contact.cpp">
+    <ClCompile Include="src\contact.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="help.cpp">
+    <ClCompile Include="src\help.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="lookup3.cpp">
+    <ClCompile Include="src\lookup3.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="tokenregister.cpp">
+    <ClCompile Include="src\tokenregister.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="variables.cpp">
+    <ClCompile Include="src\variables.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="enumprocs.cpp">
+    <ClCompile Include="src\enumprocs.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_alias.cpp">
+    <ClCompile Include="src\parse_alias.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_external.cpp">
+    <ClCompile Include="src\parse_external.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_inet.cpp">
+    <ClCompile Include="src\parse_inet.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_logic.cpp">
+    <ClCompile Include="src\parse_logic.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_math.cpp">
+    <ClCompile Include="src\parse_math.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_metacontacts.cpp">
+    <ClCompile Include="src\parse_metacontacts.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_miranda.cpp">
+    <ClCompile Include="src\parse_miranda.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_regexp.cpp">
+    <ClCompile Include="src\parse_regexp.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_str.cpp">
+    <ClCompile Include="src\parse_str.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_system.cpp">
+    <ClCompile Include="src\parse_system.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_variables.cpp">
+    <ClCompile Include="src\parse_variables.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="parse_xml.cpp">
+    <ClCompile Include="src\parse_xml.cpp">
       <Filter>Parse</Filter>
     </ClCompile>
-    <ClCompile Include="action_variables.cpp">
+    <ClCompile Include="src\action_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
-    <ClCompile Include="condition_variables.cpp">
+    <ClCompile Include="src\condition_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
-    <ClCompile Include="trigger_variables.cpp">
+    <ClCompile Include="src\trigger_variables.cpp">
       <Filter>TriggerPlugin</Filter>
     </ClCompile>
     <ClCompile Include="..\helpers\gen_helpers.cpp">
@@ -99,65 +99,60 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="contact.h">
+    <ClInclude Include="src\contact.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="variables.h">
+    <ClInclude Include="src\variables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="enumprocs.h">
+    <ClInclude Include="src\enumprocs.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_alias.h">
+    <ClInclude Include="src\parse_alias.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_external.h">
+    <ClInclude Include="src\parse_external.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_inet.h">
+    <ClInclude Include="src\parse_inet.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_logic.h">
+    <ClInclude Include="src\parse_logic.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_math.h">
+    <ClInclude Include="src\parse_math.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_metacontacts.h">
+    <ClInclude Include="src\parse_metacontacts.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_miranda.h">
+    <ClInclude Include="src\parse_miranda.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_regexp.h">
+    <ClInclude Include="src\parse_regexp.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_str.h">
+    <ClInclude Include="src\parse_str.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_system.h">
+    <ClInclude Include="src\parse_system.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_variables.h">
+    <ClInclude Include="src\parse_variables.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="parse_xml.h">
+    <ClInclude Include="src\parse_xml.h">
       <Filter>Parse</Filter>
     </ClInclude>
-    <ClInclude Include="trigger_variables.h">
+    <ClInclude Include="src\trigger_variables.h">
       <Filter>TriggerPlugin</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="V.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Variables.rc">
+    <ResourceCompile Include="res\Variables.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-    <ResourceCompile Include="version.rc">
+    <ResourceCompile Include="res\version.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
diff --git a/plugins/Variables/Variables.txt b/plugins/Variables/docs/Variables.txt
index 14b37e0a48..14b37e0a48 100644
--- a/plugins/Variables/Variables.txt
+++ b/plugins/Variables/docs/Variables.txt
diff --git a/plugins/Variables/copying.txt b/plugins/Variables/docs/copying.txt
index bd5cace35b..bd5cace35b 100644
--- a/plugins/Variables/copying.txt
+++ b/plugins/Variables/docs/copying.txt
diff --git a/plugins/Variables/variables-translation.txt b/plugins/Variables/docs/variables-translation.txt
index 2b8ef53a7e..2b8ef53a7e 100644
--- a/plugins/Variables/variables-translation.txt
+++ b/plugins/Variables/docs/variables-translation.txt
diff --git a/plugins/Variables/V.ico b/plugins/Variables/res/V.ico
index 7f016eee31..7f016eee31 100644
--- a/plugins/Variables/V.ico
+++ b/plugins/Variables/res/V.ico
diff --git a/plugins/Variables/Variables.rc b/plugins/Variables/res/Variables.rc
index 2907d921d9..604367cf88 100644
--- a/plugins/Variables/Variables.rc
+++ b/plugins/Variables/res/Variables.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.
 //
-#include "resource.h"
+#include "..\src\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -273,7 +273,7 @@ END
 
 1 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
-    "resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE MOVEABLE PURE 
@@ -297,7 +297,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_V                   ICON    DISCARDABLE     "V.ico"
+IDI_V                   ICON     "V.ico"
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/plugins/Variables/version.rc b/plugins/Variables/res/version.rc
index 6650a34d93..e6a93d27ca 100644
--- a/plugins/Variables/version.rc
+++ b/plugins/Variables/res/version.rc
@@ -3,7 +3,7 @@
 #endif //APSTUDIO_INVOKED
 
 #include <windows.h>
-#include "buildnumber.h"
+#include "..\src\buildnumber.h"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/plugins/Variables/ac/ac.h b/plugins/Variables/src/ac/ac.h
index 7d0790f32b..7d0790f32b 100644
--- a/plugins/Variables/ac/ac.h
+++ b/plugins/Variables/src/ac/ac.h
diff --git a/plugins/Variables/action_variables.cpp b/plugins/Variables/src/action_variables.cpp
index e4d1a17aa1..e4d1a17aa1 100644
--- a/plugins/Variables/action_variables.cpp
+++ b/plugins/Variables/src/action_variables.cpp
diff --git a/plugins/Variables/buildnumber.h b/plugins/Variables/src/buildnumber.h
index 2e38a77fad..2e38a77fad 100644
--- a/plugins/Variables/buildnumber.h
+++ b/plugins/Variables/src/buildnumber.h
diff --git a/plugins/Variables/condition_variables.cpp b/plugins/Variables/src/condition_variables.cpp
index c58703cc54..c58703cc54 100644
--- a/plugins/Variables/condition_variables.cpp
+++ b/plugins/Variables/src/condition_variables.cpp
diff --git a/plugins/Variables/contact.cpp b/plugins/Variables/src/contact.cpp
index 9e2f08c83e..9e2f08c83e 100644
--- a/plugins/Variables/contact.cpp
+++ b/plugins/Variables/src/contact.cpp
diff --git a/plugins/Variables/contact.h b/plugins/Variables/src/contact.h
index 7d980801f3..7d980801f3 100644
--- a/plugins/Variables/contact.h
+++ b/plugins/Variables/src/contact.h
diff --git a/plugins/Variables/dbhelpers.h b/plugins/Variables/src/dbhelpers.h
index 3eb3c7e330..3eb3c7e330 100644
--- a/plugins/Variables/dbhelpers.h
+++ b/plugins/Variables/src/dbhelpers.h
diff --git a/plugins/Variables/enumprocs.cpp b/plugins/Variables/src/enumprocs.cpp
index 56df0acfc8..56df0acfc8 100644
--- a/plugins/Variables/enumprocs.cpp
+++ b/plugins/Variables/src/enumprocs.cpp
diff --git a/plugins/Variables/enumprocs.h b/plugins/Variables/src/enumprocs.h
index 118c40b67c..118c40b67c 100644
--- a/plugins/Variables/enumprocs.h
+++ b/plugins/Variables/src/enumprocs.h
diff --git a/plugins/Variables/help.cpp b/plugins/Variables/src/help.cpp
index 8b852b7f6c..8b852b7f6c 100644
--- a/plugins/Variables/help.cpp
+++ b/plugins/Variables/src/help.cpp
diff --git a/plugins/Variables/libxml/DOCBparser.h b/plugins/Variables/src/libxml/DOCBparser.h
index 4b7230f17d..75fb0b2ac8 100644
--- a/plugins/Variables/libxml/DOCBparser.h
+++ b/plugins/Variables/src/libxml/DOCBparser.h
@@ -8,7 +8,7 @@
 
 #ifndef __DOCB_PARSER_H__
 #define __DOCB_PARSER_H__
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/HTMLparser.h b/plugins/Variables/src/libxml/HTMLparser.h
index c6d8899c30..a98ecbe8e6 100644
--- a/plugins/Variables/libxml/HTMLparser.h
+++ b/plugins/Variables/src/libxml/HTMLparser.h
@@ -8,7 +8,7 @@
 
 #ifndef __HTML_PARSER_H__
 #define __HTML_PARSER_H__
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/HTMLtree.h b/plugins/Variables/src/libxml/HTMLtree.h
index 3a441c4b5c..e9944b3b25 100644
--- a/plugins/Variables/libxml/HTMLtree.h
+++ b/plugins/Variables/src/libxml/HTMLtree.h
@@ -11,8 +11,8 @@
 #define __HTML_TREE_H__
 
 #include <stdio.h>
-#include <libxml/tree.h>
-#include <libxml/HTMLparser.h>
+#include "libxml/tree.h"
+#include "libxml/HTMLparser.h"
 
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxml/SAX.h b/plugins/Variables/src/libxml/SAX.h
index d96d9e9596..a46e14c78e 100644
--- a/plugins/Variables/libxml/SAX.h
+++ b/plugins/Variables/src/libxml/SAX.h
@@ -12,8 +12,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <libxml/parser.h>
-#include <libxml/xlink.h>
+#include "libxml/parser.h"
+#include "libxml/xlink.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/c14n.h b/plugins/Variables/src/libxml/c14n.h
index 75ace8a4a4..75ace8a4a4 100644
--- a/plugins/Variables/libxml/c14n.h
+++ b/plugins/Variables/src/libxml/c14n.h
diff --git a/plugins/Variables/libxml/catalog.h b/plugins/Variables/src/libxml/catalog.h
index 037e7e80e0..f6ee04815e 100644
--- a/plugins/Variables/libxml/catalog.h
+++ b/plugins/Variables/src/libxml/catalog.h
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_CATALOG_ENABLED
 
diff --git a/plugins/Variables/libxml/debugXML.h b/plugins/Variables/src/libxml/debugXML.h
index cf017a4a73..444acb408e 100644
--- a/plugins/Variables/libxml/debugXML.h
+++ b/plugins/Variables/src/libxml/debugXML.h
@@ -8,11 +8,11 @@
 #ifndef __DEBUG_XML__
 #define __DEBUG_XML__
 #include <stdio.h>
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef LIBXML_DEBUG_ENABLED
 
-#include <libxml/xpath.h>
+#include "libxml/xpath.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/encoding.h b/plugins/Variables/src/libxml/encoding.h
index 3c0fbb91ff..012f6d9cf6 100644
--- a/plugins/Variables/libxml/encoding.h
+++ b/plugins/Variables/src/libxml/encoding.h
@@ -21,7 +21,7 @@
 #ifndef __XML_CHAR_ENCODING_H__
 #define __XML_CHAR_ENCODING_H__
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_ICONV_ENABLED
 #include <iconv.h>
@@ -137,7 +137,7 @@ struct _xmlCharEncodingHandler {
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/entities.h b/plugins/Variables/src/libxml/entities.h
index ea7f2020c2..3dfc4deba1 100644
--- a/plugins/Variables/libxml/entities.h
+++ b/plugins/Variables/src/libxml/entities.h
@@ -9,7 +9,7 @@
 #ifndef __XML_ENTITIES_H__
 #define __XML_ENTITIES_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/globals.h b/plugins/Variables/src/libxml/globals.h
index 6f880c0877..8a5e8c88e0 100644
--- a/plugins/Variables/libxml/globals.h
+++ b/plugins/Variables/src/libxml/globals.h
@@ -13,10 +13,10 @@
 #ifndef __XML_GLOBALS_H
 #define __XML_GLOBALS_H
 
-#include <libxml/parser.h>
-#include <libxml/xmlerror.h>
-#include <libxml/SAX.h>
-#include <libxml/xmlmemory.h>
+#include "libxml/parser.h"
+#include "libxml/xmlerror.h"
+#include "libxml/SAX.h"
+#include "libxml/xmlmemory.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -102,7 +102,7 @@ struct _xmlGlobalState
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/threads.h>
+#include "libxml/threads.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/hash.h b/plugins/Variables/src/libxml/hash.h
index ec590c91fe..24c5f214c3 100644
--- a/plugins/Variables/libxml/hash.h
+++ b/plugins/Variables/src/libxml/hash.h
@@ -18,7 +18,7 @@
 #ifndef __XML_HASH_H__
 #define __XML_HASH_H__
 
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/list.h b/plugins/Variables/src/libxml/list.h
index 8c9515fe1d..8c9515fe1d 100644
--- a/plugins/Variables/libxml/list.h
+++ b/plugins/Variables/src/libxml/list.h
diff --git a/plugins/Variables/libxml/nanoftp.h b/plugins/Variables/src/libxml/nanoftp.h
index a0ba2ceeb3..a0ba2ceeb3 100644
--- a/plugins/Variables/libxml/nanoftp.h
+++ b/plugins/Variables/src/libxml/nanoftp.h
diff --git a/plugins/Variables/libxml/nanohttp.h b/plugins/Variables/src/libxml/nanohttp.h
index 4fb4e1d256..4fb4e1d256 100644
--- a/plugins/Variables/libxml/nanohttp.h
+++ b/plugins/Variables/src/libxml/nanohttp.h
diff --git a/plugins/Variables/libxml/parser.h b/plugins/Variables/src/libxml/parser.h
index e6725a364d..ac98f4b944 100644
--- a/plugins/Variables/libxml/parser.h
+++ b/plugins/Variables/src/libxml/parser.h
@@ -9,9 +9,9 @@
 #ifndef __XML_PARSER_H__
 #define __XML_PARSER_H__
 
-#include <libxml/tree.h>
-#include <libxml/valid.h>
-#include <libxml/entities.h>
+#include "libxml/tree.h"
+#include "libxml/valid.h"
+#include "libxml/entities.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -638,9 +638,9 @@ LIBXML_DLL_IMPORT extern int xmlGetWarningsDefaultValue;
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/encoding.h>
-#include <libxml/xmlIO.h>
-#include <libxml/globals.h>
+#include "libxml/encoding.h"
+#include "libxml/xmlIO.h"
+#include "libxml/globals.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/parserInternals.h b/plugins/Variables/src/libxml/parserInternals.h
index 8507442be8..8507442be8 100644
--- a/plugins/Variables/libxml/parserInternals.h
+++ b/plugins/Variables/src/libxml/parserInternals.h
diff --git a/plugins/Variables/libxml/schemasInternals.h b/plugins/Variables/src/libxml/schemasInternals.h
index fb1f7eeb39..fb1f7eeb39 100644
--- a/plugins/Variables/libxml/schemasInternals.h
+++ b/plugins/Variables/src/libxml/schemasInternals.h
diff --git a/plugins/Variables/libxml/threads.h b/plugins/Variables/src/libxml/threads.h
index afca78ffe5..4ef7a17386 100644
--- a/plugins/Variables/libxml/threads.h
+++ b/plugins/Variables/src/libxml/threads.h
@@ -28,7 +28,7 @@ typedef xmlRMutex *xmlRMutexPtr;
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/globals.h>
+#include "libxml/globals.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/tree.h b/plugins/Variables/src/libxml/tree.h
index 8521a31997..1a9fb0036d 100644
--- a/plugins/Variables/libxml/tree.h
+++ b/plugins/Variables/src/libxml/tree.h
@@ -12,7 +12,7 @@
 #define __XML_TREE_H__
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -261,7 +261,7 @@ typedef enum {
 #ifdef __cplusplus
 }
 #endif
-#include <libxml/xmlregexp.h>
+#include "libxml/xmlregexp.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/uri.h b/plugins/Variables/src/libxml/uri.h
index 319c509d1b..319c509d1b 100644
--- a/plugins/Variables/libxml/uri.h
+++ b/plugins/Variables/src/libxml/uri.h
diff --git a/plugins/Variables/libxml/valid.h b/plugins/Variables/src/libxml/valid.h
index 36373e17f0..dbf2aba562 100644
--- a/plugins/Variables/libxml/valid.h
+++ b/plugins/Variables/src/libxml/valid.h
@@ -10,10 +10,10 @@
 #ifndef __XML_VALID_H__
 #define __XML_VALID_H__
 
-#include <libxml/tree.h>
-#include <libxml/list.h>
-#include <libxml/xmlautomata.h>
-#include <libxml/xmlregexp.h>
+#include "libxml/tree.h"
+#include "libxml/list.h"
+#include "libxml/xmlautomata.h"
+#include "libxml/xmlregexp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xinclude.h b/plugins/Variables/src/libxml/xinclude.h
index 9c83ba0e5c..f59020f7a2 100644
--- a/plugins/Variables/libxml/xinclude.h
+++ b/plugins/Variables/src/libxml/xinclude.h
@@ -12,7 +12,7 @@
 #ifndef __XML_XINCLUDE_H__
 #define __XML_XINCLUDE_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xlink.h b/plugins/Variables/src/libxml/xlink.h
index c7f48c8539..b5a0f91067 100644
--- a/plugins/Variables/libxml/xlink.h
+++ b/plugins/Variables/src/libxml/xlink.h
@@ -13,7 +13,7 @@
 #ifndef __XML_XLINK_H__
 #define __XML_XLINK_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlIO.h b/plugins/Variables/src/libxml/xmlIO.h
index 16cc8e507a..a6870fc51b 100644
--- a/plugins/Variables/libxml/xmlIO.h
+++ b/plugins/Variables/src/libxml/xmlIO.h
@@ -11,7 +11,7 @@
 #define __XML_IO_H__
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -112,10 +112,10 @@ typedef int (*xmlOutputCloseCallback) (void * context);
 }
 #endif
 
-#include <libxml/globals.h>
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-#include <libxml/encoding.h>
+#include "libxml/globals.h"
+#include "libxml/tree.h"
+#include "libxml/parser.h"
+#include "libxml/encoding.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlautomata.h b/plugins/Variables/src/libxml/xmlautomata.h
index 96ba2245b3..cc25e0b715 100644
--- a/plugins/Variables/libxml/xmlautomata.h
+++ b/plugins/Variables/src/libxml/xmlautomata.h
@@ -9,11 +9,11 @@
 #ifndef __XML_AUTOMATA_H__
 #define __XML_AUTOMATA_H__
 
-#include <libxml/xmlversion.h>
-#include <libxml/tree.h>
+#include "libxml/xmlversion.h"
+#include "libxml/tree.h"
 
 #ifdef LIBXML_AUTOMATA_ENABLED
-#include <libxml/xmlregexp.h>
+#include "libxml/xmlregexp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xmlerror.h b/plugins/Variables/src/libxml/xmlerror.h
index 33e2275910..a40a1ec7ab 100644
--- a/plugins/Variables/libxml/xmlerror.h
+++ b/plugins/Variables/src/libxml/xmlerror.h
@@ -1,4 +1,4 @@
-#include <libxml/parser.h>
+#include "libxml/parser.h"
 
 #ifndef __XML_ERROR_H__
 #define __XML_ERROR_H__
diff --git a/plugins/Variables/libxml/xmlmemory.h b/plugins/Variables/src/libxml/xmlmemory.h
index 8e8df944c1..314d8f8339 100644
--- a/plugins/Variables/libxml/xmlmemory.h
+++ b/plugins/Variables/src/libxml/xmlmemory.h
@@ -9,7 +9,7 @@
 #define _DEBUG_MEMORY_ALLOC_
 
 #include <stdio.h>
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 /**
  * DEBUG_MEMORY:
@@ -160,8 +160,8 @@ char *	xmlMemStrdupLoc(const char *str, const char *file, int line);
 
 #ifndef __XML_GLOBALS_H
 #ifndef __XML_THREADS_H__
-#include <libxml/threads.h>
-#include <libxml/globals.h>
+#include "libxml/threads.h"
+#include "libxml/globals.h"
 #endif
 #endif
 
diff --git a/plugins/Variables/libxml/xmlregexp.h b/plugins/Variables/src/libxml/xmlregexp.h
index 434b7a2bd9..f15ead03ae 100644
--- a/plugins/Variables/libxml/xmlregexp.h
+++ b/plugins/Variables/src/libxml/xmlregexp.h
@@ -9,7 +9,7 @@
 #ifndef __XML_REGEXP_H__
 #define __XML_REGEXP_H__
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #ifdef LIBXML_REGEXP_ENABLED
 
@@ -37,7 +37,7 @@ typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
 #ifdef __cplusplus
 }
 #endif 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/plugins/Variables/libxml/xmlschemas.h b/plugins/Variables/src/libxml/xmlschemas.h
index 14b9230832..14b9230832 100644
--- a/plugins/Variables/libxml/xmlschemas.h
+++ b/plugins/Variables/src/libxml/xmlschemas.h
diff --git a/plugins/Variables/libxml/xmlschemastypes.h b/plugins/Variables/src/libxml/xmlschemastypes.h
index a758c128e5..a758c128e5 100644
--- a/plugins/Variables/libxml/xmlschemastypes.h
+++ b/plugins/Variables/src/libxml/xmlschemastypes.h
diff --git a/plugins/Variables/libxml/xmlunicode.h b/plugins/Variables/src/libxml/xmlunicode.h
index f0f1fe9ce9..f0f1fe9ce9 100644
--- a/plugins/Variables/libxml/xmlunicode.h
+++ b/plugins/Variables/src/libxml/xmlunicode.h
diff --git a/plugins/Variables/libxml/xmlversion.h b/plugins/Variables/src/libxml/xmlversion.h
index 1342eba969..1342eba969 100644
--- a/plugins/Variables/libxml/xmlversion.h
+++ b/plugins/Variables/src/libxml/xmlversion.h
diff --git a/plugins/Variables/libxml/xpath.h b/plugins/Variables/src/libxml/xpath.h
index f36b16f938..9ec5453d88 100644
--- a/plugins/Variables/libxml/xpath.h
+++ b/plugins/Variables/src/libxml/xpath.h
@@ -12,8 +12,8 @@
 #ifndef __XML_XPATH_H__
 #define __XML_XPATH_H__
 
-#include <libxml/tree.h>
-#include <libxml/hash.h>
+#include "libxml/tree.h"
+#include "libxml/hash.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxml/xpathInternals.h b/plugins/Variables/src/libxml/xpathInternals.h
index 59a4e35d53..59a4e35d53 100644
--- a/plugins/Variables/libxml/xpathInternals.h
+++ b/plugins/Variables/src/libxml/xpathInternals.h
diff --git a/plugins/Variables/libxml/xpointer.h b/plugins/Variables/src/libxml/xpointer.h
index 80c465c70f..80c465c70f 100644
--- a/plugins/Variables/libxml/xpointer.h
+++ b/plugins/Variables/src/libxml/xpointer.h
diff --git a/plugins/Variables/libxslt/numbersInternals.h b/plugins/Variables/src/libxslt/numbersInternals.h
index e4938f335a..8707789521 100644
--- a/plugins/Variables/libxslt/numbersInternals.h
+++ b/plugins/Variables/src/libxslt/numbersInternals.h
@@ -10,7 +10,7 @@
 #ifndef __XML_XSLT_NUMBERSINTERNALS_H__
 #define __XML_XSLT_NUMBERSINTERNALS_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #include "xsltexports.h"
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxslt/transform.h b/plugins/Variables/src/libxslt/transform.h
index 9efb79c437..10d3d2d55a 100644
--- a/plugins/Variables/libxslt/transform.h
+++ b/plugins/Variables/src/libxslt/transform.h
@@ -10,10 +10,10 @@
 #ifndef __XML_XSLT_TRANSFORM_H__
 #define __XML_XSLT_TRANSFORM_H__
 
-#include <libxml/parser.h>
-#include <libxml/xmlIO.h>
+#include "libxml/parser.h"
+#include "libxml/xmlIO.h"
 #include "xsltexports.h"
-#include <libxslt/xsltInternals.h>
+#include "libxslt/xsltInternals.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/Variables/libxslt/win32config.h b/plugins/Variables/src/libxslt/win32config.h
index c035aeb90e..249408b54a 100644
--- a/plugins/Variables/libxslt/win32config.h
+++ b/plugins/Variables/src/libxslt/win32config.h
@@ -78,7 +78,7 @@ static int isnan (double d) {
 #define HAVE__STAT
 #define HAVE_STRING_H
 
-#include <libxml/xmlversion.h>
+#include "libxml/xmlversion.h"
 
 #if !defined LIBXSLT_PUBLIC
 #if defined _MSC_VER && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC
diff --git a/plugins/Variables/libxslt/xslt.h b/plugins/Variables/src/libxslt/xslt.h
index d201fccda4..4d3462fd25 100644
--- a/plugins/Variables/libxslt/xslt.h
+++ b/plugins/Variables/src/libxslt/xslt.h
@@ -9,7 +9,7 @@
 #ifndef __XML_XSLT_H__
 #define __XML_XSLT_H__
 
-#include <libxml/tree.h>
+#include "libxml/tree.h"
 #include "xsltexports.h"
 
 #ifdef __cplusplus
diff --git a/plugins/Variables/libxslt/xsltInternals.h b/plugins/Variables/src/libxslt/xsltInternals.h
index d574e5997b..78b80661da 100644
--- a/plugins/Variables/libxslt/xsltInternals.h
+++ b/plugins/Variables/src/libxslt/xsltInternals.h
@@ -12,11 +12,11 @@
 #ifndef __XML_XSLT_INTERNALS_H__
 #define __XML_XSLT_INTERNALS_H__
 
-#include <libxml/tree.h>
-#include <libxml/hash.h>
-#include <libxml/xpath.h>
-#include <libxml/xmlerror.h>
-#include <libxslt/xslt.h>
+#include "libxml/tree.h"
+#include "libxml/hash.h"
+#include "libxml/xpath.h"
+#include "libxml/xmlerror.h"
+#include "libxslt/xslt.h"
 #include "xsltexports.h"
 #include "numbersInternals.h"
 
diff --git a/plugins/Variables/libxslt/xsltexports.h b/plugins/Variables/src/libxslt/xsltexports.h
index aab58025b8..aab58025b8 100644
--- a/plugins/Variables/libxslt/xsltexports.h
+++ b/plugins/Variables/src/libxslt/xsltexports.h
diff --git a/plugins/Variables/libxslt/xsltutils.h b/plugins/Variables/src/libxslt/xsltutils.h
index 180ae04561..699fd4ab1c 100644
--- a/plugins/Variables/libxslt/xsltutils.h
+++ b/plugins/Variables/src/libxslt/xsltutils.h
@@ -10,13 +10,13 @@
 #define __XML_XSLTUTILS_H__
 
 #if defined(WIN32) && defined(_MSC_VER)
-#include <libxslt/xsltwin32config.h>
+#include "libxslt/xsltwin32config.h"
 #else
-#include <libxslt/xsltconfig.h>
+#include "libxslt/xsltconfig.h"
 #endif
 
-#include <libxml/xpath.h>
-#include <libxml/xmlerror.h>
+#include "libxml/xpath.h"
+#include "libxml/xmlerror.h"
 #include "xsltexports.h"
 #include "xsltInternals.h"
 
diff --git a/plugins/Variables/libxslt/xsltwin32config.h b/plugins/Variables/src/libxslt/xsltwin32config.h
index 985bfc71dc..985bfc71dc 100644
--- a/plugins/Variables/libxslt/xsltwin32config.h
+++ b/plugins/Variables/src/libxslt/xsltwin32config.h
diff --git a/plugins/Variables/lookup3.cpp b/plugins/Variables/src/lookup3.cpp
index f2c930950c..f2c930950c 100644
--- a/plugins/Variables/lookup3.cpp
+++ b/plugins/Variables/src/lookup3.cpp
diff --git a/plugins/Variables/main.cpp b/plugins/Variables/src/main.cpp
index b6330ce585..b6330ce585 100644
--- a/plugins/Variables/main.cpp
+++ b/plugins/Variables/src/main.cpp
diff --git a/plugins/Variables/options.cpp b/plugins/Variables/src/options.cpp
index 0220386564..0220386564 100644
--- a/plugins/Variables/options.cpp
+++ b/plugins/Variables/src/options.cpp
diff --git a/plugins/Variables/parse_alias.cpp b/plugins/Variables/src/parse_alias.cpp
index 49c2999595..49c2999595 100644
--- a/plugins/Variables/parse_alias.cpp
+++ b/plugins/Variables/src/parse_alias.cpp
diff --git a/plugins/Variables/parse_alias.h b/plugins/Variables/src/parse_alias.h
index d868841fb8..d868841fb8 100644
--- a/plugins/Variables/parse_alias.h
+++ b/plugins/Variables/src/parse_alias.h
diff --git a/plugins/Variables/parse_external.cpp b/plugins/Variables/src/parse_external.cpp
index 42b7a12462..42b7a12462 100644
--- a/plugins/Variables/parse_external.cpp
+++ b/plugins/Variables/src/parse_external.cpp
diff --git a/plugins/Variables/parse_external.h b/plugins/Variables/src/parse_external.h
index 201b1e26a3..201b1e26a3 100644
--- a/plugins/Variables/parse_external.h
+++ b/plugins/Variables/src/parse_external.h
diff --git a/plugins/Variables/parse_inet.cpp b/plugins/Variables/src/parse_inet.cpp
index 4eabed3ccc..4eabed3ccc 100644
--- a/plugins/Variables/parse_inet.cpp
+++ b/plugins/Variables/src/parse_inet.cpp
diff --git a/plugins/Variables/parse_inet.h b/plugins/Variables/src/parse_inet.h
index 8e9bf66e1b..8e9bf66e1b 100644
--- a/plugins/Variables/parse_inet.h
+++ b/plugins/Variables/src/parse_inet.h
diff --git a/plugins/Variables/parse_logic.cpp b/plugins/Variables/src/parse_logic.cpp
index b375faab14..b375faab14 100644
--- a/plugins/Variables/parse_logic.cpp
+++ b/plugins/Variables/src/parse_logic.cpp
diff --git a/plugins/Variables/parse_logic.h b/plugins/Variables/src/parse_logic.h
index 774a94b670..774a94b670 100644
--- a/plugins/Variables/parse_logic.h
+++ b/plugins/Variables/src/parse_logic.h
diff --git a/plugins/Variables/parse_math.cpp b/plugins/Variables/src/parse_math.cpp
index c214898b5d..c214898b5d 100644
--- a/plugins/Variables/parse_math.cpp
+++ b/plugins/Variables/src/parse_math.cpp
diff --git a/plugins/Variables/parse_math.h b/plugins/Variables/src/parse_math.h
index f185749399..f185749399 100644
--- a/plugins/Variables/parse_math.h
+++ b/plugins/Variables/src/parse_math.h
diff --git a/plugins/Variables/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 8831e7a192..8831e7a192 100644
--- a/plugins/Variables/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
diff --git a/plugins/Variables/parse_metacontacts.h b/plugins/Variables/src/parse_metacontacts.h
index 8015d40413..8015d40413 100644
--- a/plugins/Variables/parse_metacontacts.h
+++ b/plugins/Variables/src/parse_metacontacts.h
diff --git a/plugins/Variables/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp
index 926f7fb67b..926f7fb67b 100644
--- a/plugins/Variables/parse_miranda.cpp
+++ b/plugins/Variables/src/parse_miranda.cpp
diff --git a/plugins/Variables/parse_miranda.h b/plugins/Variables/src/parse_miranda.h
index 0d429d67bb..0d429d67bb 100644
--- a/plugins/Variables/parse_miranda.h
+++ b/plugins/Variables/src/parse_miranda.h
diff --git a/plugins/Variables/parse_regexp.cpp b/plugins/Variables/src/parse_regexp.cpp
index 4460e41ca6..4460e41ca6 100644
--- a/plugins/Variables/parse_regexp.cpp
+++ b/plugins/Variables/src/parse_regexp.cpp
diff --git a/plugins/Variables/parse_regexp.h b/plugins/Variables/src/parse_regexp.h
index 00d38cab59..00d38cab59 100644
--- a/plugins/Variables/parse_regexp.h
+++ b/plugins/Variables/src/parse_regexp.h
diff --git a/plugins/Variables/parse_str.cpp b/plugins/Variables/src/parse_str.cpp
index 112b064d1f..112b064d1f 100644
--- a/plugins/Variables/parse_str.cpp
+++ b/plugins/Variables/src/parse_str.cpp
diff --git a/plugins/Variables/parse_str.h b/plugins/Variables/src/parse_str.h
index 7942da455f..7942da455f 100644
--- a/plugins/Variables/parse_str.h
+++ b/plugins/Variables/src/parse_str.h
diff --git a/plugins/Variables/parse_system.cpp b/plugins/Variables/src/parse_system.cpp
index e5db6af03e..e5db6af03e 100644
--- a/plugins/Variables/parse_system.cpp
+++ b/plugins/Variables/src/parse_system.cpp
diff --git a/plugins/Variables/parse_system.h b/plugins/Variables/src/parse_system.h
index d4349130f7..d4349130f7 100644
--- a/plugins/Variables/parse_system.h
+++ b/plugins/Variables/src/parse_system.h
diff --git a/plugins/Variables/parse_variables.cpp b/plugins/Variables/src/parse_variables.cpp
index 1be98fdf5e..1be98fdf5e 100644
--- a/plugins/Variables/parse_variables.cpp
+++ b/plugins/Variables/src/parse_variables.cpp
diff --git a/plugins/Variables/parse_variables.h b/plugins/Variables/src/parse_variables.h
index 5bde654f5f..5bde654f5f 100644
--- a/plugins/Variables/parse_variables.h
+++ b/plugins/Variables/src/parse_variables.h
diff --git a/plugins/Variables/parse_xml.cpp b/plugins/Variables/src/parse_xml.cpp
index 4e360035b4..76f701e116 100644
--- a/plugins/Variables/parse_xml.cpp
+++ b/plugins/Variables/src/parse_xml.cpp
@@ -20,17 +20,17 @@
 #include "parse_xml.h"
 
 #include <string.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/debugXML.h>
-#include <libxml/HTMLtree.h>
-#include <libxml/xmlIO.h>
-#include <libxml/DOCBparser.h>
-#include <libxml/xinclude.h>
-#include <libxml/catalog.h>
-#include <libxslt/xslt.h>
-#include <libxslt/xsltInternals.h>
-#include <libxslt/transform.h>
-#include <libxslt/xsltutils.h>
+#include "libxml/xmlmemory.h"
+#include "libxml/debugXML.h"
+#include "libxml/HTMLtree.h"
+#include "libxml/xmlIO.h"
+#include "libxml/DOCBparser.h"
+#include "libxml/xinclude.h"
+#include "libxml/catalog.h"
+#include "libxslt/xslt.h"
+#include "libxslt/xsltInternals.h"
+#include "libxslt/transform.h"
+#include "libxslt/xsltutils.h"
 
 xsltStylesheetPtr (*pXsltParseStylesheetDoc)(xmlDocPtr doc);
 xmlDocPtr (*pXmlParseMemory)(const char * buffer, int size);
diff --git a/plugins/Variables/parse_xml.h b/plugins/Variables/src/parse_xml.h
index 51df56be79..51df56be79 100644
--- a/plugins/Variables/parse_xml.h
+++ b/plugins/Variables/src/parse_xml.h
diff --git a/plugins/Variables/pcre/include/pcre.h b/plugins/Variables/src/pcre/include/pcre.h
index 712bd3d714..712bd3d714 100644
--- a/plugins/Variables/pcre/include/pcre.h
+++ b/plugins/Variables/src/pcre/include/pcre.h
diff --git a/plugins/Variables/pcre/include/pcreposix.h b/plugins/Variables/src/pcre/include/pcreposix.h
index c77c0b0523..c77c0b0523 100644
--- a/plugins/Variables/pcre/include/pcreposix.h
+++ b/plugins/Variables/src/pcre/include/pcreposix.h
diff --git a/plugins/Variables/pcre/lib/pcre.lib b/plugins/Variables/src/pcre/lib/pcre.lib
index c0dce0ce08..c0dce0ce08 100644
--- a/plugins/Variables/pcre/lib/pcre.lib
+++ b/plugins/Variables/src/pcre/lib/pcre.lib
diff --git a/plugins/Variables/pcre/lib/pcred.lib b/plugins/Variables/src/pcre/lib/pcred.lib
index 103517b44b..103517b44b 100644
--- a/plugins/Variables/pcre/lib/pcred.lib
+++ b/plugins/Variables/src/pcre/lib/pcred.lib
diff --git a/plugins/Variables/pcre/lib64/pcre.lib b/plugins/Variables/src/pcre/lib64/pcre.lib
index 57bd4b65c3..57bd4b65c3 100644
--- a/plugins/Variables/pcre/lib64/pcre.lib
+++ b/plugins/Variables/src/pcre/lib64/pcre.lib
diff --git a/plugins/Variables/pcre/lib64/pcred.lib b/plugins/Variables/src/pcre/lib64/pcred.lib
index 8350667bf7..8350667bf7 100644
--- a/plugins/Variables/pcre/lib64/pcred.lib
+++ b/plugins/Variables/src/pcre/lib64/pcred.lib
diff --git a/plugins/Variables/pcre/pcre_license.txt b/plugins/Variables/src/pcre/pcre_license.txt
index 0fbd6f3e6b..0fbd6f3e6b 100644
--- a/plugins/Variables/pcre/pcre_license.txt
+++ b/plugins/Variables/src/pcre/pcre_license.txt
diff --git a/plugins/Variables/resource.h b/plugins/Variables/src/resource.h
index 3217663618..3217663618 100644
--- a/plugins/Variables/resource.h
+++ b/plugins/Variables/src/resource.h
diff --git a/plugins/Variables/tokenregister.cpp b/plugins/Variables/src/tokenregister.cpp
index 0418c3024f..0418c3024f 100644
--- a/plugins/Variables/tokenregister.cpp
+++ b/plugins/Variables/src/tokenregister.cpp
diff --git a/plugins/Variables/trigger_variables.cpp b/plugins/Variables/src/trigger_variables.cpp
index 6b90088c4f..6b90088c4f 100644
--- a/plugins/Variables/trigger_variables.cpp
+++ b/plugins/Variables/src/trigger_variables.cpp
diff --git a/plugins/Variables/trigger_variables.h b/plugins/Variables/src/trigger_variables.h
index 6b80087e2d..6b80087e2d 100644
--- a/plugins/Variables/trigger_variables.h
+++ b/plugins/Variables/src/trigger_variables.h
diff --git a/plugins/Variables/variables.cpp b/plugins/Variables/src/variables.cpp
index 258725055f..258725055f 100644
--- a/plugins/Variables/variables.cpp
+++ b/plugins/Variables/src/variables.cpp
diff --git a/plugins/Variables/variables.h b/plugins/Variables/src/variables.h
index 35b5e2f367..24b2d17737 100644
--- a/plugins/Variables/variables.h
+++ b/plugins/Variables/src/variables.h
@@ -20,6 +20,8 @@
 
 #define MIRANDA_VER 0x0A00
 
+#define _CRT_NON_CONFORMING_SWPRINTFS
+
 #include <tchar.h> 
 #include <malloc.h>