35 files changed, 11 insertions, 607 deletions
diff --git a/plugins/Avs/avs_10.vcxproj b/plugins/Avs/avs_10.vcxproj
index 3d42ee73d8..982939101b 100644
--- a/plugins/Avs/avs_10.vcxproj
+++ b/plugins/Avs/avs_10.vcxproj
@@ -285,12 +285,6 @@
     <ClInclude Include="acc.h" />
     <ClInclude Include="commonheaders.h" />
     <ClInclude Include="image_utils.h" />
-    <ClInclude Include="m_avatarhistory.h" />
-    <ClInclude Include="m_flash.h" />
-    <ClInclude Include="m_folders.h" />
-    <ClInclude Include="m_metacontacts.h" />
-    <ClInclude Include="m_png.h" />
-    <ClInclude Include="m_updater.h" />
     <ClInclude Include="mir_thread.h" />
     <ClInclude Include="poll.h" />
     <ClInclude Include="version.h" />
diff --git a/plugins/Avs/avs_10.vcxproj.filters b/plugins/Avs/avs_10.vcxproj.filters
index 8bac5b1c84..6f6d39f743 100644
--- a/plugins/Avs/avs_10.vcxproj.filters
+++ b/plugins/Avs/avs_10.vcxproj.filters
@@ -44,24 +44,6 @@
     <ClInclude Include="image_utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_avatarhistory.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_flash.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_folders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_metacontacts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_png.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_updater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="mir_thread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/Chat/chat_10.vcxproj b/plugins/Chat/chat_10.vcxproj
index 135cc7185f..9b25745e4a 100644
--- a/plugins/Chat/chat_10.vcxproj
+++ b/plugins/Chat/chat_10.vcxproj
@@ -312,7 +312,6 @@
   <ItemGroup>
     <ClInclude Include="chat.h" />
     <ClInclude Include="richutil.h" />
-    <ClInclude Include="m_smileyadd.h" />
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/Chat/chat_10.vcxproj.filters b/plugins/Chat/chat_10.vcxproj.filters
index 9c1b5c17f5..1aa71d1892 100644
--- a/plugins/Chat/chat_10.vcxproj.filters
+++ b/plugins/Chat/chat_10.vcxproj.filters
@@ -9,9 +9,6 @@
       <UniqueIdentifier>{b87dc5b7-8e8e-49a1-8291-b27797a443b7}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
-    <Filter Include="Header Files\Other">
-      <UniqueIdentifier>{6428b706-fb32-4704-bb58-7accb6169106}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{ac500f7b-22cc-423c-a5e9-35da455c5e6a}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
@@ -63,11 +60,8 @@
     <ClInclude Include="richutil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_smileyadd.h">
-      <Filter>Header Files\Other</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
-      <Filter>Header Files\Other</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/Clist_nicer/clist_nicer_10.vcxproj b/plugins/Clist_nicer/clist_nicer_10.vcxproj
index ad11d0d1c0..169329ac4d 100644
--- a/plugins/Clist_nicer/clist_nicer_10.vcxproj
+++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj
@@ -266,10 +266,6 @@
     <ClInclude Include="INCLUDE\commonheaders.h" />
     <ClInclude Include="include\config.h" />
     <ClInclude Include="INCLUDE\extBackg.h" />
-    <ClInclude Include="INCLUDE\m_cln_skinedit.h" />
-    <ClInclude Include="INCLUDE\m_metacontacts.h" />
-    <ClInclude Include="INCLUDE\m_updater.h" />
-    <ClInclude Include="INCLUDE\m_variables.h" />
     <ClInclude Include="INCLUDE\resource.h" />
     <ClInclude Include="INCLUDE\rowheight_funcs.h" />
   </ItemGroup>
diff --git a/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters
index f66d16c325..244a4b89bf 100644
--- a/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters
+++ b/plugins/Clist_nicer/clist_nicer_10.vcxproj.filters
@@ -164,18 +164,6 @@
     <ClInclude Include="INCLUDE\extBackg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="INCLUDE\m_cln_skinedit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="INCLUDE\m_metacontacts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="INCLUDE\m_updater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="INCLUDE\m_variables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="INCLUDE\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/Extraicons/extraicons.vcxproj b/plugins/Extraicons/extraicons.vcxproj
index d550179533..034d85ae6f 100644
--- a/plugins/Extraicons/extraicons.vcxproj
+++ b/plugins/Extraicons/extraicons.vcxproj
@@ -259,7 +259,6 @@
     <ClInclude Include="ExtraIcon.h" />
     <ClInclude Include="ExtraIconGroup.h" />
     <ClInclude Include="IcolibExtraIcon.h" />
-    <ClInclude Include="m_extraicons.h" />
     <ClInclude Include="..\utils\mir_icons.h" />
     <ClInclude Include="options.h" />
     <ClInclude Include="resource.h" />
diff --git a/plugins/Extraicons/extraicons.vcxproj.filters b/plugins/Extraicons/extraicons.vcxproj.filters
index 08d30c2673..9ea3a1ae86 100644
--- a/plugins/Extraicons/extraicons.vcxproj.filters
+++ b/plugins/Extraicons/extraicons.vcxproj.filters
@@ -39,9 +39,6 @@
     <ClInclude Include="IcolibExtraIcon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_extraicons.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\utils\mir_icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/IEView/ieview.vcxproj b/plugins/IEView/ieview.vcxproj
index 5806d8a601..cdbd6c0348 100644
--- a/plugins/IEView/ieview.vcxproj
+++ b/plugins/IEView/ieview.vcxproj
@@ -166,11 +166,6 @@
     <ClInclude Include="IEView.h" />
     <ClInclude Include="ieview_common.h" />
     <ClInclude Include="ieview_services.h" />
-    <ClInclude Include="m_avatars.h" />
-    <ClInclude Include="m_ieview.h" />
-    <ClInclude Include="m_MathModule.h" />
-    <ClInclude Include="m_metacontacts.h" />
-    <ClInclude Include="m_smileyadd.h" />
     <ClInclude Include="MUCCHTMLBuilder.h" />
     <ClInclude Include="Options.h" />
     <ClInclude Include="resource.h" />
diff --git a/plugins/IEView/ieview.vcxproj.filters b/plugins/IEView/ieview.vcxproj.filters
index 022cb3c0f2..078c0ca5d9 100644
--- a/plugins/IEView/ieview.vcxproj.filters
+++ b/plugins/IEView/ieview.vcxproj.filters
@@ -90,11 +90,6 @@
     <ClInclude Include="Utils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_avatars.h" />
-    <ClInclude Include="m_ieview.h" />
-    <ClInclude Include="m_MathModule.h" />
-    <ClInclude Include="m_metacontacts.h" />
-    <ClInclude Include="m_smileyadd.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ieview.rc">
diff --git a/plugins/Modernb/clist_modern_10.vcxproj b/plugins/Modernb/clist_modern_10.vcxproj
index 54886dcda8..ea3113f020 100644
--- a/plugins/Modernb/clist_modern_10.vcxproj
+++ b/plugins/Modernb/clist_modern_10.vcxproj
@@ -349,57 +349,6 @@
   <ItemGroup>
     <ClInclude Include="version.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="..\..\include\m_addcontact.h" />
-    <ClInclude Include="..\..\include\m_avatars.h" />
-    <ClInclude Include="..\..\include\m_awaymsg.h" />
-    <ClInclude Include="..\..\include\m_button.h" />
-    <ClInclude Include="..\..\include\m_chat.h" />
-    <ClInclude Include="..\..\include\m_clc.h" />
-    <ClInclude Include="..\..\include\m_clist.h" />
-    <ClInclude Include="..\..\include\m_clistint.h" />
-    <ClInclude Include="..\..\include\m_clui.h" />
-    <ClInclude Include="..\..\include\m_cluiframes.h" />
-    <ClInclude Include="..\..\include\m_contactdir.h" />
-    <ClInclude Include="..\..\include\m_contacts.h" />
-    <ClInclude Include="..\..\include\m_database.h" />
-    <ClInclude Include="..\..\include\m_email.h" />
-    <ClInclude Include="..\..\include\m_file.h" />
-    <ClInclude Include="..\..\include\m_findadd.h" />
-    <ClInclude Include="..\..\include\m_fontservice.h" />
-    <ClInclude Include="..\..\include\m_fuse.h" />
-    <ClInclude Include="..\..\include\m_genmenu.h" />
-    <ClInclude Include="..\..\include\m_history.h" />
-    <ClInclude Include="..\..\include\m_icolib.h" />
-    <ClInclude Include="..\..\include\m_icq.h" />
-    <ClInclude Include="..\..\include\m_idle.h" />
-    <ClInclude Include="..\..\include\m_ignore.h" />
-    <ClInclude Include="..\..\include\m_imgsrvc.h" />
-    <ClInclude Include="..\..\include\m_langpack.h" />
-    <ClInclude Include="..\..\include\m_message.h" />
-    <ClInclude Include="m_api\m_metacontacts.h" />
-    <ClInclude Include="..\..\include\m_netlib.h" />
-    <ClInclude Include="..\..\include\m_options.h" />
-    <ClInclude Include="..\..\include\m_plugins.h" />
-    <ClInclude Include="..\..\include\m_png.h" />
-    <ClInclude Include="..\..\include\m_popup.h" />
-    <ClInclude Include="..\..\include\m_protocols.h" />
-    <ClInclude Include="..\..\include\m_protomod.h" />
-    <ClInclude Include="..\..\include\m_protosvc.h" />
-    <ClInclude Include="..\..\include\m_skin.h" />
-    <ClInclude Include="m_api\m_skin_eng.h" />
-    <ClInclude Include="m_api\m_skinbutton.h" />
-    <ClInclude Include="m_api\m_smileyadd.h" />
-    <ClInclude Include="..\..\include\m_system.h" />
-    <ClInclude Include="..\..\include\m_system_cpp.h" />
-    <ClInclude Include="m_api\m_toolbar.h" />
-    <ClInclude Include="..\..\include\m_url.h" />
-    <ClInclude Include="..\..\include\m_userinfo.h" />
-    <ClInclude Include="..\..\include\m_utils.h" />
-    <ClInclude Include="m_api\m_variables.h" />
-    <ClInclude Include="m_api\m_xpTheme.h" />
-    <ClInclude Include="..\..\include\newpluginapi.h" />
-    <ClInclude Include="..\..\include\statusmodes.h" />
-    <ClInclude Include="..\..\include\win2k.h" />
     <ClInclude Include="hdr\modern_awaymsg.h" />
     <ClInclude Include="hdr\modern_gettextasync.h" />
     <ClInclude Include="hdr\modern_global_structure.h" />
diff --git a/plugins/Modernb/clist_modern_10.vcxproj.filters b/plugins/Modernb/clist_modern_10.vcxproj.filters
index 0682a95fc3..5d1d16e8a8 100644
--- a/plugins/Modernb/clist_modern_10.vcxproj.filters
+++ b/plugins/Modernb/clist_modern_10.vcxproj.filters
@@ -16,9 +16,6 @@
     <Filter Include="Resource Files\res">
       <UniqueIdentifier>{98ef713e-45a0-4ca0-929b-636ed86d9478}</UniqueIdentifier>
     </Filter>
-    <Filter Include="m_api">
-      <UniqueIdentifier>{98961897-77a7-417f-8c9c-2587afd39c1b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="hdr">
       <UniqueIdentifier>{23cad96b-3c17-441a-a67d-d3053a53961b}</UniqueIdentifier>
     </Filter>
@@ -179,159 +176,6 @@
     <ClInclude Include="resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\m_addcontact.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_avatars.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_awaymsg.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_button.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_chat.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_clc.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_clist.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_clistint.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_clui.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_cluiframes.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_contactdir.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_contacts.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_database.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_email.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_file.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_findadd.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_fontservice.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_fuse.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_genmenu.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_history.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_icolib.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_icq.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_idle.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_ignore.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_imgsrvc.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_langpack.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_message.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_metacontacts.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_netlib.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_options.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_plugins.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_png.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_popup.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_protocols.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_protomod.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_protosvc.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_skin.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_skin_eng.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_skinbutton.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_smileyadd.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_system.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_system_cpp.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_toolbar.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_url.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_userinfo.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\m_utils.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_variables.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="m_api\m_xpTheme.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\newpluginapi.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\statusmodes.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\win2k.h">
-      <Filter>m_api</Filter>
-    </ClInclude>
     <ClInclude Include="hdr\modern_awaymsg.h">
       <Filter>hdr</Filter>
     </ClInclude>
diff --git a/plugins/Nudge/nudge_10.vcxproj b/plugins/Nudge/nudge_10.vcxproj
index c9b4c58b27..137d89659e 100644
--- a/plugins/Nudge/nudge_10.vcxproj
+++ b/plugins/Nudge/nudge_10.vcxproj
@@ -313,7 +313,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="headers.h" />
-    <ClInclude Include="m_nudge.h" />
     <ClInclude Include="main.h" />
     <ClInclude Include="nudge.h" />
     <ClInclude Include="options.h" />
diff --git a/plugins/SmileyAdd/SmileyAdd_10.vcxproj b/plugins/SmileyAdd/SmileyAdd_10.vcxproj
index ba1cf16a59..b5fcc957c9 100644
--- a/plugins/SmileyAdd/SmileyAdd_10.vcxproj
+++ b/plugins/SmileyAdd/SmileyAdd_10.vcxproj
@@ -319,11 +319,6 @@
     <ClInclude Include="download.h" />
     <ClInclude Include="general.h" />
     <ClInclude Include="imagecache.h" />
-    <ClInclude Include="m_folders.h" />
-    <ClInclude Include="m_metacontacts.h" />
-    <ClInclude Include="m_smileyadd.h" />
-    <ClInclude Include="m_smileyadd_deprecated.h" />
-    <ClInclude Include="m_updater.h" />
     <ClInclude Include="options.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="services.h" />
diff --git a/plugins/SmileyAdd/SmileyAdd_10.vcxproj.filters b/plugins/SmileyAdd/SmileyAdd_10.vcxproj.filters
index a78673b586..a8e064601d 100644
--- a/plugins/SmileyAdd/SmileyAdd_10.vcxproj.filters
+++ b/plugins/SmileyAdd/SmileyAdd_10.vcxproj.filters
@@ -86,21 +86,6 @@
     <ClInclude Include="imagecache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_folders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_metacontacts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_smileyadd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_smileyadd_deprecated.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="m_updater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
index 7c794946a7..2cb5fc0427 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
+++ b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
@@ -248,7 +248,6 @@
   <ItemGroup>
     <ClInclude Include="advancedautoaway.h" />
     <ClInclude Include="..\commonstatus.h" />
-    <ClInclude Include="..\m_statusplugins.h" />
     <ClInclude Include="..\resource.h" />
     <ClInclude Include="trigger_aaa.h" />
   </ItemGroup>
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters
index beb6fc5f03..6921a3458e 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters
+++ b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj.filters
@@ -47,9 +47,6 @@
     <ClInclude Include="..\commonstatus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\m_statusplugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
index 4b2302f25f..80a3109226 100644
--- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
+++ b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
@@ -245,7 +245,6 @@
   <ItemGroup>
     <ClInclude Include="..\commonstatus.h" />
     <ClInclude Include="keepstatus.h" />
-    <ClInclude Include="..\m_statusplugins.h" />
     <ClInclude Include="..\resource.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters
index 5c1e406d7f..08bf8ea46b 100644
--- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters
+++ b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj.filters
@@ -47,9 +47,6 @@
     <ClInclude Include="keepstatus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\m_statusplugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
index cdde5b2572..3f5d382f23 100644
--- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
+++ b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
@@ -247,7 +247,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\commonstatus.h" />
-    <ClInclude Include="..\m_statusplugins.h" />
     <ClInclude Include="..\resource.h" />
     <ClInclude Include="startupstatus.h" />
   </ItemGroup>
diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters
index 6ce8394dea..ec063a7f08 100644
--- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters
+++ b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj.filters
@@ -44,9 +44,6 @@
     <ClInclude Include="..\commonstatus.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\m_statusplugins.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/Tabsrmm/tabsrmm_10.vcxproj b/plugins/Tabsrmm/tabsrmm_10.vcxproj
index f8d67c6b19..de5eb820a9 100644
--- a/plugins/Tabsrmm/tabsrmm_10.vcxproj
+++ b/plugins/Tabsrmm/tabsrmm_10.vcxproj
@@ -485,21 +485,6 @@
     <ClInclude Include="include\typingnotify.h" />
     <ClInclude Include="include\utils.h" />
     <ClInclude Include="include\version.h" />
-    <ClInclude Include="API\m_buttonbar.h" />
-    <ClInclude Include="API\m_cln_skinedit.h" />
-    <ClInclude Include="API\m_fingerprint.h" />
-    <ClInclude Include="API\m_flash.h" />
-    <ClInclude Include="API\m_folders.h" />
-    <ClInclude Include="API\m_historyevents.h" />
-    <ClInclude Include="API\m_ieview.h" />
-    <ClInclude Include="API\m_mathmodule.h" />
-    <ClInclude Include="API\m_metacontacts.h" />
-    <ClInclude Include="API\m_msg_buttonsbar.h" />
-    <ClInclude Include="API\m_nudge.h" />
-    <ClInclude Include="API\m_popup2.h" />
-    <ClInclude Include="API\m_smileyadd.h" />
-    <ClInclude Include="API\m_spellchecker.h" />
-    <ClInclude Include="API\m_updater.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="chat\chat.rc" />
diff --git a/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters b/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters
index 043d9079b5..fb6d6a249d 100644
--- a/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters
+++ b/plugins/Tabsrmm/tabsrmm_10.vcxproj.filters
@@ -12,9 +12,6 @@
       <UniqueIdentifier>{383e316e-aa7a-4097-af16-2acd438c8fa6}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl</Extensions>
     </Filter>
-    <Filter Include="Header Files\API">
-      <UniqueIdentifier>{8bd332ed-f9ed-4688-b7b2-46f656a02e77}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{c6aa9273-8563-4007-afa1-63e8d2164122}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
@@ -245,51 +242,6 @@
     <ClInclude Include="include\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="API\m_buttonbar.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_cln_skinedit.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_fingerprint.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_flash.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_folders.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_historyevents.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_ieview.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_mathmodule.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_metacontacts.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_msg_buttonsbar.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_nudge.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_popup2.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_smileyadd.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_spellchecker.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
-    <ClInclude Include="API\m_updater.h">
-      <Filter>Header Files\API</Filter>
-    </ClInclude>
     <ClInclude Include="include\sendlater.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/TipperYM/tipper_ym_10.vcxproj b/plugins/TipperYM/tipper_ym_10.vcxproj
index 7e4318f0b2..8dc97fd8dc 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj
@@ -270,7 +270,6 @@
   <ItemGroup>
     <ClInclude Include="bitmap_func.h" />
     <ClInclude Include="common.h" />
-    <ClInclude Include="docs\m_tipper.h" />
     <ClInclude Include="message_pump.h" />
     <ClInclude Include="mir_smileys.h" />
     <ClInclude Include="options.h" />
diff --git a/plugins/TipperYM/tipper_ym_10.vcxproj.filters b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
index bc0a733352..508c94cb08 100644
--- a/plugins/TipperYM/tipper_ym_10.vcxproj.filters
+++ b/plugins/TipperYM/tipper_ym_10.vcxproj.filters
@@ -56,9 +56,6 @@
     <ClInclude Include="common.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="docs\m_tipper.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="message_pump.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/Updater/updater_10.vcxproj b/plugins/Updater/updater_10.vcxproj
index 19e72f7651..6cab0b87ba 100644
--- a/plugins/Updater/updater_10.vcxproj
+++ b/plugins/Updater/updater_10.vcxproj
@@ -300,7 +300,6 @@
     <ClInclude Include="conf_dialog.h" />
     <ClInclude Include="extern.h" />
     <ClInclude Include="icons.h" />
-    <ClInclude Include="m_updater.h" />
     <ClInclude Include="options.h" />
     <ClInclude Include="popups.h" />
     <ClInclude Include="progress_dialog.h" />
diff --git a/plugins/Updater/updater_10.vcxproj.filters b/plugins/Updater/updater_10.vcxproj.filters
index 25cc9f7150..73b879b291 100644
--- a/plugins/Updater/updater_10.vcxproj.filters
+++ b/plugins/Updater/updater_10.vcxproj.filters
@@ -122,9 +122,6 @@
     <ClInclude Include="icons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_updater.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index 028b908e84..ba7cfc8b0a 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -387,7 +387,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="contact.h" />
-    <ClInclude Include="m_variables.h" />
     <ClInclude Include="variables.h" />
     <ClInclude Include="enumprocs.h" />
     <ClInclude Include="parse_alias.h" />
diff --git a/plugins/Variables/Variables_10.vcxproj.filters b/plugins/Variables/Variables_10.vcxproj.filters
index 16981eeecb..ecd6ebe9ce 100644
--- a/plugins/Variables/Variables_10.vcxproj.filters
+++ b/plugins/Variables/Variables_10.vcxproj.filters
@@ -105,9 +105,6 @@
     <ClInclude Include="contact.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="m_variables.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="variables.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/protocols/MRA/Mra.vcxproj b/protocols/MRA/Mra.vcxproj
index dd636271b4..cee08ebc76 100644
--- a/protocols/MRA/Mra.vcxproj
+++ b/protocols/MRA/Mra.vcxproj
@@ -375,55 +375,6 @@
     <ClInclude Include="MraSendQueue.h" />
     <ClInclude Include="proto.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_avatars.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_clist.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_clui.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_cluiframes.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_contactdir.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_contacts.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_database.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_email.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_extraicons.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_findadd.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_folders.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_fuse.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_icolib.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_ignore.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_langpack.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_music.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_netlib.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_nudge.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_options.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_plugins.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_popup.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_proto_listeningto.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_protocols.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_protomod.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_protosvc.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_system.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_updater.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_url.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_userinfo.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\m_utils.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\newpluginapi.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\statusmodes.h" />
-    <ClInclude Include="..\!Clases\include\Miranda\win2k.h" />
-    <ClInclude Include="..\!Clases\include\Base64.h" />
-    <ClInclude Include="..\!Clases\include\BuffToLowerCase.h" />
-    <ClInclude Include="..\!Clases\include\DebugFunctions.h" />
-    <ClInclude Include="..\!Clases\include\FIFOMT.h" />
-    <ClInclude Include="..\!Clases\include\InternetTime.h" />
-    <ClInclude Include="..\!Clases\include\ListMT.h" />
-    <ClInclude Include="..\!Clases\include\MemoryCompare.h" />
-    <ClInclude Include="..\!Clases\include\MemoryFind.h" />
-    <ClInclude Include="..\!Clases\include\MemoryFindByte.h" />
-    <ClInclude Include="..\!Clases\include\RC4.h" />
-    <ClInclude Include="..\!Clases\include\SHA1.h" />
-    <ClInclude Include="..\!Clases\include\SocketFunctions.h" />
-    <ClInclude Include="..\!Clases\include\StrHexToNum.h" />
-    <ClInclude Include="..\!Clases\include\StrToNum.h" />
-    <ClInclude Include="..\!Clases\include\zconf.h" />
-    <ClInclude Include="..\!Clases\include\zlib.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc" />
diff --git a/protocols/MRA/Mra.vcxproj.filters b/protocols/MRA/Mra.vcxproj.filters
index 55e8105457..b6da314d68 100644
--- a/protocols/MRA/Mra.vcxproj.filters
+++ b/protocols/MRA/Mra.vcxproj.filters
@@ -9,12 +9,6 @@
       <UniqueIdentifier>{fb50d277-d7b3-44a3-9330-fa8332ee1975}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
     </Filter>
-    <Filter Include="Header Files\Miranda">
-      <UniqueIdentifier>{725fa008-c36d-4165-8899-02f9387ed0f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\Functions">
-      <UniqueIdentifier>{b86b234f-e9db-45b3-97ed-47c15ca4bb75}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{482639cd-fb25-4cfb-9e55-4a299271787c}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
@@ -244,153 +238,6 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_avatars.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_clist.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_clui.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_cluiframes.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_contactdir.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_contacts.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_database.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_email.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_extraicons.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_findadd.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_folders.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_fuse.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_icolib.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_ignore.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_langpack.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_music.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_netlib.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_nudge.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_options.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_plugins.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_popup.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_proto_listeningto.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_protocols.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_protomod.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_protosvc.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_system.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_updater.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_url.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_userinfo.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\m_utils.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\newpluginapi.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\statusmodes.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Miranda\win2k.h">
-      <Filter>Header Files\Miranda</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\Base64.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\BuffToLowerCase.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\DebugFunctions.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\FIFOMT.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\InternetTime.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\ListMT.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\MemoryCompare.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\MemoryFind.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\MemoryFindByte.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\RC4.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\SHA1.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\SocketFunctions.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\StrHexToNum.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\StrToNum.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\zconf.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
-    <ClInclude Include="..\!Clases\include\zlib.h">
-      <Filter>Header Files\Functions</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="resource.rc">
diff --git a/protocols/MSN/msn_10.vcxproj b/protocols/MSN/msn_10.vcxproj
index f4f281c01b..65dd56278b 100644
--- a/protocols/MSN/msn_10.vcxproj
+++ b/protocols/MSN/msn_10.vcxproj
@@ -328,11 +328,6 @@
     <ClInclude Include="msn_global.h" />
     <ClInclude Include="msn_proto.h" />
     <ClInclude Include="version.h" />
-    <ClInclude Include="SDK\m_assocmgr.h" />
-    <ClInclude Include="SDK\m_folders.h" />
-    <ClInclude Include="SDK\m_metacontacts.h" />
-    <ClInclude Include="SDK\m_proto_listeningto.h" />
-    <ClInclude Include="SDK\m_smileyadd.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/protocols/MSN/msn_10.vcxproj.filters b/protocols/MSN/msn_10.vcxproj.filters
index 9cb54be799..93ddcaa45c 100644
--- a/protocols/MSN/msn_10.vcxproj.filters
+++ b/protocols/MSN/msn_10.vcxproj.filters
@@ -12,9 +12,6 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{a696658a-8e44-4b58-b62e-1afe9b41c748}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\SDK">
-      <UniqueIdentifier>{8f8ce750-232a-4941-9ee8-d1c78fb7cc6b}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="des.c">
@@ -188,20 +185,5 @@
     <ClInclude Include="version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SDK\m_assocmgr.h">
-      <Filter>Header Files\SDK</Filter>
-    </ClInclude>
-    <ClInclude Include="SDK\m_folders.h">
-      <Filter>Header Files\SDK</Filter>
-    </ClInclude>
-    <ClInclude Include="SDK\m_metacontacts.h">
-      <Filter>Header Files\SDK</Filter>
-    </ClInclude>
-    <ClInclude Include="SDK\m_proto_listeningto.h">
-      <Filter>Header Files\SDK</Filter>
-    </ClInclude>
-    <ClInclude Include="SDK\m_smileyadd.h">
-      <Filter>Header Files\SDK</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/protocols/Weather/weather_10.vcxproj b/protocols/Weather/weather_10.vcxproj
index 988018944f..f3e4b5becc 100644
--- a/protocols/Weather/weather_10.vcxproj
+++ b/protocols/Weather/weather_10.vcxproj
@@ -97,6 +97,7 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeaderFile>weather.h</PrecompiledHeaderFile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -132,6 +133,7 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <PrecompiledHeaderFile>weather.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -161,6 +163,7 @@
       <PrecompiledHeaderFile>weather.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <ResourceCompile>
       <ResourceOutputFileName>$(IntDir)weather.res</ResourceOutputFileName>
@@ -187,6 +190,7 @@
       <PrecompiledHeaderFile>weather.h</PrecompiledHeaderFile>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
     <ResourceCompile>
       <ResourceOutputFileName>$(IntDir)weather.res</ResourceOutputFileName>
@@ -202,7 +206,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="weather.cpp" />
+    <ClCompile Include="weather.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="weather_addstn.cpp" />
     <ClCompile Include="weather_contacts.cpp" />
     <ClCompile Include="weather_conv.cpp" />
@@ -219,7 +228,6 @@
     <ClCompile Include="weather_userinfo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="m_weather.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="version.h" />
     <ClInclude Include="weather.h" />
diff --git a/protocols/Weather/weather_10.vcxproj.filters b/protocols/Weather/weather_10.vcxproj.filters
index 3fe49090b5..6cef70fb53 100644
--- a/protocols/Weather/weather_10.vcxproj.filters
+++ b/protocols/Weather/weather_10.vcxproj.filters
@@ -65,9 +65,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="m_weather.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>