if smth cannot be incuded, it shall be inlined

52 files changed, 709 insertions, 71 deletions

diff --git a/protocols/ConnectionNotify/ConnectionNotify.vcxproj.filters b/protocols/ConnectionNotify/ConnectionNotify.vcxproj.filters
index 8f90aeb3d5..6f18071f64 100644
--- a/protocols/ConnectionNotify/ConnectionNotify.vcxproj.filters
+++ b/protocols/ConnectionNotify/ConnectionNotify.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/protocols/CurrencyRates/Forex.vcxproj.filters b/protocols/CurrencyRates/Forex.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/CurrencyRates/Forex.vcxproj.filters
+++ b/protocols/CurrencyRates/Forex.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/CurrencyRates/proto_CurrencyRates/proto_CurrencyRates.vcxproj.filters b/protocols/CurrencyRates/proto_CurrencyRates/proto_CurrencyRates.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/CurrencyRates/proto_CurrencyRates/proto_CurrencyRates.vcxproj.filters
+++ b/protocols/CurrencyRates/proto_CurrencyRates/proto_CurrencyRates.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Discord/discord.vcxproj.filters b/protocols/Discord/discord.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/Discord/discord.vcxproj.filters
+++ b/protocols/Discord/discord.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Discord/proto_discord/Proto_Discord.vcxproj.filters b/protocols/Discord/proto_discord/Proto_Discord.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/Discord/proto_discord/Proto_Discord.vcxproj.filters
+++ b/protocols/Discord/proto_discord/Proto_Discord.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Dummy/dummy.vcxproj.filters b/protocols/Dummy/dummy.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/Dummy/dummy.vcxproj.filters
+++ b/protocols/Dummy/dummy.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Dummy/proto_dummy/Proto_Dummy.vcxproj.filters b/protocols/Dummy/proto_dummy/Proto_Dummy.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Dummy/proto_dummy/Proto_Dummy.vcxproj.filters
+++ b/protocols/Dummy/proto_dummy/Proto_Dummy.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/EmLanProto/emlanproto.vcxproj.filters b/protocols/EmLanProto/emlanproto.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/EmLanProto/emlanproto.vcxproj.filters
+++ b/protocols/EmLanProto/emlanproto.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Facebook/proto_facebook/Proto_Facebook.vcxproj.filters b/protocols/Facebook/proto_facebook/Proto_Facebook.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/Facebook/proto_facebook/Proto_Facebook.vcxproj.filters
+++ b/protocols/Facebook/proto_facebook/Proto_Facebook.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters
+++ b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/GmailNotifier/GmailNotifier.vcxproj.filters b/protocols/GmailNotifier/GmailNotifier.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/GmailNotifier/GmailNotifier.vcxproj.filters
+++ b/protocols/GmailNotifier/GmailNotifier.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters b/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters
+++ b/protocols/ICQ-WIM/ICQ-WIM.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters
+++ b/protocols/ICQ-WIM/proto_icq/Proto_ICQ.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters
+++ b/protocols/ICQ-WIM/proto_mra/Proto_MRA.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/ICQCorp/ICQCorp.vcxproj.filters b/protocols/ICQCorp/ICQCorp.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/ICQCorp/ICQCorp.vcxproj.filters
+++ b/protocols/ICQCorp/ICQCorp.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/IRCG/IRC.vcxproj.filters b/protocols/IRCG/IRC.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/IRCG/IRC.vcxproj.filters
+++ b/protocols/IRCG/IRC.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters b/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters
+++ b/protocols/IRCG/proto_irc/Proto_IRC.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/JabberG/jabber.vcxproj.filters b/protocols/JabberG/jabber.vcxproj.filters
index de5ad9f66c..902edc4d65 100755
--- a/protocols/JabberG/jabber.vcxproj.filters
+++ b/protocols/JabberG/jabber.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/JabberG/jabber_xstatus/xStatus_Jabber.vcxproj.filters b/protocols/JabberG/jabber_xstatus/xStatus_Jabber.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/JabberG/jabber_xstatus/xStatus_Jabber.vcxproj.filters
+++ b/protocols/JabberG/jabber_xstatus/xStatus_Jabber.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
+++ b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/LotusNotify/LotusNotify.vcxproj.filters b/protocols/LotusNotify/LotusNotify.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/LotusNotify/LotusNotify.vcxproj.filters
+++ b/protocols/LotusNotify/LotusNotify.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/MSN/msn.vcxproj.filters b/protocols/MSN/msn.vcxproj.filters
index a8ab01c0e5..7ef90967de 100644
--- a/protocols/MSN/msn.vcxproj.filters
+++ b/protocols/MSN/msn.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>

diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters
+++ b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj.filters b/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj.filters
+++ b/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/MinecraftDynmap/proto_minecraftdynmap/minecraftdynmap_icons.vcxproj.filters b/protocols/MinecraftDynmap/proto_minecraftdynmap/minecraftdynmap_icons.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/MinecraftDynmap/proto_minecraftdynmap/minecraftdynmap_icons.vcxproj.filters
+++ b/protocols/MinecraftDynmap/proto_minecraftdynmap/minecraftdynmap_icons.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/NewsAggregator/NewsAggregator.vcxproj.filters b/protocols/NewsAggregator/NewsAggregator.vcxproj.filters
index 5ef6c526f1..117d73c869 100644
--- a/protocols/NewsAggregator/NewsAggregator.vcxproj.filters
+++ b/protocols/NewsAggregator/NewsAggregator.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/NewsAggregator/proto_newsaggregator/Proto_NewsAggregator.vcxproj.filters b/protocols/NewsAggregator/proto_newsaggregator/Proto_NewsAggregator.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/NewsAggregator/proto_newsaggregator/Proto_NewsAggregator.vcxproj.filters
+++ b/protocols/NewsAggregator/proto_newsaggregator/Proto_NewsAggregator.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Non-IM Contact/nimcontact.vcxproj.filters b/protocols/Non-IM Contact/nimcontact.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/Non-IM Contact/nimcontact.vcxproj.filters
+++ b/protocols/Non-IM Contact/nimcontact.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Omegle/omegle.vcxproj.filters b/protocols/Omegle/omegle.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/Omegle/omegle.vcxproj.filters
+++ b/protocols/Omegle/omegle.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Omegle/proto_omegle/omegle_icons.vcxproj.filters b/protocols/Omegle/proto_omegle/omegle_icons.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Omegle/proto_omegle/omegle_icons.vcxproj.filters
+++ b/protocols/Omegle/proto_omegle/omegle_icons.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Sametime/proto_sametime/Proto_Sametime.vcxproj.filters b/protocols/Sametime/proto_sametime/Proto_Sametime.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Sametime/proto_sametime/Proto_Sametime.vcxproj.filters
+++ b/protocols/Sametime/proto_sametime/Proto_Sametime.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Sametime/sametime.vcxproj.filters b/protocols/Sametime/sametime.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/Sametime/sametime.vcxproj.filters
+++ b/protocols/Sametime/sametime.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/SkypeWeb/SkypeWeb.vcxproj.filters b/protocols/SkypeWeb/SkypeWeb.vcxproj.filters
index a8ab01c0e5..7ef90967de 100644
--- a/protocols/SkypeWeb/SkypeWeb.vcxproj.filters
+++ b/protocols/SkypeWeb/SkypeWeb.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>

diff --git a/protocols/SkypeWeb/proto_conn_skype/Proto_conn_Skype.vcxproj.filters b/protocols/SkypeWeb/proto_conn_skype/Proto_conn_Skype.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/SkypeWeb/proto_conn_skype/Proto_conn_Skype.vcxproj.filters
+++ b/protocols/SkypeWeb/proto_conn_skype/Proto_conn_Skype.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/SkypeWeb/proto_skype/Proto_Skype.vcxproj.filters b/protocols/SkypeWeb/proto_skype/Proto_Skype.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/SkypeWeb/proto_skype/Proto_Skype.vcxproj.filters
+++ b/protocols/SkypeWeb/proto_skype/Proto_Skype.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Steam/Steam.vcxproj.filters b/protocols/Steam/Steam.vcxproj.filters
index 2ff49ad919..0b953d8bca 100644
--- a/protocols/Steam/Steam.vcxproj.filters
+++ b/protocols/Steam/Steam.vcxproj.filters
@@ -11,4 +11,18 @@
     </ClInclude>

   </ItemGroup>

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>

diff --git a/protocols/Steam/proto_steam/Proto_Steam.vcxproj.filters b/protocols/Steam/proto_steam/Proto_Steam.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Steam/proto_steam/Proto_Steam.vcxproj.filters
+++ b/protocols/Steam/proto_steam/Proto_Steam.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Telegram/Telegram.vcxproj.filters b/protocols/Telegram/Telegram.vcxproj.filters
index d4ccc84248..83cffdb711 100644
--- a/protocols/Telegram/Telegram.vcxproj.filters
+++ b/protocols/Telegram/Telegram.vcxproj.filters
@@ -2,40 +2,17 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
   <ItemGroup>
-    <ClCompile Include="src\stdafx.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\*.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\*.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ResourceCompile Include="res\*.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\*.ico">
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Image Include="telegram.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Tox/Tox.vcxproj.filters b/protocols/Tox/Tox.vcxproj.filters
index d1147f9ca1..bdb573361c 100644
--- a/protocols/Tox/Tox.vcxproj.filters
+++ b/protocols/Tox/Tox.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" /> 

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>

diff --git a/protocols/Tox/libtox/libtox.vcxproj.filters b/protocols/Tox/libtox/libtox.vcxproj.filters
index 5de63a3ef5..83f701f1e3 100644
--- a/protocols/Tox/libtox/libtox.vcxproj.filters
+++ b/protocols/Tox/libtox/libtox.vcxproj.filters
@@ -31,4 +31,18 @@
     </ClInclude>
   </ItemGroup>
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/protocols/Tox/proto_tox/Proto_Tox.vcxproj.filters b/protocols/Tox/proto_tox/Proto_Tox.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Tox/proto_tox/Proto_Tox.vcxproj.filters
+++ b/protocols/Tox/proto_tox/Proto_Tox.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
+++ b/protocols/Twitter/proto_twitter/Proto_Twitter.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Twitter/twitter.vcxproj.filters b/protocols/Twitter/twitter.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/Twitter/twitter.vcxproj.filters
+++ b/protocols/Twitter/twitter.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/VKontakte/proto_vkontakte/Proto_VKontakte.vcxproj.filters b/protocols/VKontakte/proto_vkontakte/Proto_VKontakte.vcxproj.filters
index e39f86d5d6..1ed30e13d0 100644
--- a/protocols/VKontakte/proto_vkontakte/Proto_VKontakte.vcxproj.filters
+++ b/protocols/VKontakte/proto_vkontakte/Proto_VKontakte.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/VKontakte/vk.vcxproj.filters b/protocols/VKontakte/vk.vcxproj.filters
index de5ad9f66c..902edc4d65 100644
--- a/protocols/VKontakte/vk.vcxproj.filters
+++ b/protocols/VKontakte/vk.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>

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

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+  <ItemGroup>

+    <ClInclude Include="src\*.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClCompile Include="src\*.cpp;src\*.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ResourceCompile Include="res\*.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+      <Filter>Resource Files</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/protocols/Weather/proto_weather/proto_weather.vcxproj.filters b/protocols/Weather/proto_weather/proto_weather.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/Weather/proto_weather/proto_weather.vcxproj.filters
+++ b/protocols/Weather/proto_weather/proto_weather.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/Weather/weather.vcxproj.filters b/protocols/Weather/weather.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/Weather/weather.vcxproj.filters
+++ b/protocols/Weather/weather.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/WebView/webview.vcxproj.filters b/protocols/WebView/webview.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/WebView/webview.vcxproj.filters
+++ b/protocols/WebView/webview.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj.filters b/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj.filters
index e9b9de29a9..83cffdb711 100644
--- a/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj.filters
+++ b/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj.filters
@@ -2,56 +2,17 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
   <ItemGroup>
-    <ClCompile Include="src\stdafx.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\*.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
     <ClInclude Include="src\*.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\*.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <ResourceCompile Include="res\whatsapp.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ResourceCompile Include="res\*.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="res\whatsapp.ico">
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
       <Filter>Resource Files</Filter>
-    </Image>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/WhatsAppWeb/proto_whatsapp/Proto_WhatsApp.vcxproj.filters b/protocols/WhatsAppWeb/proto_whatsapp/Proto_WhatsApp.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/WhatsAppWeb/proto_whatsapp/Proto_WhatsApp.vcxproj.filters
+++ b/protocols/WhatsAppWeb/proto_whatsapp/Proto_WhatsApp.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/YAMN/YAMN.vcxproj.filters b/protocols/YAMN/YAMN.vcxproj.filters
index fcae13a9d8..83cffdb711 100644
--- a/protocols/YAMN/YAMN.vcxproj.filters
+++ b/protocols/YAMN/YAMN.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/protocols/YAMN/proto_yamn/proto_YAMN.vcxproj.filters b/protocols/YAMN/proto_yamn/proto_YAMN.vcxproj.filters
index 28f81e7f1b..5a286dab98 100644
--- a/protocols/YAMN/proto_yamn/proto_YAMN.vcxproj.filters
+++ b/protocols/YAMN/proto_yamn/proto_YAMN.vcxproj.filters
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+  <ItemGroup>
+    <ClInclude Include="src\*.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClCompile Include="src\*.cpp;src\*.cxx">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ResourceCompile Include="res\*.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <None Include="res\*.ico;res\*.bmp;res\*.cur">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file