67 files changed, 72 insertions, 70 deletions
diff --git a/include/m_clist.h b/include/m_clist.h
index 463ce493c2..f919bc5c06 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -54,6 +54,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 EXTERN_C MIR_APP_DLL(void) Clist_SetStatusMode(int iStatus);
 
 /////////////////////////////////////////////////////////////////////////////////////////
+// returns the text associated with the given status
+
+#define GSMDF_UNTRANSLATED 4 // don't tranlate the result
+EXTERN_C MIR_APP_DLL(wchar_t*) Clist_GetStatusModeDescription(int iStatus, int iFlags /*GSMDF_*/);
+
+/////////////////////////////////////////////////////////////////////////////////////////
 // detects whether a protocol is visible or not
 
 EXTERN_C MIR_APP_DLL(bool) Clist_GetProtocolVisibility(const char *szModuleName);
@@ -564,8 +570,4 @@ EXTERN_C MIR_APP_DLL(int) Clist_TrayNotifyW(const char *szProto, const wchar_t *
 
 #define SETTING_BRINGTOFRONT_DEFAULT 0
 
-#ifndef M_CLISTINT_H__
-#include <m_clistint.h>
-#endif
-
 #endif // M_CLIST_H__
diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h
index 9a34f137f5..0580c68b05 100644
--- a/plugins/AddContactPlus/src/stdafx.h
+++ b/plugins/AddContactPlus/src/stdafx.h
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_utils.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_genmenu.h>
 #include <m_hotkeys.h>
 #include <m_icolib.h>
diff --git a/plugins/Alarms/src/stdafx.h b/plugins/Alarms/src/stdafx.h
index fcbd50182a..c9596683f6 100755
--- a/plugins/Alarms/src/stdafx.h
+++ b/plugins/Alarms/src/stdafx.h
@@ -14,7 +14,7 @@
 #include <m_protosvc.h>
 #include <m_langpack.h>
 #include <m_popup.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_idle.h>
 #include <m_cluiframes.h>
 #include <m_fontservice.h>
diff --git a/plugins/AutoShutdown/src/stdafx.h b/plugins/AutoShutdown/src/stdafx.h
index 716ee02ec9..2dc839644f 100644
--- a/plugins/AutoShutdown/src/stdafx.h
+++ b/plugins/AutoShutdown/src/stdafx.h
@@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_file.h>
 #include <m_idle.h>
 #include <win2k.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_fontservice.h>
 #include <m_icolib.h>
diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h
index ce3ab52149..bb2a25e9d5 100644
--- a/plugins/BASS_interface/src/stdafx.h
+++ b/plugins/BASS_interface/src/stdafx.h
@@ -14,7 +14,7 @@ Copyright (C) 2010, 2011 tico-tico
 #include <m_database.h>
 #include <m_options.h>
 #include <win2k.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_fontservice.h>
 #include <m_button_int.h>
diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h
index 2d374aacb4..416bddaf6f 100644
--- a/plugins/BossKeyPlus/src/stdafx.h
+++ b/plugins/BossKeyPlus/src/stdafx.h
@@ -36,7 +36,7 @@
 #include <m_popup.h>
 #include <m_awaymsg.h>
 #include <m_icolib.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_message.h>
 #include <m_hotkeys.h>
 #include <win2k.h>
diff --git a/plugins/BuddyExpectator/src/stdafx.h b/plugins/BuddyExpectator/src/stdafx.h
index 493aa9a4d1..45df0fc175 100644
--- a/plugins/BuddyExpectator/src/stdafx.h
+++ b/plugins/BuddyExpectator/src/stdafx.h
@@ -29,7 +29,7 @@
 
 #include <newpluginapi.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h
index f0ae5f985d..c91c4b8129 100644
--- a/plugins/CSList/src/stdafx.h
+++ b/plugins/CSList/src/stdafx.h
@@ -39,7 +39,7 @@ Offers List of your Custom Statuses.
 #include <m_database.h>
 #include <m_system.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_icolib.h>
 #include <m_protosvc.h>
 #include <m_xstatus.h>
diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h
index 1861004637..25f334a2e5 100644
--- a/plugins/Clist_blind/src/stdafx.h
+++ b/plugins/Clist_blind/src/stdafx.h
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <Uxtheme.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index b9f801493e..3dc937b5b2 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <newpluginapi.h>
 #include <win2k.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_system.h>
 #include <m_langpack.h>
diff --git a/plugins/ConnectionNotify/src/stdafx.h b/plugins/ConnectionNotify/src/stdafx.h
index 201a5a233f..32187cefcd 100644
--- a/plugins/ConnectionNotify/src/stdafx.h
+++ b/plugins/ConnectionNotify/src/stdafx.h
@@ -8,7 +8,7 @@
 
 #include <newpluginapi.h>
 #include <m_core.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/FavContacts/src/stdafx.h b/plugins/FavContacts/src/stdafx.h
index b66f0242b4..b95b6f23bc 100644
--- a/plugins/FavContacts/src/stdafx.h
+++ b/plugins/FavContacts/src/stdafx.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_database.h>
 #include <m_db_int.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_clc.h>
 #include <m_protosvc.h>
 #include <m_skin.h>
diff --git a/plugins/FileAsMessage/src/stdafx.h b/plugins/FileAsMessage/src/stdafx.h
index 4d16007237..7b6f2133d7 100644
--- a/plugins/FileAsMessage/src/stdafx.h
+++ b/plugins/FileAsMessage/src/stdafx.h
@@ -11,7 +11,7 @@
 #include <m_database.h>
 #include <m_protosvc.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_options.h>
 #include <m_skin.h>
 #include <m_popup.h>
diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h
index 1d6069ec3e..bf636150ef 100644
--- a/plugins/FloatingContacts/src/stdafx.h
+++ b/plugins/FloatingContacts/src/stdafx.h
@@ -18,7 +18,7 @@
 #include <m_database.h>
 #include <m_message.h>
 #include <m_options.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_hotkeys.h>
 #include <m_imgsrvc.h>
 #include <win2k.h>
diff --git a/plugins/GmailNotifier/src/stdafx.h b/plugins/GmailNotifier/src/stdafx.h
index 40a8bedf68..78d5c08275 100644
--- a/plugins/GmailNotifier/src/stdafx.h
+++ b/plugins/GmailNotifier/src/stdafx.h
@@ -6,7 +6,7 @@
 #include "resource.h"
 
 #include "newpluginapi.h"
-#include "m_clist.h"
+#include "m_clistint.h"
 #include "m_skin.h"
 #include "m_langpack.h"
 #include "m_database.h"
diff --git a/plugins/HTTPServer/src/Glob.h b/plugins/HTTPServer/src/Glob.h
index 7d21925204..fac6c3f3eb 100644
--- a/plugins/HTTPServer/src/Glob.h
+++ b/plugins/HTTPServer/src/Glob.h
@@ -30,7 +30,7 @@ using namespace std;
 #include <win2k.h>
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_userinfo.h>
 #include <m_netlib.h>
diff --git a/plugins/HistorySweeperLight/src/stdafx.h b/plugins/HistorySweeperLight/src/stdafx.h
index 1821ebdee5..5e8140c1e8 100644
--- a/plugins/HistorySweeperLight/src/stdafx.h
+++ b/plugins/HistorySweeperLight/src/stdafx.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_options.h>
 #include <m_message.h>
 #include <m_icolib.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 
 #include "resource.h"
diff --git a/plugins/HwHotKeys/src/stdafx.h b/plugins/HwHotKeys/src/stdafx.h
index 3375f01264..83aa799421 100644
--- a/plugins/HwHotKeys/src/stdafx.h
+++ b/plugins/HwHotKeys/src/stdafx.h
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111 - 1307, USA.
 #include <m_langpack.h>
 #include <m_database.h>
 #include <m_options.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 
 #include <Strsafe.h>
 
diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h
index 7f1102d51c..853e897950 100644
--- a/plugins/IEView/src/stdafx.h
+++ b/plugins/IEView/src/stdafx.h
@@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_protosvc.h>
 #include <m_options.h>
diff --git a/plugins/KeyboardNotify/src/stdafx.h b/plugins/KeyboardNotify/src/stdafx.h
index 0485a000b9..7efd635870 100644
--- a/plugins/KeyboardNotify/src/stdafx.h
+++ b/plugins/KeyboardNotify/src/stdafx.h
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_options.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_protosvc.h>
 #include <m_message.h>
diff --git a/plugins/LotusNotify/src/stdafx.h b/plugins/LotusNotify/src/stdafx.h
index 9e66d0cc79..9a95f7a7f8 100644
--- a/plugins/LotusNotify/src/stdafx.h
+++ b/plugins/LotusNotify/src/stdafx.h
@@ -13,7 +13,7 @@
 #include <m_core.h>
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_langpack.h>
 #include <m_options.h>
diff --git a/plugins/MagneticWindows/src/stdafx.h b/plugins/MagneticWindows/src/stdafx.h
index 44a0b9dfee..b93aa30baf 100644
--- a/plugins/MagneticWindows/src/stdafx.h
+++ b/plugins/MagneticWindows/src/stdafx.h
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_message.h>
 #include <m_system.h>
 #include <m_options.h>
diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index daeb667f8a..07bb4cd71a 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -13,7 +13,7 @@
 #include <m_protosvc.h>
 #include <m_langpack.h>
 #include <m_file.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_ignore.h>
 #include <m_icolib.h>
 #include <m_skin.h>
diff --git a/plugins/MirFox/src/common.h b/plugins/MirFox/src/common.h
index ed1020d3ac..5515a59762 100644
--- a/plugins/MirFox/src/common.h
+++ b/plugins/MirFox/src/common.h
@@ -13,7 +13,7 @@
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_options.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_protosvc.h>
 #include <m_popup.h>
 #include <m_message.h>
diff --git a/plugins/MirandaG15/src/StdAfx.h b/plugins/MirandaG15/src/StdAfx.h
index 64723b62b2..f6aabb0c8f 100644
--- a/plugins/MirandaG15/src/StdAfx.h
+++ b/plugins/MirandaG15/src/StdAfx.h
@@ -22,7 +22,7 @@ using namespace std;
 #include <m_protosvc.h>
 #include <m_database.h>
 #include <m_options.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_protocols.h>
 #include <m_skin.h>
 #include <m_chat.h>
diff --git a/plugins/NewEventNotify/src/stdafx.h b/plugins/NewEventNotify/src/stdafx.h
index 46826e5b21..4e18a9402a 100644
--- a/plugins/NewEventNotify/src/stdafx.h
+++ b/plugins/NewEventNotify/src/stdafx.h
@@ -38,7 +38,7 @@
 #include <m_langpack.h>
 #include <m_popup.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_protosvc.h>
 #include <m_message.h>
 #include <m_options.h>
diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h
index 1053b8e602..0e6e7906aa 100644
--- a/plugins/NewXstatusNotify/src/stdafx.h
+++ b/plugins/NewXstatusNotify/src/stdafx.h
@@ -53,7 +53,7 @@
 #include <m_xstatus.h>
 #include <m_extraicons.h>
 #include <m_string.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 
 #include <m_metacontacts.h>
 #include <m_toptoolbar.h>
diff --git a/plugins/Non-IM Contact/src/stdafx.h b/plugins/Non-IM Contact/src/stdafx.h
index c5495b3b09..ef713be562 100644
--- a/plugins/Non-IM Contact/src/stdafx.h
+++ b/plugins/Non-IM Contact/src/stdafx.h
@@ -31,7 +31,7 @@ struct DLGTEMPLATEEX
 };
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index c1355db7db..977a2c9c5e 100644
--- a/plugins/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -11,7 +11,7 @@
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_utils.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_skin.h>
diff --git a/plugins/Nudge/src/stdafx.h b/plugins/Nudge/src/stdafx.h
index 16f0dfe4d3..6133271f4f 100644
--- a/plugins/Nudge/src/stdafx.h
+++ b/plugins/Nudge/src/stdafx.h
@@ -10,7 +10,7 @@
 #include <time.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>			
+#include <m_clistint.h>
 #include <m_langpack.h>	
 #include <m_popup.h>	
 #include <m_message.h>
diff --git a/plugins/Ping/src/stdafx.h b/plugins/Ping/src/stdafx.h
index c90c557b73..a358624c5d 100644
--- a/plugins/Ping/src/stdafx.h
+++ b/plugins/Ping/src/stdafx.h
@@ -20,7 +20,7 @@
 #include <m_netlib.h>
 #include <m_database.h>
 #include <m_protosvc.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_fontservice.h>
 #include <m_icolib.h>
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index 75e7733f12..225f39558c 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -62,7 +62,7 @@ https://miranda-ng.org/distr/
 
 #include <newpluginapi.h>
 #include <win2k.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_options.h>
 #include <m_skin.h>
 #include <m_langpack.h>
diff --git a/plugins/RecentContacts/src/stdafx.h b/plugins/RecentContacts/src/stdafx.h
index 77f646d199..1f5c7a3f8c 100644
--- a/plugins/RecentContacts/src/stdafx.h
+++ b/plugins/RecentContacts/src/stdafx.h
@@ -10,7 +10,7 @@
 #include <time.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_chat_int.h>
 #include <m_langpack.h>
 #include <m_database.h>
diff --git a/plugins/SMS/src/stdafx.h b/plugins/SMS/src/stdafx.h
index a908077d6c..e0df80811f 100644
--- a/plugins/SMS/src/stdafx.h
+++ b/plugins/SMS/src/stdafx.h
@@ -11,7 +11,7 @@
 
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_history.h>
 #include <m_icolib.h>
diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h
index 2076df25a0..01372f3ecf 100644
--- a/plugins/Scriver/src/stdafx.h
+++ b/plugins/Scriver/src/stdafx.h
@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_button.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_protosvc.h>
 #include <m_skin.h>
 #include <m_contacts.h>
diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h
index b6f48775ac..258e4b17b4 100644
--- a/plugins/SeenPlugin/src/stdafx.h
+++ b/plugins/SeenPlugin/src/stdafx.h
@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_skin.h>
 #include <m_userinfo.h>
 #include <m_icolib.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_contacts.h>
 #include <m_message.h>
 #include <m_protosvc.h>
diff --git a/plugins/SimpleAR/src/stdafx.h b/plugins/SimpleAR/src/stdafx.h
index f3780904d4..ca81f59099 100644
--- a/plugins/SimpleAR/src/stdafx.h
+++ b/plugins/SimpleAR/src/stdafx.h
@@ -4,7 +4,7 @@
 #include <time.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_database.h>
 #include <m_options.h>
diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h
index 2dec8739e6..95870c622a 100644
--- a/plugins/SimpleStatusMsg/src/stdafx.h
+++ b/plugins/SimpleStatusMsg/src/stdafx.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <newpluginapi.h>
 #include <m_database.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_options.h>
 #include <m_langpack.h>
diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h
index 4185fd83d7..3753016404 100644
--- a/plugins/StatusManager/src/stdafx.h
+++ b/plugins/StatusManager/src/stdafx.h
@@ -13,7 +13,7 @@
 
 #include <m_core.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_utils.h>
 #include <m_icolib.h>
 #include <m_options.h>
diff --git a/plugins/StopSpamPlus/src/stdafx.h b/plugins/StopSpamPlus/src/stdafx.h
index d86a1345f6..c57bd19005 100644
--- a/plugins/StopSpamPlus/src/stdafx.h
+++ b/plugins/StopSpamPlus/src/stdafx.h
@@ -16,7 +16,7 @@
 #include <m_langpack.h>
 #include <m_icolib.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_gui.h>
 
 #include <m_stopspam.h>
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index e9737756c1..3318f05af7 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -62,7 +62,7 @@
 #include <m_contacts.h>
 #include <m_icolib.h>
 #include <m_clc.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_userinfo.h>
 #include <m_history.h>
 #include <m_file.h>
diff --git a/plugins/TipperYM/src/stdafx.h b/plugins/TipperYM/src/stdafx.h
index 8a2166c363..9812583b3f 100644
--- a/plugins/TipperYM/src/stdafx.h
+++ b/plugins/TipperYM/src/stdafx.h
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.
 #include <newpluginapi.h>
 #include <m_avatars.h>
 #include <m_awaymsg.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_clc.h>
 #include <m_cluiframes.h>
 #include <m_database.h>
diff --git a/plugins/TooltipNotify/src/stdafx.h b/plugins/TooltipNotify/src/stdafx.h
index 50f8f3d042..20c79aa8f1 100644
--- a/plugins/TooltipNotify/src/stdafx.h
+++ b/plugins/TooltipNotify/src/stdafx.h
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_database.h>
 #include <m_ignore.h>
diff --git a/plugins/TopToolBar/src/stdafx.h b/plugins/TopToolBar/src/stdafx.h
index ba188f3836..8eb1a0a881 100644
--- a/plugins/TopToolBar/src/stdafx.h
+++ b/plugins/TopToolBar/src/stdafx.h
@@ -10,7 +10,7 @@
 #include <newpluginapi.h>
 #include <m_database.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_clc.h>
 #include <m_findadd.h>
diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h
index 5a310a6148..3cf7dc70dc 100644
--- a/plugins/UserInfoEx/src/stdafx.h
+++ b/plugins/UserInfoEx/src/stdafx.h
@@ -50,7 +50,7 @@ using namespace std;
 
 #include <newpluginapi.h>
 #include <m_button.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_hotkeys.h>
 #include <m_langpack.h>
diff --git a/plugins/WinterSpeak/src/stdafx.h b/plugins/WinterSpeak/src/stdafx.h
index 262072d95f..5d1a2374e6 100644
--- a/plugins/WinterSpeak/src/stdafx.h
+++ b/plugins/WinterSpeak/src/stdafx.h
@@ -17,7 +17,7 @@
 #include <m_options.h>
 #include <m_protocols.h>
 #include <m_protosvc.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_icolib.h>
 #include <m_netlib.h>
diff --git a/plugins/YAMN/src/stdafx.h b/plugins/YAMN/src/stdafx.h
index 813f4848a9..55af23dff3 100644
--- a/plugins/YAMN/src/stdafx.h
+++ b/plugins/YAMN/src/stdafx.h
@@ -12,7 +12,7 @@
 #include <newpluginapi.h>
 #include <m_skin.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_options.h>
 #include <m_database.h>
 #include <m_protosvc.h>
diff --git a/plugins/YAPP/src/stdafx.h b/plugins/YAPP/src/stdafx.h
index 704cb11db0..037ca3fb02 100644
--- a/plugins/YAPP/src/stdafx.h
+++ b/plugins/YAPP/src/stdafx.h
@@ -18,7 +18,7 @@
 #include <m_langpack.h>
 #include <m_options.h>
 #include <m_skin.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_fontservice.h>
 #include <m_avatars.h>
 #include <m_popup.h>
diff --git a/plugins/ZeroSwitch/src/stdafx.h b/plugins/ZeroSwitch/src/stdafx.h
index bac655b9fc..ac729e6640 100644
--- a/plugins/ZeroSwitch/src/stdafx.h
+++ b/plugins/ZeroSwitch/src/stdafx.h
@@ -10,7 +10,7 @@
 #include <windows.h>
 
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_skin.h>
 #include <m_langpack.h>
 
diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h
index 0ea0d3d493..1ebadd033c 100644
--- a/protocols/Dummy/src/stdafx.h
+++ b/protocols/Dummy/src/stdafx.h
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <m_avatars.h>
 #include <m_chat.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_extraicons.h>
 #include <m_file.h>
diff --git a/protocols/FacebookRM/src/stdafx.h b/protocols/FacebookRM/src/stdafx.h
index 3f7516c3dc..5d6a51b0ac 100644
--- a/protocols/FacebookRM/src/stdafx.h
+++ b/protocols/FacebookRM/src/stdafx.h
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 #include <m_avatars.h>
 #include <m_chat.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_idle.h>
 #include <m_ignore.h>
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 2e74058d02..da4cc74c01 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -53,7 +53,7 @@
 #include <m_skin.h>
 #include <m_utils.h>
 #include <m_ignore.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_options.h>
 #include <m_userinfo.h>
 #include <m_button.h>
diff --git a/protocols/IRCG/src/stdafx.h b/protocols/IRCG/src/stdafx.h
index 32bc8af34d..61e086bb1e 100644
--- a/protocols/IRCG/src/stdafx.h
+++ b/protocols/IRCG/src/stdafx.h
@@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "m_protocols.h"
 #include "m_protosvc.h"
 #include "m_protoint.h"
-#include "m_clist.h"
+#include <m_clistint.h>
 #include "m_options.h"
 #include "m_database.h"
 #include "m_utils.h"
diff --git a/protocols/MRA/src/stdafx.h b/protocols/MRA/src/stdafx.h
index df92980ad9..2e7594abef 100644
--- a/protocols/MRA/src/stdafx.h
+++ b/protocols/MRA/src/stdafx.h
@@ -23,7 +23,7 @@
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_protocols.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_cluiframes.h>
 #include <m_genmenu.h>
 #include <m_ignore.h>
diff --git a/protocols/MSN/src/stdafx.h b/protocols/MSN/src/stdafx.h
index 1eb9ce25a3..84fc8292b3 100644
--- a/protocols/MSN/src/stdafx.h
+++ b/protocols/MSN/src/stdafx.h
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <newpluginapi.h>
 
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_contacts.h>
 #include <m_idle.h>
 #include <m_icolib.h>
diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h
index 0e784465e6..e164bf1c39 100644
--- a/protocols/MinecraftDynmap/src/stdafx.h
+++ b/protocols/MinecraftDynmap/src/stdafx.h
@@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_chat.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_netlib.h>
 #include <m_options.h>
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h
index e492ad25d2..70f5586598 100644
--- a/protocols/Omegle/src/stdafx.h
+++ b/protocols/Omegle/src/stdafx.h
@@ -42,7 +42,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <newpluginapi.h>
 #include <m_system.h>
 #include <m_chat.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_langpack.h>
 #include <m_netlib.h>
 #include <m_options.h>
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h
index 2ad4940055..2cb4883414 100644
--- a/protocols/SkypeWeb/src/stdafx.h
+++ b/protocols/SkypeWeb/src/stdafx.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <m_database.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_options.h>
 #include <m_netlib.h>
 #include <m_popup.h>
diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h
index aed6d505eb..c59439eae6 100644
--- a/protocols/Tox/src/stdafx.h
+++ b/protocols/Tox/src/stdafx.h
@@ -30,7 +30,7 @@
 #include <m_chat_int.h>
 #include <m_genmenu.h>
 #include <m_clc.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_gui.h>
 #include <m_folders.h>
 #include <m_assocmgr.h>
diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h
index bda1603983..1183be966a 100644
--- a/protocols/Twitter/src/stdafx.h
+++ b/protocols/Twitter/src/stdafx.h
@@ -40,7 +40,7 @@ typedef std::basic_string<wchar_t> wstring;
 #include <m_avatars.h>
 #include <m_button.h>
 #include <m_chat.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_folders.h>
 #include <m_history.h>
diff --git a/protocols/VKontakte/src/stdafx.h b/protocols/VKontakte/src/stdafx.h
index 5af8993529..da91ad030d 100644
--- a/protocols/VKontakte/src/stdafx.h
+++ b/protocols/VKontakte/src/stdafx.h
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <m_avatars.h>
 #include <m_chat_int.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_database.h>
 #include <m_file.h>
 #include <m_genmenu.h>
diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h
index 5d0bcd3360..142f20a451 100644
--- a/src/core/stdclist/src/stdafx.h
+++ b/src/core/stdclist/src/stdafx.h
@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <win2k.h>
 #include <newpluginapi.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_system.h>
 #include <m_database.h>
 #include <m_langpack.h>
diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h
index f5cfa9be8e..037823ab45 100644
--- a/src/core/stdfile/src/stdafx.h
+++ b/src/core/stdfile/src/stdafx.h
@@ -51,7 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_netlib.h>
 #include <m_crypto.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_button.h>
 #include <m_protosvc.h>
 #include <m_protocols.h>
diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h
index 7da47bc366..8cf7e23374 100644
--- a/src/core/stdidle/src/stdafx.h
+++ b/src/core/stdidle/src/stdafx.h
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_utils.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_button.h>
 #include <m_protosvc.h>
 #include <m_protocols.h>
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 538795fe35..e394d42faa 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_database.h>
 #include <m_langpack.h>
 #include <m_button.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_clc.h>
 #include <m_gui.h>
 #include <m_options.h>
diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h
index f47894dc8e..ce3622103e 100644
--- a/src/core/stduseronline/src/stdafx.h
+++ b/src/core/stduseronline/src/stdafx.h
@@ -47,7 +47,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_database.h>
 #include <m_netlib.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_button.h>
 #include <m_protosvc.h>
 #include <m_protocols.h>
diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index 7f8ff36975..8163839d31 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -67,7 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_clc.h>
 #include <m_crypto.h>
 #include <m_langpack.h>
-#include <m_clist.h>
+#include <m_clistint.h>
 #include <m_avatars.h>
 #include <m_button.h>
 #include <m_protosvc.h>