unused clist headers

git-svn-id: http://svn.miranda-ng.org/main/trunk@4678 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

51 files changed, 2 insertions, 92 deletions

diff --git a/include/m_clistint.h b/include/m_clistint.h
index c6f9330c6c..6f341464e3 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -26,9 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include <CommCtrl.h>

 

-#include "m_clc.h"

 #include "m_genmenu.h"

 #include "m_protocols.h"

+#include "m_clc.h"

 

 #define HCONTACT_ISGROUP    0x80000000

 #define HCONTACT_ISINFO     0xFFFF0000

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index cdf1b7426b..2e80beb3d1 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -92,6 +92,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_extraicons.h>

 #include <m_xstatus.h>

 #include <m_cluiframes.h>

+#include <m_modernopt.h>

 

 #include <m_toptoolbar.h>

 #include <m_metacontacts.h>

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 6b0e46e9da..c4b1973a12 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /************************************************************************/

 

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "m_skin.h"

 #include "hdr/modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp
index ad5580a465..bc60e77465 100644
--- a/plugins/Clist_modern/src/modern_clcidents.cpp
+++ b/plugins/Clist_modern/src/modern_clcidents.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 68e8724401..4dd41f3120 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_clist.h"

 #include "m_metacontacts.h"

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 4d41b560db..7875ba21ff 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_commonprototypes.h"

 

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 7cf0c32840..f2b2f7f7ec 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_defsettings.h"

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 766f7c6a99..de90016af7 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "hdr/modern_commonheaders.h"

 

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_skinengine.h"

 #include "hdr/modern_commonprototypes.h"

diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp
index 037143b7d6..69eb2ddd9e 100644
--- a/plugins/Clist_modern/src/modern_clcutils.cpp
+++ b/plugins/Clist_modern/src/modern_clcutils.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_defsettings.h"

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 578dce3385..63eb97c90d 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "hdr/modern_commonheaders.h"

 #include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "m_clc.h"

 #include "hdr/modern_commonprototypes.h"

 

 static INT_PTR CALLBACK DlgProcItemRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index b47ca00245..2a89d42954 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -21,8 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

-#include "m_clc.h"

 #include "hdr/modern_clist.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_awaymsg.h"

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 0f0b1bef4b..75be2ea628 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -25,9 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "hdr/modern_commonheaders.h"

 

-#include "m_clc.h"

-#include "m_clui.h"

-#include "m_skin.h"

 #include "m_api/m_skinbutton.h"

 #include "hdr/modern_skinengine.h"

 #include "hdr/modern_statusbar.h"

diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp
index 2e431396c8..75140b5afc 100644
--- a/plugins/Clist_modern/src/modern_cluiservices.cpp
+++ b/plugins/Clist_modern/src/modern_cluiservices.cpp
@@ -21,8 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

-#include "m_clui.h"

 #include "hdr/modern_commonprototypes.h"

 

 INT_PTR CListTray_GetGlobalStatus(WPARAM wparam,LPARAM lparam);

diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp
index 7e5d9533cc..79d6b8be58 100644
--- a/plugins/Clist_modern/src/modern_newrowopts.cpp
+++ b/plugins/Clist_modern/src/modern_newrowopts.cpp
@@ -31,9 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  

 

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "m_clc.h"

 

 #define EMPTY_PLACE 255

 #define COLUMNS_PLACE 254

diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
index de3a761d7d..a04e791d11 100644
--- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
+++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp
@@ -21,10 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "m_clc.h"

-#include "io.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_row.h"

 

diff --git a/plugins/Clist_modern/src/modern_skineditor.cpp b/plugins/Clist_modern/src/modern_skineditor.cpp
index 673e049918..76ae48cb3f 100644
--- a/plugins/Clist_modern/src/modern_skineditor.cpp
+++ b/plugins/Clist_modern/src/modern_skineditor.cpp
@@ -21,10 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "m_clc.h"

-#include "io.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_sync.h"

 

diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index f85f412671..70c9495c82 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -21,15 +21,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clui.h"

 #include "hdr/modern_clist.h"

-#include "m_clc.h"

-#include "io.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_sync.h"

-#include <m_utils.h>

-#include <m_database.h>

-#include <m_modernopt.h>

 

 /*******************************/

 // Main skin selection routine //

diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp
index 3c3953d0c3..0173efb72f 100644
--- a/plugins/Clist_modern/src/modern_statusbar_options.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "hdr/modern_commonheaders.h"

-#include "m_clc.h"

 #include "hdr/modern_clc.h"

 #include "hdr/modern_commonprototypes.h"

 #include "hdr/modern_defsettings.h"

diff --git a/plugins/Clist_mw/src/clcidents.cpp b/plugins/Clist_mw/src/clcidents.cpp
index 43a34f4e61..5bf82394f9 100644
--- a/plugins/Clist_mw/src/clcidents.cpp
+++ b/plugins/Clist_mw/src/clcidents.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clc.h"

 #include "clc.h"

 

 /* the CLC uses 3 different ways to identify elements in its list, this file

diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp
index af48a8fd0f..53656dcf4b 100644
--- a/plugins/Clist_mw/src/clcitems.cpp
+++ b/plugins/Clist_mw/src/clcitems.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clc.h"

 #include "clc.h"

 #include "clist.h"

 #include "m_metacontacts.h"

diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp
index 845e3d104d..c9e2dee781 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/Clist_mw/src/clcopts.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clc.h"

 #include "clc.h"

 

 #define DBFONTF_BOLD       1

diff --git a/plugins/Clist_mw/src/clcpaint.cpp b/plugins/Clist_mw/src/clcpaint.cpp
index 529c0420cc..f34c98e8ac 100644
--- a/plugins/Clist_mw/src/clcpaint.cpp
+++ b/plugins/Clist_mw/src/clcpaint.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "m_clc.h"

 #include "clc.h"

 

 extern HIMAGELIST himlCListClc;

diff --git a/plugins/Clist_mw/src/clcutils.cpp b/plugins/Clist_mw/src/clcutils.cpp
index 9a655f7c74..4aa7ef72bb 100644
--- a/plugins/Clist_mw/src/clcutils.cpp
+++ b/plugins/Clist_mw/src/clcutils.cpp
@@ -21,7 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clc.h"

 #include "clc.h"

 

 //loads of stuff that didn't really fit anywhere else

diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp
index 85a79385ae..2fe399d467 100644
--- a/plugins/Clist_mw/src/clistopts.cpp
+++ b/plugins/Clist_mw/src/clistopts.cpp
@@ -21,9 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clui.h"

 #include "clist.h"

-#include "m_clc.h"

 

 int HotKeysRegister(HWND hwnd);

 void HotKeysUnregister(HWND hwnd);

diff --git a/plugins/Clist_mw/src/clistsettings.cpp b/plugins/Clist_mw/src/clistsettings.cpp
index 6ea8b05198..bc810e7d12 100644
--- a/plugins/Clist_mw/src/clistsettings.cpp
+++ b/plugins/Clist_mw/src/clistsettings.cpp
@@ -21,8 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clui.h"

-#include "m_clc.h"

 #include "clist.h"

 

 TCHAR *GetNameForContact(HANDLE hContact,int flag,boolean *isUnknown);

diff --git a/plugins/Clist_mw/src/cluiservices.cpp b/plugins/Clist_mw/src/cluiservices.cpp
index 095576878c..554a7958a7 100644
--- a/plugins/Clist_mw/src/cluiservices.cpp
+++ b/plugins/Clist_mw/src/cluiservices.cpp
@@ -21,8 +21,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 #include "commonheaders.h"

-#include "m_clc.h"

-#include "m_clui.h"

 

 extern int CreateTimerForConnectingIcon(WPARAM,LPARAM);

 

diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h
index 2f2b6b0911..6bbc0b84cc 100644
--- a/plugins/DbEditorPP/src/headers.h
+++ b/plugins/DbEditorPP/src/headers.h
@@ -37,7 +37,6 @@
 #include <m_userinfo.h>

 #include <m_options.h>

 #include <m_protosvc.h>

-#include <m_clc.h>

 #include <m_popup.h>

 #include <m_icolib.h>

 #include <m_hotkeys.h>

diff --git a/plugins/Non-IM Contact/src/commonheaders.h b/plugins/Non-IM Contact/src/commonheaders.h
index e46847faf7..8dad5c498a 100644
--- a/plugins/Non-IM Contact/src/commonheaders.h
+++ b/plugins/Non-IM Contact/src/commonheaders.h
@@ -46,7 +46,6 @@ struct DLGTEMPLATEEX
 #include <m_protosvc.h>

 #include <m_utils.h>

 #include <m_ignore.h>

-#include <m_clc.h>

 #include <m_netlib.h>

 #include <win2k.h>

 

diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index f2c309e280..7f20935f2d 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -889,7 +889,6 @@ TCHAR* GetChatLogsFilename (HANDLE  hContact, time_t tTime)
 {

 	REPLACEVARSARRAY rva[11];

 	TCHAR *p = {0}, *tszParsedName = {0};

-	int i;

 

 	if (g_Settings.pszLogDir[_tcslen(g_Settings.pszLogDir)-1] == '\\')

 		_tcscat(g_Settings.pszLogDir, _T("%userid%.log"));

diff --git a/plugins/Scriver/src/commonheaders.h b/plugins/Scriver/src/commonheaders.h
index ca81b3b2b4..a7c0ca5af5 100644
--- a/plugins/Scriver/src/commonheaders.h
+++ b/plugins/Scriver/src/commonheaders.h
@@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_langpack.h>

 #include <m_button.h>

 #include <m_clistint.h>

-#include <m_clc.h>

 #include <m_clui.h>

 #include <m_protosvc.h>

 #include <m_skin.h>

diff --git a/protocols/FacebookRM/src/common.h b/protocols/FacebookRM/src/common.h
index ab8faf4db0..ee7cefc903 100644
--- a/protocols/FacebookRM/src/common.h
+++ b/protocols/FacebookRM/src/common.h
@@ -53,7 +53,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <m_avatars.h>

 #include <m_button.h>

 #include <m_chat.h>

-#include <m_clc.h>

 #include <m_clist.h>

 #include <m_clistint.h>

 #include <m_clui.h>

diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h
index 5a0a65d9d7..e45a98d9fe 100644
--- a/protocols/Gadu-Gadu/src/gg.h
+++ b/protocols/Gadu-Gadu/src/gg.h
@@ -69,7 +69,6 @@
 #include <m_userinfo.h>

 #include <m_clui.h>

 #include <m_button.h>

-#include <m_clc.h>

 #include <m_message.h>

 #include <m_icolib.h>

 #include <m_imgsrvc.h>

diff --git a/protocols/IcqOscarJ/src/icqoscar.h b/protocols/IcqOscarJ/src/icqoscar.h
index 05101b81eb..1208d9524f 100644
--- a/protocols/IcqOscarJ/src/icqoscar.h
+++ b/protocols/IcqOscarJ/src/icqoscar.h
@@ -66,7 +66,6 @@
 

 // Miranda IM SDK includes

 #include <newpluginapi.h> // This must be included first

-#include <m_clc.h>

 #include <m_clist.h>

 #include <m_clui.h>

 #include <m_database.h>

diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h
index 50db0d5638..47f0b4deb1 100644
--- a/protocols/JabberG/src/jabber.h
+++ b/protocols/JabberG/src/jabber.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_skin.h>

 #include <m_chat.h>

-#include <m_clc.h>

 #include <m_icolib.h>

 #include <m_cluiframes.h>

 #include <m_clistint.h>

diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index d7cd967454..0f1234d663 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -37,7 +37,6 @@
 #include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_protocols.h>

-#include <m_clc.h>

 #include <m_clist.h>

 #include <m_cluiframes.h>

 #include <m_clui.h>

diff --git a/protocols/MSN/src/msn_global.h b/protocols/MSN/src/msn_global.h
index a2588bb523..2fe7bce1ed 100644
--- a/protocols/MSN/src/msn_global.h
+++ b/protocols/MSN/src/msn_global.h
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #include <newpluginapi.h>

 

-#include <m_clc.h>

 #include <m_clist.h>

 #include <m_clistint.h>

 #include <m_clui.h>

diff --git a/protocols/Twitter/src/common.h b/protocols/Twitter/src/common.h
index dd2b7973f1..e0f89ac230 100644
--- a/protocols/Twitter/src/common.h
+++ b/protocols/Twitter/src/common.h
@@ -42,7 +42,6 @@ using std::min;
 #include <m_avatars.h>

 #include <m_button.h>

 #include <m_chat.h>

-#include <m_clc.h>

 #include <m_clist.h>

 #include <m_clistint.h>

 #include <m_clui.h>

diff --git a/protocols/Xfire/src/baseProtocol.h b/protocols/Xfire/src/baseProtocol.h
index d56f68b0b6..e936297b05 100644
--- a/protocols/Xfire/src/baseProtocol.h
+++ b/protocols/Xfire/src/baseProtocol.h
@@ -65,7 +65,6 @@
 #include <m_options.h>

 #include <m_utils.h>

 #include <m_ignore.h>

-#include <m_clc.h>

 #include <m_netlib.h>

 #include <m_avatars.h>

 #include <m_folders.h>

diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index 4477e5a0d9..03bfa66d5a 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -18,7 +18,6 @@
 #include <m_chat.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_clc.h>

 

 struct InviteChatParam

 {

diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h
index d52055c74e..0519d8e739 100644
--- a/src/core/stdauth/commonheaders.h
+++ b/src/core/stdauth/commonheaders.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

 #include <m_clui.h>

 #include <m_crypto.h>

 #include <m_langpack.h>

diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h
index 2cf1dd50e6..d33be79720 100644
--- a/src/core/stdautoaway/commonheaders.h
+++ b/src/core/stdautoaway/commonheaders.h
@@ -51,12 +51,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.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>

diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h
index 2cf1dd50e6..cc204e4d42 100644
--- a/src/core/stdaway/commonheaders.h
+++ b/src/core/stdaway/commonheaders.h
@@ -51,9 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.h>

-#include <m_crypto.h>

 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_clistint.h>

diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h
index b13b98db21..4a91dd6b3e 100644
--- a/src/core/stdcrypt/commonheaders.h
+++ b/src/core/stdcrypt/commonheaders.h
@@ -51,12 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.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>

diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h
index 2333b85f80..506f61db5f 100644
--- a/src/core/stdemail/commonheaders.h
+++ b/src/core/stdemail/commonheaders.h
@@ -51,11 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.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>

diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h
index 9706b0bffa..395521cfc3 100644
--- a/src/core/stdfile/commonheaders.h
+++ b/src/core/stdfile/commonheaders.h
@@ -53,8 +53,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.h>

 #include <m_crypto.h>

 #include <m_langpack.h>

 #include <m_clist.h>

diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h
index 16155f8710..5bf50a56b3 100644
--- a/src/core/stdhelp/commonheaders.h
+++ b/src/core/stdhelp/commonheaders.h
@@ -51,9 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.h>

-#include <m_crypto.h>

 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_clistint.h>

diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h
index ff32893f1f..3575cd2b07 100644
--- a/src/core/stdidle/commonheaders.h
+++ b/src/core/stdidle/commonheaders.h
@@ -51,9 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.h>

-#include <m_crypto.h>

 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_clistint.h>

diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h
index c4219f663b..145c50ad99 100644
--- a/src/core/stduihist/commonheaders.h
+++ b/src/core/stduihist/commonheaders.h
@@ -51,9 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.h>

-#include <m_crypto.h>

 #include <m_langpack.h>

 #include <m_clist.h>

 #include <m_clistint.h>

diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h
index 65a6aca8e0..a7f8b08cd0 100644
--- a/src/core/stdurl/commonheaders.h
+++ b/src/core/stdurl/commonheaders.h
@@ -51,11 +51,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.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>

diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h
index c8e1d46935..5a04ab405a 100644
--- a/src/core/stduserinfo/commonheaders.h
+++ b/src/core/stduserinfo/commonheaders.h
@@ -51,11 +51,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

 #include <m_clui.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>

diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h
index b13b98db21..945734b7ba 100644
--- a/src/core/stduseronline/commonheaders.h
+++ b/src/core/stduseronline/commonheaders.h
@@ -51,11 +51,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_netlib.h>

-#include <m_clc.h>

-#include <m_clui.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>